Merge in all the translation files from the lumina-i18n repository into the main lumina repo.

Now we can hook up weblate in the main lumina repo, and have everything in sync all the time.

66 files changed, 5644 insertions, 2505 deletions

diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_af.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_af.ts
index 03e3555a..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_af.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_af.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="af_ZA">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ar.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ar.ts
index 652b0203..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ar.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ar.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ar_SA">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_az.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_az.ts
index 68756b6a..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_az.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_az.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="az_AZ">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bg.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bg.ts
index 0a46280b..8e665e25 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bg.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bg.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="bg_BG">
+<TS version="2.1" language="bg">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Увеличаване</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Намаляване</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Снимка на екрана</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Нова снимка на екрана</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Включително рамката</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Секунди</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Закъснение</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Преглед/Редактиране</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Запис като</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Стартиране на редактора</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Изрязване</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Оразмеряване</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+Н</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Затваряне</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Цялата сесия</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Единичен прозорец</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Единичен екран</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Запазване на снимка на екрана</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Бърз запис</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG файлове (*.png);;Всички файлове (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bn.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bn.ts
index cb5f2124..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bn.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bn.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="bn_BD">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bs.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bs.ts
index 84789555..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bs.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_bs.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="bs_BA">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ca.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ca.ts
index 47c394c9..0b2a64a7 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ca.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ca.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ca_ES">
+<TS version="2.1" language="ca">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Apropa</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Allunya</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Fes una captura de pantalla</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Allunya</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Configuració</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Inclou les vores</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Segons</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Retard: </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Mostra-ho / Edita-ho</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Desa com a...</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Obre l'editor</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Escapça</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Canvia'n la mida</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Fitxer</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Tanca</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Tota la sessió</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Una sola finestra</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Una sola pantalla</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Desa la captura de pantalla</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Desament ràpid</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>Fitxers PNG (*.png);; Tots els fitxers (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_cs.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_cs.ts
index 58a05833..08f12782 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_cs.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_cs.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="cs_CZ">
+<TS version="2.1" language="cs">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Přiblížit</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Oddálit</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Zachytit snímek obrazovky</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Nový snímek obrazovky</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Zahrnout rámečky</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Sekund</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Prodleva </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Zobrazit/Upravit</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Uložit jako</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Zapnout Editor</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Oříznout</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Změnit velikost</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Soubor</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Celé sezení</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Jedno okno</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Jedna obrazovka</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Uložit snímek obrazovky</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Rychle uložit</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG Soubory (*.png);;Všechny soubory (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_cy.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_cy.ts
index 539a92e0..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_cy.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_cy.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="cy_GB">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_da.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_da.ts
index bbb9a7ce..17c5dbae 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_da.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_da.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="da_DK">
+<TS version="2.1" language="da">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Gem skærmbillede</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Inkludér rammer</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Sekunder</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Forsinkelse </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Hele sessionen</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Et enkelt vindue</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>En enkel skærm</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Gem skærmbillede</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Kvik gem</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG Filer (*.png);;AllFiles (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_de.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_de.ts
index 709c27fe..57489163 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_de.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_de.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Vergrößern</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Verkleinern</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Bildschirmfoto erstellen</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Neues Bildschirmfoto</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Rahmen inkludieren</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Sekunden</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Verzögerung </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Ansicht/Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Editor starten</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Zuschneiden</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Größe ändern</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Strg+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>vollständige Session</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>einzelnes Fenster</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>einzelner Bildschirm</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Bildschirmfoto speichern</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Strg+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Schnellspeichern</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG-Dateien (*.png);;Alle Dateien (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_el.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_el.ts
index 46783746..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_el.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_el.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="el_GR">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_en_GB.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_en_GB.ts
index 9288a48a..b83dd7b1 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_en_GB.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_en_GB.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_GB">
+<TS version="2.1" language="en_GB">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Zoom In</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Zoom Out</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Take Screenshot</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>New Screenshot</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Settings</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Include Borders</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>  Seconds</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Delay </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>View/Edit</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Save As</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Launch Editor</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Crop</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Resize</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>File</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Close</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Entire Session</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Single Window</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Single Screen</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Save Screenshot</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Quick Save</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG Files (*.png);;AllFiles (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_en_ZA.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_en_ZA.ts
index 3beb06f0..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_en_ZA.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_en_ZA.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_ZA">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_es.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_es.ts
index 856d42c6..a8da736e 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_es.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_es.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Acercar</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Alejar</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Capturar pantalla</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Nueva Captura de Pantalla</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Configuraciones</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Incluir Bordes</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Segundos</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Retraso </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Ver/Editar</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Guardar Como</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Lanzar el Editor</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Recortar</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Redimensionar</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Archivo</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Sesión Completa</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Ventana Unica</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Pantalla Unica</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Guardar la Captura de Pantalla</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Guardado Rápido</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>Archivos PNG (*.png);;Todos Los Archivos (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_et.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_et.ts
index de0ce893..580a6a95 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_et.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_et.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="et_EE">
+<TS version="2.1" language="et">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Ekraanipildi tegemine</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Koos äärtega</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> sekundit</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Viivitus </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Üks aken</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Üks ekraan</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Salvesta ekraanipilt</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG-failid (*.png);;Kõik failid (*)</translation>
+    </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_eu.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_eu.ts
index 5b869498..91890b3d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_eu.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_eu.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="eu_ES">
+<TS version="2.1" language="eu">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
+        <translation>Pantaila-argazkia egin</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Segundu</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
+        <translation>Atzerapena</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Pantaila-argazkia gorde</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ktrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG fitxategiak (*.png);;Fitxategi guztiak (*)</translation>
+    </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fa.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fa.ts
index 0ce25005..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fa.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fa.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fa_IR">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fi.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fi.ts
index a2858ebb..9f10ecaa 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fi.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fi.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fi_FI">
+<TS version="2.1" language="fi">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Lähennä</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Loitonna</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Ota kuvakaappaus</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Uusi kuvakaappaus</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Sisällytä reunat</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> sekuntia</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Viive </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Näytä/muokkaa</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Käynnistä muokkain</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Rajaa</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Muuta kokoa</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Tiedosto</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Koko istunto</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Yksittäinen ikkuna</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Yksittäinen näyttö</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Tallenna kuvakaappaus</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Pikatallennus</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG-tiedostot (*.png);;Kaikki tiedostot (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fr.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fr.ts
index d3b3ca49..d1e17760 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fr.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fr.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Zoom Avant</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Zoom Arrière</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Capture d&apos;écran</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Nouvelle capture d&apos;écran</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Inclure les bordures</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Secondes</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Délai</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Enregistrer sous</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Rogner</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Redimensionner</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Fichier</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Echap</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Toute la session</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Fenêtre unique</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Ecran unique</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Enregistrer la capture d&apos;écran</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Enregistrement Rapide</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>Fichiers PNG (*.png);;Tous les fichiers (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fr_CA.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fr_CA.ts
index 49b4e284..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fr_CA.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fr_CA.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_CA">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fur.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fur.ts
new file mode 100644
index 00000000..1babd96d
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_fur.ts
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainUI</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
+        <source>Take Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
+        <source> Seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
+        <source>Delay </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_gl.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_gl.ts
index aaf17e36..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_gl.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_gl.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="gl_ES">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_he.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_he.ts
index 46a18963..0953db4c 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_he.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_he.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="he_IL">
+<TS version="2.1" language="he">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>תפוס צילום מסך</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>כלול מסגרת</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> שניות</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
+        <translation>שיהוי </translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>סשן שלם</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>חלון בודד</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>מסך בודד</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>שמור צילום מסך</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hi.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hi.ts
index dc3ecf2d..970c0d1b 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hi.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hi.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="hi_IN">
+<TS version="2.1" language="hi">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>आकार बड़ा करना</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>आकार छोटा करना</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>स्क्रीनशॉट लें</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>नया स्क्रीनशॉट</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>सेटिंग्स</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>बॉर्डर्स समेत</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>सेकंड्स</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>विलम्ब</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>देखें/बदलें</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>इस प्रारूप में संचित करें</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>एडिटर चालू करें</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>एक हिस्सा काटें</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>आकार परिवर्तन</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>फाइल</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>कंट्रोल+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>बंद</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>एस्केप</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>पूर्ण काल</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>एकल विंडो</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>एकल स्क्रीन</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>स्क्रीन शॉट संचित करें</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>कंट्रोल+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>तीव्र संचय</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>पीएनजी फाइलें (*.png);;सभी फाइलें (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hr.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hr.ts
index abb3905a..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hr.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hr.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="hr_HR">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hu.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hu.ts
index b60ac1ab..6a87bb77 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hu.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_hu.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="hu_HU">
+<TS version="2.1" language="hu">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Nagyítás</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Kicsinyítés</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation>Képernyőkép készítése</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation>Nincs képernyőkép</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Új képernyőkép</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation>Új képernyőkép beállításai</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Keretekkel együtt</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation> másodperc</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation>Késleltetés </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation>Teljes képernyő</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Nézet/Szerkesztés</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation>Ablak kiválasztása</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Mentés másként</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation>Eszköztár</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Szerkesztő indítása</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation>Mentés</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Vágás</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation>Képernyőkép mentése</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Átméretezés</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Fájl</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation>Kilépés</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation>Képernyőkép</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Bezárás</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation>Új képernyőkép készítése</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation>PNG fájlok (*.png);;Minden fájl (*)</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Teljes munkamenet</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Egy ablak</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Egy képernyő</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Képernyőkép mentése</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation>Ablak:</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Gyors mentés</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG fájlok (*.png);;Minden fájl (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_id.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_id.ts
index dc1c20e4..3cd8f651 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_id.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_id.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="id_ID">
+<TS version="2.1" language="id">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Pembesaran</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Perkecil Tampilan</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Ambil Cuplikan</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Baru Cuplikan</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Pengaturan</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Sertakan Bingkai</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Detik</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Penundaan </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Lihat/Edit</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Simpan Sebagai</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Luncurkan Editor</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Potong</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Ubah Ukuran</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Berkas</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Tutup</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Seluruh Sesi</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Tunggal Window</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Tunggal Pameran</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Simpan Gambar Layar</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Cepat Simpan</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG berkas (*.png);;AllFiles (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_is.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_is.ts
index 0e6161cd..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_is.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_is.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="is_IS">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_it.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_it.ts
index 46e1d695..05d0cb11 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_it.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_it.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="it_IT">
+<TS version="2.1" language="it">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Zuma in</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Zuma Fuori</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Cattura schermata</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Nuova Schermata</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Includi il bordo</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Secondi</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Ritardo</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Visualizza/Edita</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Salva Come</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Avvia l&apos;Editor</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Ritaglia</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Ridimensiona</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>File</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Sessione Intera</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Finestra Singola</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Singola Finestra</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Salva schermata</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Salvataggio Rapido</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>File PNG (*.png);;AllFiles (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ja.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ja.ts
index 8951d88e..930f7989 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ja.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ja.ts
@@ -1,91 +1,136 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ja_JP">
+<TS version="2.1" language="ja">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>拡大表示</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>縮小表示</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>アプリケーションの名前</translatorcomment>
+        <translation>スクリーンショットの撮影</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>スクリーンショットの作成</translation>
+    <translatorcomment>ウインドウのタイトル</translatorcomment></message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>設定</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>ウィンドウの境界線を含める</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Delay %d Seconds</translatorcomment>
+        <translation> 秒後</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation> </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>表示/編集</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>名前を付けて保存</translation>
+    <translatorcomment>ボタンのキャプション</translatorcomment></message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>編集ソフトを起動</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>切り抜き</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>サイズ変更</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>ファイル</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>セッション全体</translation>
+    <translatorcomment>X session のことではないか? &gt; 「画面全体」</translatorcomment></message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>ひとつのウィンドウ</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>ひとつの画面</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translatorcomment>"Save"ボタンのツールチップ</translatorcomment>
+        <translation>スクリーンショットの保存</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>保存</translation>
+    <translatorcomment>「快速保存」(zh)も捨てがたいが、"Save As"との対比なら「保存」であるべきだろう。</translatorcomment></message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG ファイル (*.png);;すべて (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ka.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ka.ts
index d82f957d..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ka.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ka.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ka_GE">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ko.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ko.ts
index bf4b98a7..adc41a6c 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ko.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ko.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ko_KR">
+<TS version="2.1" language="ko">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>스크린샷 찍기</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>테두리 포함</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> 초</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>지연 시간 </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>전체 세션</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>단일 창</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>단일 화면</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>스크린샷 저장</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG 파일 (*.png);;모든 파일 (*)</translation>
+    </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_lt.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_lt.ts
index 5c2e49d2..65a08c9d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_lt.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_lt.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="lt_LT">
+<TS version="2.1" language="lt">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Didinti</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Mažinti</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Padaryti ekrano kopiją</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Nauja ekrano kopija</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Nustatymai</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Įtraukti rėmelį</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> sekundžių</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Delsti </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Rodyti/Redaguoti</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Įrašyti kaip</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Paleisti redaktorių</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Apkirpti</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Keisti dydį</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Failas</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl(Vald)+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Užverti</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc(Gr)</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Visas seansas</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Vienas langas</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Vienas ekranas</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Įrašyti ekrano kopiją</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl(Vald)+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Greitasis įrašymas</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG failai (*.png);;Visi failai (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_lv.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_lv.ts
index ef78b02a..793fa833 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_lv.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_lv.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="lv_LV">
+<TS version="2.1" language="lv">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Tuvināt</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Tālināt</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Iegūt ekrānuzņēmumu</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Jauns ekrānuzņēmums</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Iestatījumi</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Iekļaut apmales</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Sekundes</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Aizture </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Skatīt/Labot</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Saglabāt Kā</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Palaist redaktoru</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Apgriezt</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Mainīt izmēru</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Fails</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Aizvērt</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Visu sesiju</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Vienu logu</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Vienu ekrānu</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Saglabāt ekrānuzņēmumu</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Ātrā saglabāšana</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG faili (*.png);;Visi faili (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mk.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mk.ts
index 262b77b4..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mk.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mk.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="mk_MK">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mn.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mn.ts
index b1c7fee0..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mn.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mn.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="mn_MN">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ms.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ms.ts
index 6a4a9cb7..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ms.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ms.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ms_MY">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mt.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mt.ts
index 78d87d94..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mt.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_mt.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="mt_MT">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_nb.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_nb.ts
index 5513ea6e..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_nb.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_nb.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="nb_NO">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ne.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ne.ts
new file mode 100644
index 00000000..1babd96d
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ne.ts
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainUI</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
+        <source>Take Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
+        <source> Seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
+        <source>Delay </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_nl.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_nl.ts
index 555e81b0..f3773cbf 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_nl.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_nl.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="nl_NL">
+<TS version="2.1" language="nl">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Inzoomen</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Uitzoomen</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation>Neem schermafbeelding</translation>
+        <translation>Schermafdruk maken</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation>Nog geen schermafbeelding</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Nieuwe schermafdruk</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation>Nieuwe schermafbeelding instellingen</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Inclusief vensterranden</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation> seconden</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation>Vertraging </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation>Gehele scherm</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Weergeven/Wijzigen</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation>Selecteer scherm</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Opslaan als</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Bewerker starten</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation>Opslaan</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Bijsnijden</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation>Schermafbeelding opslaan</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Herschalen</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Bestand</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation>Stoppen</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation>Bind</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation>Neem nieuwe momentopname</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation>PNG bestanden (*.png;;Alle afbeeldingen (*)</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Volledige sessie</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Los venster</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Los scherm</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Schermafdruk opslaan</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation>Scherm:</translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Snel opslaan</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG-bestanden(*.png);;Alle bestanden(*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pa.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pa.ts
index 4311f32e..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pa.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pa.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pa_IN">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pl.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pl.ts
index f43a4fef..ca76c8cd 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pl.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pl.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<TS version="2.1" language="pl">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Powiększ</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Pomniejsz</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Zrób zrzut ekranu</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Nowy zrzut ekranu</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Uwzględnij granice okna</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Sekund(y)</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Opóźnienie </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Widok/Edycja</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Zapisz jako</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Uruchom edytor</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Przycinanie</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Zmiana rozmiaru</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Plik</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Cała sesja</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Pojedyncze okno</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Pojedynczy ekran</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Zapisz zrzut ekranu</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Szybki zapis</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>Pliki PNG (*.png);;Wszystkie pliki (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pt.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pt.ts
index c4b8bd0a..cfacbbff 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pt.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pt.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_PT">
+<TS version="2.1" language="pt">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
+        <translation>Capturar Imagem do Ecrã</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>  Segundos</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
+        <translation>Atraso</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Guardar Captura de Ecã</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>Ficheiros PNG (*.png);;Todos os Ficheiros (*)</translation>
+    </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pt_BR.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pt_BR.ts
index 9db89cde..3d1fade4 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pt_BR.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_pt_BR.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_BR">
+<TS version="2.1" language="pt_BR">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Ampliar</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Reduzir</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Capturar imagem da tela</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Nova captura de tela</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Incluir bordas</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Segundos</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Atraso </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Ver/Editar</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Salvar como</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Carregar o editor</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Recortar</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Redimensionar</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Arquivo</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Sessão inteira</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Somente janela</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Tela Única</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Salvar captura de tela</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Salvamento rápido</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>Arquivos PNG (*.png);;Todos os arquivos (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ro.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ro.ts
index c882ed6c..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ro.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ro.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ro_MD">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ru.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ru.ts
index e5e2bbbe..7789229a 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ru.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ru.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Увеличить</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Уменьшить</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Снимок Экрана</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Новый скриншот</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Включить границы</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Секунд</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>После </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Просмотр/Редактирование</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Запустить редактор</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Обрезать</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Изменить размер</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Вся сессия</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Одно окно</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Один экран</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Сохранить Снимок</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Быстрое сохранение</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG Файлы (*.png);;Все Файлы (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sa.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sa.ts
new file mode 100644
index 00000000..1babd96d
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sa.ts
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainUI</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
+        <source>Take Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
+        <source> Seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
+        <source>Delay </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sk.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sk.ts
index f91432bc..3fa34688 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sk.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sk.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sk_SK">
+<TS version="2.1" language="sk">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Urobiť snímku obrazovky</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Vrátane okraja</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Sekúnd </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Oneskorenie</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Celé sedenie</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>_Jedno okno</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Jedna obrazovka </translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Uložiť snímku obrazovky</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG Files (*.png);;AllFiles (*)</translation>
+    </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sl.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sl.ts
index 6f0f9be9..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sl.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sl.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sl_SI">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sr.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sr.ts
index e4668eab..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sr.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sr.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sr_CS">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sv.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sv.ts
index d5d2f535..9ee61270 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sv.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sv.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sv_SE">
+<TS version="2.1" language="sv">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Zooma in</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Zooma ut</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta skärmdump</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Ny skärmbild</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Inkludera ramar</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Sekunder</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Fördröjning  </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Visa/Editera</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Spara som</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Starta redigerare</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Beskär</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Ändra storlek</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Fil</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Hel Session</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Enstaka fönster</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Enstaka skärm</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Spara skärmbild</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Snabb spara </translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG Filer (*.png);; Alla Filer (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sw.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sw.ts
index 532edf54..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sw.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_sw.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sw_KE">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ta.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ta.ts
index 88cfb79c..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ta.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ta.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ta_IN">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_tg.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_tg.ts
index 1f344d16..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_tg.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_tg.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="tg_TJ">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_th.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_th.ts
index f2a933cc..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_th.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_th.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="th_TH">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_tr.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_tr.ts
index f6cd0875..ea34c7f0 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_tr.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_tr.ts
@@ -1,91 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.0" language="tr_TR">
+<TS version="2.1" language="tr">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Yakınlaştır</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Uzaklaştır</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Ekran Görüntüsü Al</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Yeni Ekran Görüntüsü</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Kenarlıkları Dahil Et</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> Saniye</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Geciktirme </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Görüntüle/Düzenle</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Farklı Kaydet</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Düzenleyiciyi Başlat</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Kırp</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Yeniden boyutlandır</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Dosya</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Kapat</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Tüm Oturum</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Tek Pencere</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Tek Ekran</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Ekran Görüntüsünü Kaydet</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Hızlı Kaydet</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG Dosyaları (*.png);;TümDosyalar (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_uk.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_uk.ts
index 78afef6c..e30c15c9 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_uk.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_uk.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="uk_UA">
+<TS version="2.1" language="uk">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>Збільшити</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>Зменшити</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Знімок екрану</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>Новий знімок</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>Налаштування</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>Увімкнути рамку</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>секунди</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>Затримка</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>Перегляд/Редагування</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>Зберегти як</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>Запустити редактор</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>Обрізати</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>Змінити розмір</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>Закрити</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>Вся сесія</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>Єдине вікно</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>Єдиний екран</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>Зберегти знімок екрану</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>Швидке збереження</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG Файли (*.png);;Всi Файли (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ur.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ur.ts
new file mode 100644
index 00000000..1babd96d
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ur.ts
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainUI</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
+        <source>Take Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
+        <source> Seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
+        <source>Delay </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_uz.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_uz.ts
index 864bf4f1..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_uz.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_uz.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="uz_UZ">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_vi.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_vi.ts
index 789012ed..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_vi.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_vi.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="vi_VN">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_CN.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_CN.ts
index 4da4a827..c148d639 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_CN.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_CN.ts
@@ -1,91 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_CN">
+<TS version="2.1" language="zh_CN">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation>放大</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation>缩小</translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>截图</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
+        <translation>新截图</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
+        <translation>设置</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation>包含边框</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> 秒</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
-        <translation type="unfinished"></translation>
+        <translation>延迟 </translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
+        <translation>查看/编辑</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
+        <translation>保存为</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
+        <translation>启动编辑器</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
+        <translation>剪裁</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
+        <translation>调整大小</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
+        <translation>文件</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
+        <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation>所有桌面</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation>单一窗口</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation>单一桌面</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
+        <translation>保存截图</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation>快速保存</translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <translation>PNG 文件(*.png);;所有文件 (*)</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_HK.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_HK.ts
index 6201dc33..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_HK.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_HK.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_HK">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_TW.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_TW.ts
index 9b2706ba..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_TW.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zh_TW.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_TW">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zu.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zu.ts
index 6dcf6b9e..1babd96d 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zu.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_zu.ts
@@ -1,90 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zu_ZA">
+<TS version="2.1">
+<context>
+    <name>ImageEditor</name>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <source>Zoom Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="33"/>
-        <source>No Screenshot Yet</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <source>New Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="43"/>
-        <source>New Screenshot Settings</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="55"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <source>Include Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="58"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="68"/>
-        <source>Entire Screen</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <source>View/Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="75"/>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Select Window</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="100"/>
-        <source>toolBar</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <source>Launch Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="129"/>
-        <source>Save</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="132"/>
-        <location filename="../MainUI.ui" line="135"/>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>Save Screenshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <source>Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="138"/>
-        <source>Ctrl+S</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="143"/>
-        <location filename="../MainUI.ui" line="146"/>
-        <source>Quit</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="151"/>
-        <source>Snap</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
-        <source>Take new snapshot</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="38"/>
-        <source>PNG Files (*.png);;AllFiles (*)</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <source>Entire Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <source>Single Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <source>Single Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>Save Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="63"/>
-        <source>Window:</source>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <source>Quick Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>