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

1 files changed, 99 insertions, 30 deletions

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 4cc7cbe9..81c5a921 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
@@ -17,28 +17,22 @@
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="375"/>
+        <location filename="../MainUI.ui" line="518"/>
         <source>Take Screenshot</source>
         <translation>截图</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
+        <location filename="../MainUI.ui" line="422"/>
         <source>Include Borders</source>
         <translation>包含边框</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="196"/>
-        <location filename="../MainUI.ui" line="386"/>
+        <location filename="../MainUI.ui" line="529"/>
         <source>Save As</source>
         <translation>保存为</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="244"/>
-        <source>Crop</source>
-        <translation>剪裁</translation>
-    </message>
-    <message>
-        <location filename="../MainUI.ui" line="228"/>
+        <location filename="../MainUI.ui" line="138"/>
         <source>Resize</source>
         <translation>调整大小</translation>
     </message>
@@ -48,82 +42,157 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="70"/>
+        <location filename="../MainUI.ui" line="87"/>
+        <source>Open screenshot with an application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="90"/>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="103"/>
+        <source>Copy screenshot to clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="106"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="109"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="135"/>
+        <source>Resize screenshot to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="157"/>
+        <source>Crop screenshot to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="160"/>
+        <source>&amp;Crop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="293"/>
+        <source>Screen Capture Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="341"/>
         <source> Sec Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="183"/>
-        <source>Capture</source>
+        <location filename="../MainUI.ui" line="434"/>
+        <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="212"/>
-        <source>Edit</source>
+        <location filename="../MainUI.ui" line="455"/>
+        <source>Show popup warnings about unsaved screenshots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="362"/>
-        <source>File</source>
-        <translation>文件</translation>
+        <location filename="../MainUI.ui" line="488"/>
+        <source>toolBar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="378"/>
+        <location filename="../MainUI.ui" line="515"/>
+        <source>Capture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="521"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="402"/>
+        <location filename="../MainUI.ui" line="545"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="405"/>
+        <location filename="../MainUI.ui" line="548"/>
+        <source>Close Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="551"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="57"/>
+        <location filename="../MainUI.ui" line="328"/>
         <source>Entire Session</source>
         <translation>所有桌面</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
+        <location filename="../MainUI.ui" line="409"/>
         <source>Single Window</source>
         <translation>单一窗口</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="99"/>
+        <location filename="../MainUI.ui" line="370"/>
         <source>Single Screen</source>
         <translation>单一桌面</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="79"/>
+        <location filename="../MainUI.cpp" line="38"/>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.cpp" line="39"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.cpp" line="94"/>
         <source>Could not save screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="79"/>
+        <location filename="../MainUI.cpp" line="94"/>
         <source>The screenshot could not be saved. Please check directory permissions or pick a different directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="86"/>
+        <location filename="../MainUI.cpp" line="101"/>
         <source>Save Screenshot</source>
         <translation>保存截图</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="389"/>
+        <location filename="../MainUI.cpp" line="264"/>
+        <source>Unsaved Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.cpp" line="265"/>
+        <source>The current screenshot has not been saved yet. Do you want to save or discard your changes?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="532"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="397"/>
+        <location filename="../MainUI.ui" line="540"/>
         <source>Quick Save</source>
         <translation>快速保存</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="86"/>
+        <location filename="../MainUI.cpp" line="101"/>
         <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation>PNG 文件(*.png);;所有文件 (*)</translation>
     </message>