diff -Nru mate-terminal-1.26.1/debian/changelog mate-terminal-1.26.1/debian/changelog --- mate-terminal-1.26.1/debian/changelog 2024-06-12 22:22:05.000000000 +0800 +++ mate-terminal-1.26.1/debian/changelog 2025-03-13 15:40:28.000000000 +0800 @@ -1,3 +1,13 @@ +mate-terminal (1.26.1-ok8) nile; urgency=medium + + * BUG: #I833TO【次要】【终端】打开终端后任务栏悬浮显示为英文 + #I7VEMR【中】【用户手册】【终端】焦点在终端上按快捷键Fn+F1无法跳转到用户手册对应模块,显示undefined(从用户手册首页点击可跳转到终端模块) + * 需求号: 无 + * 其他改动说明: 无 + * 其他改动影响域: 无 + + -- sufang <sufang@kylinos.cn> Thu, 13 Mar 2025 15:40:28 +0800 + mate-terminal (1.26.1-ok7) nile; urgency=medium * BUG: 无 diff -Nru mate-terminal-1.26.1/debian/patches/0014-Translated-using-Weblate-Vietnamese.patch mate-terminal-1.26.1/debian/patches/0014-Translated-using-Weblate-Vietnamese.patch --- mate-terminal-1.26.1/debian/patches/0014-Translated-using-Weblate-Vietnamese.patch 1970-01-01 08:00:00.000000000 +0800 +++ mate-terminal-1.26.1/debian/patches/0014-Translated-using-Weblate-Vietnamese.patch 2025-03-13 15:40:28.000000000 +0800 @@ -0,0 +1,77 @@ +From: 18074914783 <172075852@qq.com> +Date: Tue, 18 Mar 2025 07:09:33 +0000 +Subject: Translated using Weblate (Vietnamese) + +Currently translated at 100.0% (543 of 543 strings) + +Translation: openkylin-nile-new/mate-terminal +Translate-URL: http://weblate.openkylin.top/projects/openkylin-nile-new/mate-terminal/vi/ +--- + po/vi.po | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/po/vi.po b/po/vi.po +index 617c309..11f8962 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -16,8 +16,8 @@ msgstr "" + "Project-Id-Version: mate-terminal 1.25.0\n" + "Report-Msgid-Bugs-To: https://github.com/mate-desktop/mate-terminal/issues\n" + "POT-Creation-Date: 2021-06-25 16:51+0200\n" +-"PO-Revision-Date: 2025-02-19 09:35+0000\n" +-"Last-Translator: KevinDuan <duankaiwen@kylinos.cn>\n" ++"PO-Revision-Date: 2025-03-18 09:51+0000\n" ++"Last-Translator: 18074914783 <172075852@qq.com>\n" + "Language-Team: Vietnamese <http://weblate.openkylin.top/projects/" + "openkylin-nile-new/mate-terminal/vi/>\n" + "Language: vi\n" +@@ -91,11 +91,11 @@ msgstr "" + + #: src/mate-submodules/libegg/eggsmclient.c:234 + msgid "Disable connection to session manager" +-msgstr "Tắt kết nối với trình quản lý phiên chạy" ++msgstr "Cấm kết nối với trình quản lý phiên chạy" + + #: src/mate-submodules/libegg/eggsmclient.c:239 + msgid "Specify file containing saved configuration" +-msgstr "Xác định tập tin chứa cấu hình đã lưu" ++msgstr "Chỉ định tập tin chứa cấu hình đã lưu" + + #: src/mate-submodules/libegg/eggsmclient.c:239 src/terminal-options.c:964 + #: src/terminal-options.c:973 +@@ -104,7 +104,7 @@ msgstr "TẬP TIN" + + #: src/mate-submodules/libegg/eggsmclient.c:244 + msgid "Specify session management ID" +-msgstr "Xác định mã số quản lý phiên làm việc" ++msgstr "Chỉ định ID quản lý phiên làm việc" + + #: src/mate-submodules/libegg/eggsmclient.c:244 + msgid "ID" +@@ -132,7 +132,7 @@ msgstr "Trợ _giúp" + #: src/keybinding-editor.ui:59 src/profile-manager.ui:76 + #: src/profile-preferences.ui:279 + msgid "_Close" +-msgstr "Đón_g" ++msgstr "Đóng" + + #: src/encodings-dialog.ui:184 + msgid "A_vailable encodings:" +@@ -2087,7 +2087,7 @@ msgstr "Nội dung" + + #: src/terminal-accels.c:347 + msgid "File" +-msgstr "Tập tin" ++msgstr "TẬP TIN" + + #: src/terminal-accels.c:349 + msgid "View" +@@ -2691,7 +2691,7 @@ msgstr "Tùy thích Hồ _sơ" + + #: src/terminal-window.c:1959 + msgid "Zoom _In" +-msgstr "Phóng t_o" ++msgstr "Phóng to" + + #: src/terminal-window.c:1964 + msgid "Zoom _Out" diff -Nru mate-terminal-1.26.1/debian/patches/0015-Translated-using-Weblate-Vietnamese.patch mate-terminal-1.26.1/debian/patches/0015-Translated-using-Weblate-Vietnamese.patch --- mate-terminal-1.26.1/debian/patches/0015-Translated-using-Weblate-Vietnamese.patch 1970-01-01 08:00:00.000000000 +0800 +++ mate-terminal-1.26.1/debian/patches/0015-Translated-using-Weblate-Vietnamese.patch 2025-03-13 15:40:28.000000000 +0800 @@ -0,0 +1,36 @@ +From: 15289609606 <2407376293@qq.com> +Date: Tue, 18 Mar 2025 14:50:05 +0000 +Subject: Translated using Weblate (Vietnamese) + +Currently translated at 100.0% (543 of 543 strings) + +Translation: openkylin-nile-new/mate-terminal +Translate-URL: http://weblate.openkylin.top/projects/openkylin-nile-new/mate-terminal/vi/ +--- + po/vi.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/po/vi.po b/po/vi.po +index 11f8962..05937b3 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -16,8 +16,8 @@ msgstr "" + "Project-Id-Version: mate-terminal 1.25.0\n" + "Report-Msgid-Bugs-To: https://github.com/mate-desktop/mate-terminal/issues\n" + "POT-Creation-Date: 2021-06-25 16:51+0200\n" +-"PO-Revision-Date: 2025-03-18 09:51+0000\n" +-"Last-Translator: 18074914783 <172075852@qq.com>\n" ++"PO-Revision-Date: 2025-03-19 00:07+0000\n" ++"Last-Translator: 15289609606 <2407376293@qq.com>\n" + "Language-Team: Vietnamese <http://weblate.openkylin.top/projects/" + "openkylin-nile-new/mate-terminal/vi/>\n" + "Language: vi\n" +@@ -1604,7 +1604,7 @@ msgstr "_Mới" + + #: src/profile-manager.ui:153 src/terminal-accels.c:348 + msgid "Edit" +-msgstr "Sửa" ++msgstr "biên tập" + + #: src/profile-manager.ui:170 src/terminal-app.c:697 + msgid "_Delete" diff -Nru mate-terminal-1.26.1/debian/patches/0016-Merge-remote-tracking-branch-source-openkylin-nile-i.patch mate-terminal-1.26.1/debian/patches/0016-Merge-remote-tracking-branch-source-openkylin-nile-i.patch --- mate-terminal-1.26.1/debian/patches/0016-Merge-remote-tracking-branch-source-openkylin-nile-i.patch 1970-01-01 08:00:00.000000000 +0800 +++ mate-terminal-1.26.1/debian/patches/0016-Merge-remote-tracking-branch-source-openkylin-nile-i.patch 2025-03-13 15:40:28.000000000 +0800 @@ -0,0 +1,48 @@ +From: openkylin-cibot <openkylin-cibot@kylinos.cn> +Date: Thu, 20 Mar 2025 01:16:01 +0000 +Subject: Merge remote-tracking branch 'source/openkylin/nile' into + openkylin/nile + +--- + src/terminal-screen.c | 7 +++++++ + src/terminal-util.c | 4 ++-- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index d0d2385..42b3811 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -850,8 +850,15 @@ terminal_screen_format_title (TerminalScreen *screen, + g_assert (titleptr); + + /* use --title argument if one was supplied, otherwise ask the profile */ ++ FILE *fp = NULL; ++ char data[128] = {0}; ++ fp = popen("echo $LANG | cut -d '.' -f 1", "r"); ++ fgets(data, sizeof(data), fp); ++ pclose(fp); + if (priv->override_title) + static_title = priv->override_title; ++ else if (strncmp(data, "zh_CN\n", 6) == 0) ++ static_title = "终端"; + else + static_title = terminal_profile_get_property_string (priv->profile, TERMINAL_PROFILE_TITLE); + +diff --git a/src/terminal-util.c b/src/terminal-util.c +index e906f42..1c86cd5 100644 +--- a/src/terminal-util.c ++++ b/src/terminal-util.c +@@ -133,11 +133,11 @@ terminal_util_show_help (const char *topic, + + if (topic) + { +- url = g_strdup_printf ("help:mate-terminal/%s", topic); ++ url = g_strdup_printf ("help:utilities-terminal/%s", topic); + } + else + { +- url = g_strdup ("help:mate-terminal"); ++ url = g_strdup ("help:utilities-terminal"); + } + + if (!gtk_show_uri_on_window (GTK_WINDOW (parent), url, gtk_get_current_event_time (), &error)) diff -Nru mate-terminal-1.26.1/debian/patches/series mate-terminal-1.26.1/debian/patches/series --- mate-terminal-1.26.1/debian/patches/series 2024-06-12 22:22:05.000000000 +0800 +++ mate-terminal-1.26.1/debian/patches/series 2025-03-13 15:40:28.000000000 +0800 @@ -11,3 +11,6 @@ 0011-Revert-Added-translation-using-Weblate-Uyghur-ug_CN.patch 0012-Translated-using-Weblate-Uyghur.patch 0013-Translated-using-Weblate-Vietnamese.patch +0014-Translated-using-Weblate-Vietnamese.patch +0015-Translated-using-Weblate-Vietnamese.patch +0016-Merge-remote-tracking-branch-source-openkylin-nile-i.patch diff -Nru mate-terminal-1.26.1/debian/rules mate-terminal-1.26.1/debian/rules --- mate-terminal-1.26.1/debian/rules 2024-06-12 22:22:05.000000000 +0800 +++ mate-terminal-1.26.1/debian/rules 2025-03-13 15:40:28.000000000 +0800 @@ -20,6 +20,7 @@ override_dh_auto_configure: # we need libegg from mate-submodules + mkdir src/mate-submodules cd src/mate-submodules/; tar xvJf /usr/src/mate-submodules-source.tar.xz # upstream tarball is without configure. autogen.sh will create it NOCONFIGURE=1 ./autogen.sh