Merge branch 'master' of github.com:trueos/lumina

5 files changed, 65 insertions, 59 deletions

diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_zh_CN.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_zh_CN.ts
index 72345b63..a3fc9993 100644
--- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_zh_CN.ts
+++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_zh_CN.ts
@@ -11,7 +11,7 @@
     <message>
         <location filename="../AppDialog.ui" line="20"/>
         <source>Search for....</source>
-        <translation type="unfinished">查找…</translation>
+        <translation>查找…</translation>
     </message>
 </context>
 <context>
@@ -345,7 +345,7 @@
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="67"/>
-        <source>Start menu alternative focusing on the user&apos;s files, directories, and favorites.</source>
+        <source>Start menu alternative focusing on the user's files, directories, and favorites.</source>
         <translation>开始菜单并关注于用户的文件、 目录和收藏夹。</translation>
     </message>
     <message>
@@ -716,17 +716,17 @@
     <message>
         <location filename="../pages/getPage.cpp" line="42"/>
         <source>Wallpaper</source>
-        <translation type="unfinished"></translation>
+        <translation>壁纸</translation>
     </message>
     <message>
         <location filename="../pages/getPage.cpp" line="43"/>
         <source>Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>主题</translation>
     </message>
     <message>
         <location filename="../pages/getPage.cpp" line="45"/>
         <source>Autostart</source>
-        <translation type="unfinished"></translation>
+        <translation>自启动</translation>
     </message>
     <message>
         <location filename="../pages/getPage.cpp" line="46"/>
@@ -766,17 +766,17 @@
     <message>
         <location filename="../pages/getPage.cpp" line="49"/>
         <source>Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>桌面</translation>
     </message>
     <message>
         <location filename="../pages/getPage.cpp" line="50"/>
         <source>Panels</source>
-        <translation type="unfinished"></translation>
+        <translation>面板</translation>
     </message>
     <message>
         <location filename="../pages/getPage.cpp" line="51"/>
         <source>Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>菜单</translation>
     </message>
     <message>
         <location filename="../pages/getPage.cpp" line="49"/>
@@ -844,7 +844,7 @@
     <message>
         <location filename="../ScriptDialog.ui" line="14"/>
         <source>Setup a JSON Menu Script</source>
-        <translation type="unfinished"></translation>
+        <translation>设置一个 JSON 菜单脚本</translation>
     </message>
     <message>
         <location filename="../ScriptDialog.ui" line="25"/>
@@ -1243,12 +1243,12 @@
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="244"/>
-        <source>&quot;Mod1&quot;:	Alt key
-&quot;Mod4&quot;: 	Windows/Mac key
-&quot;Control&quot;:	Ctrl key</source>
-        <translation>&quot;Mod1&quot;:	Alt 键
-&quot;Mod4&quot;: 	Windows/Mac 键
-&quot;Control&quot;:	Ctrl 键</translation>
+        <source>"Mod1":	Alt key
+"Mod4": 	Windows/Mac key
+"Control":	Ctrl key</source>
+        <translation>"Mod1":	Alt 键
+"Mod4": 	Windows/Mac 键
+"Control":	Ctrl 键</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.cpp" line="70"/>
@@ -1395,7 +1395,7 @@
     <message>
         <location filename="../pages/page_interface_desktop.ui" line="86"/>
         <source>Display Removable Media Icons</source>
-        <translation type="unfinished"></translation>
+        <translation>显示可移动媒体图标</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_desktop.cpp" line="56"/>
@@ -1436,7 +1436,7 @@
     <message>
         <location filename="../pages/page_interface_panels.ui" line="82"/>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">导入</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_panels.cpp" line="58"/>
@@ -1479,7 +1479,7 @@
     <message>
         <location filename="../pages/page_main.cpp" line="72"/>
         <source>System Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>系统设置</translation>
     </message>
     <message>
         <location filename="../pages/page_main.cpp" line="145"/>
@@ -1580,7 +1580,7 @@
     <message>
         <location filename="../pages/page_session_options.ui" line="65"/>
         <source>Show application crash data</source>
-        <translation type="unfinished"></translation>
+        <translation>显示应用程序崩溃数据</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="74"/>
@@ -1800,7 +1800,7 @@
     <message>
         <location filename="../pages/page_theme.ui" line="36"/>
         <source>Desktop Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>桌面主题</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="42"/>
@@ -1856,12 +1856,12 @@
     <message>
         <location filename="../pages/page_theme.ui" line="192"/>
         <source>Application Themes</source>
-        <translation type="unfinished"></translation>
+        <translation>应用主题</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="198"/>
         <source>Qt5 Theme Engine</source>
-        <translation type="unfinished"></translation>
+        <translation>QT5 主题引擎</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.cpp" line="58"/>
diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts
index e368c26e..29d643f0 100644
--- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts
+++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts
@@ -65,7 +65,7 @@
     <message>
         <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="109"/>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>重命名</translation>
     </message>
     <message>
         <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="111"/>
@@ -265,12 +265,12 @@
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="63"/>
-        <source>Don&apos;t expect to build up the weak by pulling down the strong.</source>
+        <source>Don't expect to build up the weak by pulling down the strong.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="65"/>
-        <source>You can&apos;t know too much, but you can say too much.</source>
+        <source>You can't know too much, but you can say too much.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -350,7 +350,7 @@
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="97"/>
-        <source>Only two things are infinite, the universe and human stupidity, and I&apos;m not sure about the former.</source>
+        <source>Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -360,7 +360,7 @@
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="101"/>
-        <source>Do, or do not. There is no &apos;try&apos;.</source>
+        <source>Do, or do not. There is no 'try'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -380,7 +380,7 @@
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="109"/>
-        <source>It&apos;s kind of fun to do the impossible.</source>
+        <source>It's kind of fun to do the impossible.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_zh_CN.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_zh_CN.ts
index 174fcb13..b6e21f5e 100644
--- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_zh_CN.ts
+++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_zh_CN.ts
@@ -11,12 +11,12 @@
     <message>
         <location filename="../LLockScreen.ui" line="114"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>密码</translation>
     </message>
     <message>
         <location filename="../LLockScreen.ui" line="126"/>
         <source>Unlock Session</source>
-        <translation type="unfinished"></translation>
+        <translation>解除会话锁定</translation>
     </message>
     <message>
         <location filename="../LLockScreen.cpp" line="39"/>
@@ -26,17 +26,17 @@
     <message>
         <location filename="../LLockScreen.cpp" line="76"/>
         <source>Too Many Failures</source>
-        <translation type="unfinished"></translation>
+        <translation>失败次数过多</translation>
     </message>
     <message>
         <location filename="../LLockScreen.cpp" line="76"/>
         <source>Wait %1 Minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>等待 %1 分钟</translation>
     </message>
     <message>
         <location filename="../LLockScreen.cpp" line="77"/>
         <source>Failed Attempts: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">失败尝试: %1</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_zh_CN.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_zh_CN.ts
index 739cf33c..6d128929 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_zh_CN.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_zh_CN.ts
@@ -39,32 +39,32 @@
     <message>
         <location filename="../MainUI.ui" line="20"/>
         <source>Lumina Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Lumina 截屏</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="87"/>
         <source>Open screenshot with an application</source>
-        <translation type="unfinished"></translation>
+        <translation>使用应用程序打开截图</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="90"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>打开</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="103"/>
         <source>Copy screenshot to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>复制截图到剪贴板</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="106"/>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>复制</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="109"/>
         <source>Ctrl+C</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="135"/>
@@ -84,27 +84,27 @@
     <message>
         <location filename="../MainUI.ui" line="293"/>
         <source>Screen Capture Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>屏幕捕捉设置</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="341"/>
         <source> Sec Delay</source>
-        <translation type="unfinished"></translation>
+        <translation> 秒延迟</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="433"/>
         <source>Select Area</source>
-        <translation type="unfinished"></translation>
+        <translation>选择区域</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="445"/>
         <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>通用设置</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="466"/>
         <source>Show popup warnings about unsaved screenshots</source>
-        <translation type="unfinished"></translation>
+        <translation>未保存截图时显示弹出警告</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="499"/>
@@ -114,12 +114,12 @@
     <message>
         <location filename="../MainUI.ui" line="526"/>
         <source>Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>捕获</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="532"/>
         <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <translation type="unfinished">Ctrl+N</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="556"/>
diff --git a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_zh_CN.ts b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_zh_CN.ts
index 4ef61b87..4efb229a 100644
--- a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_zh_CN.ts
+++ b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_zh_CN.ts
@@ -45,7 +45,7 @@
     <message>
         <location filename="../DnDTabBar.h" line="43"/>
         <source>Detach Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>分离标签</translation>
     </message>
 </context>
 <context>
@@ -102,7 +102,7 @@
     <message>
         <location filename="../MainUI.ui" line="155"/>
         <source>Hide the find/replace options</source>
-        <translation type="unfinished"></translation>
+        <translation>隐藏查找/替换选项</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="196"/>
@@ -122,7 +122,7 @@
     <message>
         <location filename="../MainUI.ui" line="220"/>
         <source>Tabs Location</source>
-        <translation type="unfinished"></translation>
+        <translation>标签位置</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="237"/>
@@ -233,33 +233,33 @@
     <message>
         <location filename="../MainUI.ui" line="392"/>
         <source>Show Popup Warnings</source>
-        <translation type="unfinished"></translation>
+        <translation>显示弹出警告</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="395"/>
         <location filename="../MainUI.ui" line="398"/>
         <source>Show warnings about unsaved changes</source>
-        <translation type="unfinished"></translation>
+        <translation>未保存变更时显示警告</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="409"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>顶部</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="417"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>底部</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="425"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>左边</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="433"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>右边</translation>
     </message>
     <message>
         <location filename="../MainUI.cpp" line="61"/>
@@ -281,7 +281,7 @@
         <location filename="../MainUI.cpp" line="362"/>
         <location filename="../MainUI.cpp" line="470"/>
         <source>Lose Unsaved Changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>丢弃未保存的更改？</translation>
     </message>
     <message>
         <location filename="../MainUI.cpp" line="351"/>
@@ -290,7 +290,10 @@
 Do you want to close it anyway?
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>这个文件中有未保存的更改。
+是否仍要关闭它？
+
+%1</translation>
     </message>
     <message>
         <location filename="../MainUI.cpp" line="470"/>
@@ -298,7 +301,10 @@ Do you want to close it anyway?
 Do you want to close the editor anyway?
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>有未保存的更改。
+是否仍要关闭编辑器？
+
+%1</translation>
     </message>
 </context>
 <context>
@@ -316,7 +322,7 @@ Do you want to close the editor anyway?
     <message>
         <location filename="../PlainTextEditor.cpp" line="289"/>
         <source>Row Number: %1, Column Number: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>行数: %1，列数: %2</translation>
     </message>
     <message>
         <location filename="../PlainTextEditor.cpp" line="298"/>