From 963b42b2336a2f6fb21d1dd7353cbd64e5cd44ca Mon Sep 17 00:00:00 2001
From: pei-jiankang <peijiankang@kylinos.cn>
Date: Wed, 22 Sep 2021 18:43:16 +0800
Subject: [PATCH] Modify some modules translation error

---
 ...odify-some-modules-translation-error.patch | 107 ++++++++++++++++++
 ukui-panel.spec                               |  11 +-
 ukui-panel_zh_CN.qm                           | Bin 0 -> 12103 bytes
 3 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 0003-Modify-some-modules-translation-error.patch
 create mode 100644 ukui-panel_zh_CN.qm

diff --git a/0003-Modify-some-modules-translation-error.patch b/0003-Modify-some-modules-translation-error.patch
new file mode 100644
index 0000000..5f81463
--- /dev/null
+++ b/0003-Modify-some-modules-translation-error.patch
@@ -0,0 +1,107 @@
+From 06eaadf512479c4f20ce5955129ea0757dc59b02 Mon Sep 17 00:00:00 2001
+From: root <root@localhost.localdomain>
+Date: Sat, 18 Sep 2021 13:02:41 +0800
+Subject: [PATCH] Modify-some-modules-translation-error
+
+---
+ panel/resources/ukui-panel_zh_CN.ts | 5 +++++
+ plugin-nightmode/nightmode.cpp      | 5 +++--
+ plugin-showdesktop/showdesktop.cpp  | 3 ++-
+ plugin-startmenu/startmenu.cpp      | 2 ++
+ plugin-taskview/taskview.cpp        | 2 +-
+ 5 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/panel/resources/ukui-panel_zh_CN.ts b/panel/resources/ukui-panel_zh_CN.ts
+index f234d96..e63297e 100755
+--- a/panel/resources/ukui-panel_zh_CN.ts
++++ b/panel/resources/ukui-panel_zh_CN.ts
+@@ -778,6 +778,11 @@ icons here</source>
+         <source>Shutdown</source>
+         <translation type="vanished">关闭计算机</translation>
+     </message>
++    <message>
++	<location filename="../../plugin-startmenu/startmenu.cpp" line="62"/>
++	<source>UKui Menu</source>
++	<translation>开始菜单</translation>
++    </message>
+     <message>
+         <location filename="../../plugin-startmenu/startmenu.cpp" line="104"/>
+         <source>User Action</source>
+diff --git a/plugin-nightmode/nightmode.cpp b/plugin-nightmode/nightmode.cpp
+index 66e01ca..670a9df 100755
+--- a/plugin-nightmode/nightmode.cpp
++++ b/plugin-nightmode/nightmode.cpp
+@@ -22,6 +22,7 @@
+ #include <QDebug>
+ #include <QMessageBox>
+ #include <QDir>
++#include <QTimer>
+ #include "nightmode.h"
+ #include "../panel/customstyle.h"
+ 
+@@ -240,13 +241,13 @@ void NightModeButton::setNightMode(const bool nightMode){
+         serverCmd = "enable";
+         QIcon icon=QIcon("/usr/share/ukui-panel/panel/img/nightmode-night.svg");
+         this->setIcon(icon);
+-        this->setToolTip(tr("nightmode open"));
++        QTimer::singleShot(5000,[this] { this->setToolTip(tr("nightmode open")); });
+     }
+     else{
+         cmd = "stop";
+         serverCmd = "disable";
+         this->setIcon(QIcon("/usr/share/ukui-panel/panel/img/nightmode-light.svg"));
+-        this->setToolTip(tr("nightmode close"));
++        QTimer::singleShot(5000,[this] { this->setToolTip(tr("nightmode close")); });
+     }
+ 
+     process.startDetached("systemctl", QStringList() << "--user" << serverCmd << "redshift.service");
+diff --git a/plugin-showdesktop/showdesktop.cpp b/plugin-showdesktop/showdesktop.cpp
+index 3bd5529..11688e0 100755
+--- a/plugin-showdesktop/showdesktop.cpp
++++ b/plugin-showdesktop/showdesktop.cpp
+@@ -28,6 +28,7 @@
+ #include <QtX11Extras/QX11Info>
+ #include <QStyleOption>
+ #include <QPainter>
++#include <QTimer>
+ #include <KWindowSystem/KWindowSystem>
+ #include <KWindowSystem/NETWM>
+ #include "showdesktop.h"
+@@ -44,7 +45,7 @@ ShowDesktop::ShowDesktop(const IUKUIPanelPluginStartupInfo &startupInfo) :
+     IUKUIPanelPlugin(startupInfo)
+ {
+     state=NORMAL;
+-    this->setToolTip(tr("Show Desktop"));
++    QTimer::singleShot(5000,[this] {this->setToolTip(tr("Show Desktop"));});
+     realign();
+ 
+ }
+diff --git a/plugin-startmenu/startmenu.cpp b/plugin-startmenu/startmenu.cpp
+index bf4bf97..7875424 100755
+--- a/plugin-startmenu/startmenu.cpp
++++ b/plugin-startmenu/startmenu.cpp
+@@ -58,6 +58,8 @@ UKUIStartMenuButton::UKUIStartMenuButton( IUKUIPanelPlugin *plugin, QWidget* par
+ {
+     this->setIcon(QIcon("/usr/share/ukui-panel/panel/img/startmenu.svg"));
+     this->setStyle(new CustomStyle());
++    setStyleSheet("QToolButton { margin-left: 4px; } ");
++    QTimer::singleShot(5000,[this] {this->setToolTip(tr("UKui Menu")); });
+     //    this->setWindowFlags(Qt::NoFocus);
+     //setAttribute(Qt::WA_X11DoNotAcceptFocus, true);
+     //setAttribute(Qt::WA_ShowWithoutActivating,true);
+diff --git a/plugin-taskview/taskview.cpp b/plugin-taskview/taskview.cpp
+index 7fb54b3..ec7eaaf 100755
+--- a/plugin-taskview/taskview.cpp
++++ b/plugin-taskview/taskview.cpp
+@@ -45,7 +45,7 @@ TaskView::TaskView(const IUKUIPanelPluginStartupInfo &startupInfo) :
+     mButton =new TaskViewButton();
+     mButton->setStyle(new CustomStyle());
+     mButton->setIcon(QIcon::fromTheme("taskview",QIcon("/usr/share/ukui-panel/panel/img/taskview.svg")));
+-    mButton->setToolTip(tr("Show Taskview"));
++    QTimer::singleShot(5000,[this] {mButton->setToolTip(tr("Show Taskview")); });
+ 
+     /* hide/show taskview
+      * Monitor gsettings to set TaskViewButton size
+-- 
+2.30.0
+
diff --git a/ukui-panel.spec b/ukui-panel.spec
index 1c45ded..6ceeca5 100644
--- a/ukui-panel.spec
+++ b/ukui-panel.spec
@@ -2,11 +2,12 @@
 
 Name:           ukui-panel
 Version:        3.0.2
-Release:        4
+Release:        5
 Summary:        ukui desktop panel
 License:        LGPL-2.1+ GPL-2+ LGPL-3
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
+Source1:        ukui-panel_zh_CN.qm
 
 BuildRequires: cmake
 BuildRequires: alsa-lib-devel
@@ -43,6 +44,8 @@ BuildRequires: libpeony-dev
 Provides: ukui-indicators
 
 patch0: 0001-block-taskbar-right-click.patch
+#patch1: 0002-Fixes-an-issue-with-a-year-jump-exception.patch 
+patch2: 0003-Modify-some-modules-translation-error.patch
 
 %description
  The ukui desktop panel is used on ukui desktop and has some plugins like
@@ -52,7 +55,10 @@ patch0: 0001-block-taskbar-right-click.patch
 %prep
 %setup -q
 %patch0 -p1
+#%%patch1 -p1
+%patch2 -p1
 
+cp -rf %{SOURCE1} %{_builddir}/%{name}-%{version}/panel/resources
 %build
 mkdir build && cd build
 %{cmake3} ..
@@ -74,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/*
 
 %changelog
+* Sat Sep 18 2021 peijiankang <peijiankang@kylinos.cn> - 3.0.2-5
+- Modify some modules translation error
+
 * Fri Dec 4 2020 lvhan <lvhan@kylinos.cn> - 3.0.2-4
 - block taskbar right click
 
diff --git a/ukui-panel_zh_CN.qm b/ukui-panel_zh_CN.qm
new file mode 100644
index 0000000000000000000000000000000000000000..c5b4560223597df864a1121f80d67ce80d600949
GIT binary patch
literal 12103
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

literal 0
HcmV?d00001