From 43431932a04c7d6ac087a3dcf3c8af223fc4671f Mon Sep 17 00:00:00 2001 From: zhanghexian Date: Wed, 14 Aug 2024 16:32:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E3=80=90=E6=96=87=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=99=A8=E3=80=91=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B1=8F?= =?UTF-8?q?=E4=BF=9D=E7=BC=A9=E7=95=A5=E5=9B=BE=E5=8F=8A=E5=8F=B3=E9=94=AE?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=AD=E8=8F=9C=E5=8D=95=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E6=9C=AA=E5=9B=BD=E9=99=85=E5=8C=96,=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改了【文件管理器】自定义屏保缩略图及右键菜单中菜单命令未国际化,展示为英文 Log: 修改了【文件管理器】自定义屏保缩略图及右键菜单中菜单命令未国际化,展示为英文 Bug: https://pms.uniontech.com/bug-view-263945.html --- customscreensaver/deepin-custom-screensaver/src/main.cpp | 3 ++- .../translations/deepin-custom-screensaver.ts | 6 ++++++ .../translations/deepin-custom-screensaver_zh_CN.ts | 6 ++++++ debian/changelog | 6 ++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/customscreensaver/deepin-custom-screensaver/src/main.cpp b/customscreensaver/deepin-custom-screensaver/src/main.cpp index b9ee9f9..ea00a6f 100644 --- a/customscreensaver/deepin-custom-screensaver/src/main.cpp +++ b/customscreensaver/deepin-custom-screensaver/src/main.cpp @@ -34,7 +34,8 @@ int main(int argc, char *argv[]) DApplication a(argc, argv); a.setOrganizationName("deepin"); a.loadTranslator(); - + a.setApplicationName(QObject::tr("deepin-screensaver")); + a.setApplicationDisplayName(QObject::tr("deepin-screensaver")); CommandLineManager::instance()->process(a.arguments()); if (CommandLineManager::instance()->isSet("window-id")) { diff --git a/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver.ts b/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver.ts index 3fb7917..0cd9212 100644 --- a/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver.ts +++ b/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver.ts @@ -8,6 +8,12 @@ Restore Defaults Restore Defaults + + + + deepin-screensaver + 自定义屏保 + SelectPathWidget diff --git a/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver_zh_CN.ts b/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver_zh_CN.ts index 0a690b5..76afc16 100644 --- a/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver_zh_CN.ts +++ b/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver_zh_CN.ts @@ -8,6 +8,12 @@ Restore Defaults 恢复默认 + + + + deepin-screensaver + 自定义屏保 + SelectPathWidget diff --git a/debian/changelog b/debian/changelog index a7d2b80..0c3f822 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +deepin-screensaver (5.0.20) unstable; urgency=medium + + * update version to 5.0.20. + + -- Zhang HeXian Thu, 15 Aug 2024 15:56:18 +0800 + deepin-screensaver (5.0.19) unstable; urgency=medium * update version to 5.0.19. From 860ecf68169200a11164fe1705544f3ed178bede Mon Sep 17 00:00:00 2001 From: zhanghexian Date: Fri, 16 Aug 2024 10:23:04 +0800 Subject: [PATCH 2/3] Fix: [File Manager] Custom screensaver thumbnail and menu commands in right-click menu are not internationalized and displayed in English Log: [File Manager] Custom screensaver thumbnail and menu commands in right-click menu are not internationalized and displayed in English Bug: https://pms.uniontech.com/bug-view-263945.html --- customscreensaver/deepin-custom-screensaver/src/main.cpp | 4 +++- .../translations/deepin-custom-screensaver.ts | 2 +- .../translations/deepin-custom-screensaver_zh_CN.ts | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/customscreensaver/deepin-custom-screensaver/src/main.cpp b/customscreensaver/deepin-custom-screensaver/src/main.cpp index ea00a6f..1f39b4a 100644 --- a/customscreensaver/deepin-custom-screensaver/src/main.cpp +++ b/customscreensaver/deepin-custom-screensaver/src/main.cpp @@ -34,8 +34,10 @@ int main(int argc, char *argv[]) DApplication a(argc, argv); a.setOrganizationName("deepin"); a.loadTranslator(); + a.setApplicationName(QObject::tr("deepin-screensaver")); - a.setApplicationDisplayName(QObject::tr("deepin-screensaver")); + a.setApplicationDisplayName(QObject::tr("deepin-screensaver"));//The taskbar displays internationalization + CommandLineManager::instance()->process(a.arguments()); if (CommandLineManager::instance()->isSet("window-id")) { diff --git a/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver.ts b/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver.ts index 0cd9212..8a6cc44 100644 --- a/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver.ts +++ b/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver.ts @@ -9,8 +9,8 @@ Restore Defaults - + deepin-screensaver 自定义屏保 diff --git a/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver_zh_CN.ts b/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver_zh_CN.ts index 76afc16..55c84d0 100644 --- a/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver_zh_CN.ts +++ b/customscreensaver/deepin-custom-screensaver/translations/deepin-custom-screensaver_zh_CN.ts @@ -9,8 +9,8 @@ 恢复默认 - + deepin-screensaver 自定义屏保 From 37986f006ab209c7af07b5e6ac5ebe2a1d2cac7c Mon Sep 17 00:00:00 2001 From: zhx Date: Fri, 16 Aug 2024 02:41:56 +0000 Subject: [PATCH 3/3] Update changelog --- debian/changelog | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0c3f822..a7d2b80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -deepin-screensaver (5.0.20) unstable; urgency=medium - - * update version to 5.0.20. - - -- Zhang HeXian Thu, 15 Aug 2024 15:56:18 +0800 - deepin-screensaver (5.0.19) unstable; urgency=medium * update version to 5.0.19.