From cb50becefbc8b7e2020c44b96db5d6ba87c02dfa Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Sat, 7 Nov 2020 20:40:37 +0100
Subject: [PATCH] Update translations

---
 app/SysTray-X/preferences.ui        |  19 +--
 app/SysTray-X/systrayx.cpp          |   8 +-
 webext/_locales/de/messages.json    |  24 +++-
 webext/_locales/en_US/messages.json |  24 +++-
 webext/_locales/nl/messages.json    |  20 +++
 webext/_locales/pt_BR/messages.json |  20 +++
 webext/_locales/ru_RU/messages.json |  20 +++
 webext/css/options.css              |   2 +-
 webext/options.html                 | 191 +++++++++++++++-------------
 9 files changed, 215 insertions(+), 113 deletions(-)

diff --git a/app/SysTray-X/preferences.ui b/app/SysTray-X/preferences.ui
index b1d9c3c..5824576 100644
--- a/app/SysTray-X/preferences.ui
+++ b/app/SysTray-X/preferences.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>515</width>
+    <width>511</width>
     <height>640</height>
    </rect>
   </property>
@@ -323,19 +323,6 @@
              <string>Close</string>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_17">
-             <item>
-              <spacer name="verticalSpacer_3">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>40</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
              <item>
               <layout class="QVBoxLayout" name="verticalLayout_16">
                <item>
@@ -559,10 +546,10 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="defaultIconTypeGroup"/>
+  <buttongroup name="minimizeTypeGroup"/>
   <buttongroup name="countTypeGroup"/>
   <buttongroup name="closeTypeGroup"/>
   <buttongroup name="iconTypeGroup"/>
-  <buttongroup name="minimizeTypeGroup"/>
+  <buttongroup name="defaultIconTypeGroup"/>
  </buttongroups>
 </ui>
diff --git a/app/SysTray-X/systrayx.cpp b/app/SysTray-X/systrayx.cpp
index a0437ed..a008034 100644
--- a/app/SysTray-X/systrayx.cpp
+++ b/app/SysTray-X/systrayx.cpp
@@ -163,11 +163,11 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
      */
     getPreferences();
 
-/*
-    slotLoadLanguage( "nl" );
-    //slotLoadLanguage( "en_US" );
+
+    //slotLoadLanguage( "nl" );
+    slotLoadLanguage( "en_US" );
     slotSelectIconObject( false );
-*/
+
 }
 
 
diff --git a/webext/_locales/de/messages.json b/webext/_locales/de/messages.json
index e3d9f26..6b1a8b3 100644
--- a/webext/_locales/de/messages.json
+++ b/webext/_locales/de/messages.json
@@ -9,6 +9,21 @@
     "description": "Webextension descriptions"
   },
 
+  "preferences": {
+    "message": "SysTray-X Optionen",
+    "description": "Title of preferences page"
+  },
+  
+  "intro_line_1": {
+    "message": "Dieses Add-On benötigt eine Begleiter-App um zu funktionieren. Sie können es hier bekommen:",
+    "description": "Introduction line 1"
+  },
+  
+  "intro_link": {
+    "message": "Laden Sie hier die SysTray-X Begleiter-App herunter",
+    "description": "Link description"
+  },
+
   "tab_windows": {
     "message": "Fenster",
     "description": "Tab for Window options"
@@ -44,6 +59,11 @@
     "description": "Minimize option 0"
   },
 
+  "windows_min_to_tray": {
+    "message": "In Systemleiste verbergen",
+    "description": "Minimize option 1"
+  },
+
   "windows_min_to_tray_1": {
     "message": "In Systemleiste verbergen, Methode 1",
     "description": "Minimize option 1"
@@ -64,12 +84,12 @@
     "description": "Close option 0"
   },
 
-  "windows_close_to_tray_1": {
+  "windows_close_1": {
     "message": "Hauptfenster minimieren, Kinderfenster schließen",
     "description": "Close option 1"
   },
 
-  "windows_close_to_tray_2": {
+  "windows_close_2": {
     "message": "Alle Fenster minimieren",
     "description": "Close option 2"
   },
diff --git a/webext/_locales/en_US/messages.json b/webext/_locales/en_US/messages.json
index 9efe955..3a6cc49 100644
--- a/webext/_locales/en_US/messages.json
+++ b/webext/_locales/en_US/messages.json
@@ -9,6 +9,21 @@
     "description": "Webextension descriptions"
   },
 
+  "preferences": {
+    "message": "SysTray-X Preferences",
+    "description": "Title of preferences page"
+  },
+  
+  "intro_line_1": {
+    "message": "This addon needs an external application to work. You can get it here:",
+    "description": "Introduction line 1"
+  },
+  
+  "intro_link": {
+    "message": "Download the SysTray-X Companion application here",
+    "description": "Link description"
+  },
+  
   "tab_windows": {
     "message": "Windows",
     "description": "Tab for Window options"
@@ -44,6 +59,11 @@
     "description": "Minimize option 0"
   },
 
+  "windows_min_to_tray": {
+    "message": "Minimize to tray",
+    "description": "Minimize to tray"
+  },
+
   "windows_min_to_tray_1": {
     "message": "Minimize to tray, method 1",
     "description": "Minimize option 1"
@@ -64,12 +84,12 @@
     "description": "Close option 0"
   },
 
-  "windows_close_to_tray_1": {
+  "windows_close_1": {
     "message": "Minimize main, close children",
     "description": "Close option 1"
   },
 
-  "windows_close_to_tray_2": {
+  "windows_close_2": {
     "message": "Minimize all windows",
     "description": "Close option 2"
   },
diff --git a/webext/_locales/nl/messages.json b/webext/_locales/nl/messages.json
index cfe71c1..c2d9c51 100644
--- a/webext/_locales/nl/messages.json
+++ b/webext/_locales/nl/messages.json
@@ -9,6 +9,21 @@
     "description": "Webextension descriptions"
   },
 
+  "preferences": {
+    "message": "SysTray-X Opties",
+    "description": "Title of preferences page"
+  },
+  
+  "intro_line_1": {
+    "message": "Deze uitbreiding heeft ook nog een extern programma nodig. Dit kunt U hier downloaden:",
+    "description": "Introduction line 1"
+  },
+  
+  "intro_link": {
+    "message": "Download het bijbehorende SysTray-X programma hier",
+    "description": "Link description"
+  },
+
   "tab_windows": {
     "message": "Vensters",
     "description": "Tab for Window options"
@@ -44,6 +59,11 @@
     "description": "Minimize option 0"
   },
 
+  "windows_min_to_tray": {
+    "message": "Minimaliseer naar systeemvak",
+    "description": "Minimize option"
+  },
+
   "windows_min_to_tray_1": {
     "message": "Minimaliseer naar systeemvak, methode 1",
     "description": "Minimize option 1"
diff --git a/webext/_locales/pt_BR/messages.json b/webext/_locales/pt_BR/messages.json
index ff3986f..5a56e64 100644
--- a/webext/_locales/pt_BR/messages.json
+++ b/webext/_locales/pt_BR/messages.json
@@ -9,6 +9,21 @@
     "description": "Webextension descriptions"
   },
 
+  "preferences": {
+    "message": "SysTray-X Preferences",
+    "description": "Title of preferences page"
+  },
+  
+  "intro_line_1": {
+    "message": "Este addon precisa de um aplicativo externo para funcionar. Você pode obtê-lo aqui:",
+    "description": "Introduction line 1"
+  },
+  
+  "intro_link": {
+    "message": "Baixe o aplicativo SysTray-X Companion aqui",
+    "description": "Link description"
+  },
+
   "tab_windows": {
     "message": "Janela",
     "description": "Tab for Window options"
@@ -44,6 +59,11 @@
     "description": "Minimize option 0"
   },
 
+  "windows_min_to_tray": {
+    "message": "Minimizar para a tray",
+    "description": "Minimize"
+  },
+
   "windows_min_to_tray_1": {
     "message": "Minimizar para a tray, método 1",
     "description": "Minimize option 1"
diff --git a/webext/_locales/ru_RU/messages.json b/webext/_locales/ru_RU/messages.json
index 8966ef7..f6da3bc 100644
--- a/webext/_locales/ru_RU/messages.json
+++ b/webext/_locales/ru_RU/messages.json
@@ -14,6 +14,21 @@
     "description": "Tab for Window options"
   },
 
+  "preferences": {
+    "message": "SysTray-X предпочтения",
+    "description": "Title of preferences page"
+  },
+  
+  "intro_line_1": {
+    "message": "Для работы этого дополнения требуется внешнее приложение. Вы можете получить его здесь:",
+    "description": "Introduction line 1"
+  },
+  
+  "intro_link": {
+    "message": "Загрузите приложение SysTray-X Companion здесь",
+    "description": "Link description"
+  },
+  
   "tab_icon": {
     "message": "Иконка",
     "description": "Tab for Icon options"
@@ -44,6 +59,11 @@
     "description": "Minimize option 0"
   },
 
+  "windows_min_to_tray": {
+    "message": "Свернуть в трей",
+    "description": "Minimize"
+  },
+
   "windows_min_to_tray_1": {
     "message": "Свернуть в трей, вариант 1",
     "description": "Minimize option 1"
diff --git a/webext/css/options.css b/webext/css/options.css
index 6958a4e..207f524 100644
--- a/webext/css/options.css
+++ b/webext/css/options.css
@@ -83,7 +83,7 @@ body {
 }
 
 #closeselect {
-  width: 20em;
+  width: 25em;
   border-style: solid;
   border-width: 1px;
   margin: 10px 10px 10px 10px;
diff --git a/webext/options.html b/webext/options.html
index 64a1ba5..9dfbfb0 100644
--- a/webext/options.html
+++ b/webext/options.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SysTray-X Preferences</title>
+    <title>__MSG_preferences__</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
   </head>
@@ -11,13 +11,13 @@
     <script src="js/options_accounts.js"></script>
 
     <p>
-      This addon needs an external application to work. You can get it here:
+      __MSG_intro_line_1__
       <br />
       <br />
       <a
         href="https://github.com/Ximi1970/systray-x/releases"
         id="VersioHomeLink"
-        >Download the SysTray-X Companion application here</a
+        >__MSG_intro_link__</a
       >
     </p>
 
@@ -30,7 +30,7 @@
       <button class="tablinks" id="Debug">__MSG_tab_debug__</button>
     </div>
 
-    <div id="WindowsContent" class="tabcontent" style="display: block;">
+    <div id="WindowsContent" class="tabcontent" style="display: block">
       <form>
         <h3>__MSG_windows__</h3>
         <table id="minimizeselect">
@@ -38,7 +38,7 @@
             __MSG_windows_min_options__
           </caption>
           <tr id="minimizedefault">
-            <td id="inputradio">
+            <td>
               <input
                 type="radio"
                 name="minimizeType"
@@ -46,24 +46,24 @@
                 value="0"
               />
               <label for="minDefault" id="minimizedefaultlabel"
-                >&nbsp;__MSG_windows_min_default__</label
-              ><br />
+                >__MSG_windows_min_default__</label
+              >
             </td>
           </tr>
           <tr id="minimizemethod1">
-            <td id="inputradio">
+            <td>
               <input type="radio" name="minimizeType" id="minMeth1" value="1" />
               <label for="minMeth1" id="minimizemethod1label"
-                >&nbsp;__MSG_windows_min_to_tray_1__</label
-              ><br />
+                >__MSG_windows_min_to_tray_1__</label
+              >
             </td>
           </tr>
           <tr id="minimizemethod2">
-            <td id="inputradio">
+            <td>
               <input type="radio" name="minimizeType" id="minMeth2" value="2" />
               <label for="minMeth2" id="minimizemethod2label"
-                >&nbsp;__MSG_windows_min_to_tray_2__</label
-              ><br />
+                >__MSG_windows_min_to_tray_2__</label
+              >
             </td>
           </tr>
         </table>
@@ -74,37 +74,40 @@
           </caption>
           <tr id="defaultclosewindows">
             <td>
-              <input type="radio" name="closeType" value="0" />
-              <label for="0" id="defaultclosewindowslabel"
-                >&nbsp;__MSG_windows_close_default__</label
-              ><br />
+              <input
+                type="radio"
+                name="closeType"
+                id="closeDefault"
+                value="0"
+              />
+              <label for="closeDefault" id="defaultclosewindowslabel"
+                >__MSG_windows_close_default__</label
+              >
             </td>
           </tr>
           <tr id="minimizemainclosechildrenwindows">
             <td>
-              <input type="radio" name="closeType" value="1" />
-              <label for="1" id="minimizemainclosechildrenwindowslabel"
-                >&nbsp;__MSG_windows_close_1__</label
-              ><br />
+              <input type="radio" name="closeType" id="closeMeth1" value="1" />
+              <label for="closeMeth1" id="minimizemainclosechildrenwindowslabel"
+                >__MSG_windows_close_1__</label
+              >
             </td>
           </tr>
           <tr id="minimizeallwindows">
             <td>
-              <input type="radio" name="closeType" value="2" />
-              <label for="2" id="minimizeallwindowslabel"
-                >&nbsp;__MSG_windows_close_2__</label
-              ><br />
+              <input type="radio" name="closeType" id="closeMeth2" value="2" />
+              <label for="closeMeth2" id="minimizeallwindowslabel"
+                >__MSG_windows_close_2__</label
+              >
             </td>
           </tr>
         </table>
 
         <div id="inputcheck">
-          <input
-            type="checkbox"
-            name="startMinimized"
-            value=""
-          />&nbsp;__MSG_windows_start_min__
-          <br />
+          <input type="checkbox" name="startMinimized" id="startMin" value="" />
+          <label for="startMin" id="startMinimizedLabel"
+            >__MSG_windows_start_min__</label
+          >
         </div>
       </form>
     </div>
@@ -118,7 +121,7 @@
             __MSG_icons_default_options__
           </caption>
           <tr>
-            <td id="inputradio">
+            <td>
               <input
                 type="radio"
                 name="defaultIconType"
@@ -126,12 +129,12 @@
                 value="0"
               />
               <label for="defauttTb" id="defauttTbLabel"
-                >&nbsp;__MSG_icons_default_tb__</label
+                >__MSG_icons_default_tb__</label
               >
             </td>
           </tr>
           <tr>
-            <td id="inputradio">
+            <td>
               <input
                 type="radio"
                 name="defaultIconType"
@@ -139,12 +142,12 @@
                 value="1"
               />
               <label for="defauttLookThrough" id="defauttLookThroughLabel"
-                >&nbsp;__MSG_icons_default_lookthrough__</label
+                >__MSG_icons_default_lookthrough__</label
               >
             </td>
           </tr>
           <tr>
-            <td id="inputradio">
+            <td>
               <input
                 type="radio"
                 name="defaultIconType"
@@ -152,7 +155,7 @@
                 value="2"
               />
               <label for="defaultCustom" id="defaultCustomLabel"
-                >&nbsp;__MSG_icons_default_custom__</label
+                >__MSG_icons_default_custom__</label
               >
             </td>
             <td>
@@ -167,7 +170,7 @@
             <td>
               <label
                 for="selectedFileDefaultIconType"
-                style="-moz-appearance: button;"
+                style="-moz-appearance: button"
                 }
                 >__MSG_icons_default_custom_choose__</label
               >
@@ -175,12 +178,10 @@
                 type="file"
                 id="selectedFileDefaultIconType"
                 accept="image/*"
-                style="display: none;"
+                style="display: none"
               />
             </td>
-            <td>
-              &emsp;
-            </td>
+            <td>&emsp;</td>
           </tr>
         </table>
 
@@ -189,36 +190,52 @@
             <input
               type="checkbox"
               name="hideDefaultIcon"
+              id="kdeInt"
               value=""
-            />&nbsp;__MSG_icons_default_kde_integration__<br />
+            />
+            <label for="kdeInt" id="kdeIntegrationLabel"
+              >__MSG_icons_default_kde_integration__</label
+            >
           </div>
         </div>
 
         <table id="iconselect">
           <caption>
-            &nbsp;__MSG_icons_unread_options__
+            __MSG_icons_unread_options__
           </caption>
           <tr>
-            <td id="inputradio">
-              <input type="radio" name="iconType" id="unreadBlank" value="0" />
-              <label for="unreadBlank" id="unreadBlankLabel"
-                >&nbsp;__MSG_icons_unread_blank__</label
+            <td>
+              <input
+                type="radio"
+                name="iconType"
+                id="unreadBlank"
+                value="0"
+              /><label for="unreadBlank" id="unreadBlankLabel"
+                >__MSG_icons_unread_blank__</label
               >
             </td>
           </tr>
           <tr>
-            <td id="inputradio">
-              <input type="radio" name="iconType" id="unreadNew" value="1" />
-              <label for="unreadNew" id="unreadNewLabel"
-                >&nbsp;__MSG_icons_unread_new__</label
+            <td>
+              <input
+                type="radio"
+                name="iconType"
+                id="unreadNew"
+                value="1"
+              /><label for="unreadNew" id="unreadNewLabel"
+                >__MSG_icons_unread_new__</label
               >
             </td>
           </tr>
           <tr>
-            <td id="inputradio">
-              <input type="radio" name="iconType" id="unreadCustom" value="2" />
-              <label for="unreadCustom" id="unreadCustomLabel"
-                >&nbsp;__MSG_icons_unread_custom__</label
+            <td>
+              <input
+                type="radio"
+                name="iconType"
+                id="unreadCustom"
+                value="2"
+              /><label for="unreadCustom" id="unreadCustomLabel"
+                >__MSG_icons_unread_custom__</label
               >
             </td>
             <td>
@@ -233,7 +250,7 @@
             <td>
               <label
                 for="selectedFileIconType"
-                style="-moz-appearance: button;"
+                style="-moz-appearance: button"
                 }
                 >__MSG_icons_unread_custom_choose__</label
               >
@@ -241,18 +258,20 @@
                 type="file"
                 id="selectedFileIconType"
                 accept="image/*"
-                style="display: none;"
+                style="display: none"
               />
             </td>
-            <td>
-              &emsp;
-            </td>
+            <td>&emsp;</td>
           </tr>
           <tr>
-            <td id="inputradio">
-              <input type="radio" name="iconType" id="unreadNo" value="3" />
-              <label for="unreadNo" id="unreadNoLabel"
-                >&nbsp;__MSG_icons_unread_no__</label
+            <td>
+              <input
+                type="radio"
+                name="iconType"
+                id="unreadNo"
+                value="3"
+              /><label for="unreadNo" id="unreadNoLabel"
+                >__MSG_icons_unread_no__</label
               >
             </td>
           </tr>
@@ -265,23 +284,20 @@
           <tr>
             <td>
               <div id="inputcheck">
-                <input
-                  type="checkbox"
-                  name="showNumber"
-                  value=""
-                />&nbsp;__MSG_icons_number_display__
+                <input type="checkbox" name="showNumber" id="showNo" value="" />
+                <label for="showNo" id="showNumberLabel"
+                  >__MSG_icons_number_display__</label
+                >
               </div>
             </td>
           </tr>
           <tr>
-            <td>
-              &emsp;
-            </td>
+            <td>&emsp;</td>
           </tr>
           <tr></tr>
           <tr>
             <td>
-              <label for="numberColor">__MSG_icons_number_color__&nbsp;</label>
+              <label for="numberColor">__MSG_icons_number_color__</label>
               <input
                 type="color"
                 id="numberColor"
@@ -292,9 +308,10 @@
           </tr>
           <tr>
             <td>
-              <label for="numberSize">__MSG_icons_number_size__&nbsp;</label>
+              <label for="numberSize">__MSG_icons_number_size__</label>
               <input
                 type="number"
+                id="numberSize"
                 name="numberSize"
                 value="0"
                 min="1"
@@ -306,22 +323,21 @@
           </tr>
         </table>
 
-        <table id="countprops" style="display: none;">
+        <table id="countprops" style="display: none">
           <tr>
             <td>
-              <label for="countType"
-                >__MSG_icons_number_count_type__&nbsp;</label
-              >
+              <label for="countType">__MSG_icons_number_count_type__</label>
               <input
                 type="radio"
                 name="countType"
+                id="numberUnread"
                 value="0"
-              />&nbsp;__MSG_icons_number_count_unread__
-              <input
-                type="radio"
-                name="countType"
-                value="1"
-              />&nbsp;__MSG_icons_number_count_new__
+              />
+              <label for="numberUnread"
+                >__MSG_icons_number_count_unread__</label
+              >
+              <input type="radio" name="countType" id="numberNew" value="1" />
+              <label for="numberNew">__MSG_icons_number_count_new__</label>
             </td>
           </tr>
         </table>
@@ -361,9 +377,8 @@
               name="debug"
               id="debugDisplay"
               value="Debug"
-            />
-            <label for="debugDisplay" id="debugDisplayLabel"
-              >&nbsp;__MSG_debug_display__</label
+            /><label for="debugDisplay" id="debugDisplayLabel"
+              >__MSG_debug_display__</label
             >
             <br />
           </div>