From e3878869409f1f8dec5df4b9fbb041ecc828f74b Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Sat, 13 Jun 2020 20:30:12 +0200
Subject: [PATCH] Update locale

---
 webext/_locales/en_US/messages.json | 160 ++++++++++++++++++++++++
 webext/_locales/nl/messages.json    | 160 ++++++++++++++++++++++++
 webext/css/options.css              |  24 +++-
 webext/options.html                 | 187 ++++++++++++++++++++--------
 4 files changed, 474 insertions(+), 57 deletions(-)

diff --git a/webext/_locales/en_US/messages.json b/webext/_locales/en_US/messages.json
index a918ab6..9417acd 100644
--- a/webext/_locales/en_US/messages.json
+++ b/webext/_locales/en_US/messages.json
@@ -27,5 +27,165 @@
   "tab_debug": {
     "message": "Debug",
     "description": "Tab for Debug options"
+  },
+
+  "windows": {
+    "message": "Windows",
+    "description": "Title for Windows options"
+  },
+
+  "windows_min_options": {
+    "message": "Minimize",
+    "description": "Caption for Minimize options"
+  },
+
+  "windows_min_default": {
+    "message": "Default minimize",
+    "description": "Minimize option 1"
+  },
+
+  "windows_min_to_tray_1": {
+    "message": "Minimize to tray, method 1",
+    "description": "Minimize option 2"
+  },
+
+  "windows_min_to_tray_2": {
+    "message": "Minimize to tray, method 2",
+    "description": "Minimize option 3"
+  },
+
+  "windows_start_min": {
+    "message": "Start application minimized",
+    "description": "Start minimized"
+  },
+
+  "windows_min_close": {
+    "message": "Minimize on close",
+    "description": "Minimize on close"
+  },
+
+  "icons": {
+    "message": "Icons",
+    "description": "Title for Icons options"
+  },
+
+  "icons_default_options": {
+    "message": "Default icon",
+    "description": "Caption for Default Icon options"
+  },
+
+  "icons_default_tb": {
+    "message": "Default Thunderbird",
+    "description": "Default icon option 1"
+  },
+
+  "icons_default_lookthrough": {
+    "message": "Lookthrough icon",
+    "description": "Default icon option 2"
+  },
+
+  "icons_default_custom": {
+    "message": "Custom icon",
+    "description": "Default icon option 3"
+  },
+
+  "icons_default_custom_choose": {
+    "message": "Choose...",
+    "description": "Default icon option 3 button"
+  },
+
+  "icons_default_kde_integration": {
+    "message": "KDE integration (Hide)",
+    "description": "Default icon KDE integration"
+  },
+
+  "icons_unread_options": {
+    "message": "Unread mail icon",
+    "description": "Caption for Unread Icon options"
+  },
+
+  "icons_unread_blank": {
+    "message": "Blank icon",
+    "description": "Unread Icon option 1"
+  },
+
+  "icons_unread_new": {
+    "message": "New mail icon",
+    "description": "Unread Icon option 2"
+  },
+
+  "icons_unread_custom": {
+    "message": "Custom icon ",
+    "description": "Unread Icon option 3"
+  },
+
+  "icons_unread_custom_choose": {
+    "message": "Choose...",
+    "description": "Unread Icon option 3 button"
+  },
+
+  "icons_unread_no": {
+    "message": "No icon ",
+    "description": "Unread Icon option 4"
+  },
+
+  "icons_number_options": {
+    "message": "Number",
+    "description": "Caption for Number options"
+  },
+
+  "icons_number_display": {
+    "message": "Display unread message count",
+    "description": "Display the number"
+  },
+
+  "icons_number_color": {
+    "message": "Number color:",
+    "description": "Color of the number"
+  },
+
+  "icons_number_size": {
+    "message": "Number size:",
+    "description": "Size of the number"
+  },
+
+  "icons_number_count_type": {
+    "message": "Message count type:",
+    "description": "Count type options"
+  },
+
+  "icons_number_count_unread": {
+    "message": "Unread",
+    "description": "SCount unread mails"
+  },
+
+  "icons_number_count_new": {
+    "message": "New",
+    "description": "Count new mails"
+  },
+
+  "accounts": {
+    "message": "Accounts",
+    "description": "Title for Accounts options"
+  },
+
+  "debug": {
+    "message": "Debug",
+    "description": "Title for Debug options"
+  },
+
+  "debug_display": {
+    "message": "Display debug window",
+    "description": "Display the debug window"
+  },
+
+  "save_preferences": {
+    "message": "Save preferences",
+    "description": "Save preferences"
+  },
+
+  "save_preferences_button": {
+    "message": "Save",
+    "description": "Save preferences button"
   }
 }
diff --git a/webext/_locales/nl/messages.json b/webext/_locales/nl/messages.json
index 8226c55..7d003bc 100644
--- a/webext/_locales/nl/messages.json
+++ b/webext/_locales/nl/messages.json
@@ -27,5 +27,165 @@
   "tab_debug": {
     "message": "Debug",
     "description": "Tab for Debug options"
+  },
+
+  "windows": {
+    "message": "Vensters",
+    "description": "Title for Windows options"
+  },
+
+  "windows_min_options": {
+    "message": "Minimaliseren",
+    "description": "Caption for Minimize options"
+  },
+
+  "windows_min_default": {
+    "message": "Standaard minimalisatie",
+    "description": "Minimize option 1"
+  },
+
+  "windows_min_to_tray_1": {
+    "message": "Minimaliseer naar systeemvak, methode 1",
+    "description": "Minimize option 2"
+  },
+
+  "windows_min_to_tray_2": {
+    "message": "Minimaliseer naar systeemvak, methode 2",
+    "description": "Minimize option 3"
+  },
+
+  "windows_start_min": {
+    "message": "Start programma geminimaliseerd",
+    "description": "Start minimized"
+  },
+
+  "windows_min_close": {
+    "message": "Minimaliseren bij sluiten",
+    "description": "Minimize on close"
+  },
+
+  "icons": {
+    "message": "Pictogrammen",
+    "description": "Title for Icons options"
+  },
+
+  "icons_default_options": {
+    "message": "Standaard pictogram",
+    "description": "Caption for Default Icon options"
+  },
+
+  "icons_default_tb": {
+    "message": "Standaard Thunderbird",
+    "description": "Default icon option 1"
+  },
+
+  "icons_default_lookthrough": {
+    "message": "Doorzichtig pictogram",
+    "description": "Default icon option 2"
+  },
+
+  "icons_default_custom": {
+    "message": "Aangepast pictogram",
+    "description": "Default icon option 3"
+  },
+
+  "icons_default_custom_choose": {
+    "message": "Kies...",
+    "description": "Default icon option 3 button"
+  },
+
+  "icons_default_kde_integration": {
+    "message": "KDE integratie (Verbergen)",
+    "description": "Default icon KDE integration"
+  },
+
+  "icons_unread_options": {
+    "message": "Berichten notificatie pictogram",
+    "description": "Caption for Unread Icon options"
+  },
+
+  "icons_unread_blank": {
+    "message": "Leeg pictogram",
+    "description": "Unread Icon option 1"
+  },
+
+  "icons_unread_new": {
+    "message": "Nieuw bericht pictogram",
+    "description": "Unread Icon option 2"
+  },
+
+  "icons_unread_custom": {
+    "message": "Aangepast pictogram",
+    "description": "Unread Icon option 3"
+  },
+
+  "icons_unread_custom_choose": {
+    "message": "Kies...",
+    "description": "Unread Icon option 3 button"
+  },
+
+  "icons_unread_no": {
+    "message": "Geen pictogram",
+    "description": "Unread Icon option 4"
+  },
+
+  "icons_number_options": {
+    "message": "Nummer opties",
+    "description": "Caption for Number options"
+  },
+
+  "icons_number_display": {
+    "message": "Aantal ongelezen berichten weergeven",
+    "description": "Display the number"
+  },
+
+  "icons_number_color": {
+    "message": "Nummer kleur:",
+    "description": "Color of the number"
+  },
+
+  "icons_number_size": {
+    "message": "Nummer grootte:",
+    "description": "Size of the number"
+  },
+
+  "icons_number_count_type": {
+    "message": "Type berichttelling:",
+    "description": "Count type options"
+  },
+
+  "icons_number_count_unread": {
+    "message": "Ongelezen",
+    "description": "SCount unread mails"
+  },
+
+  "icons_number_count_new": {
+    "message": "Nieuw",
+    "description": "Count new mails"
+  },
+
+  "accounts": {
+    "message": "Accounts",
+    "description": "Title for Accounts options"
+  },
+
+  "debug": {
+    "message": "Debug",
+    "description": "Title for Debug options"
+  },
+
+  "debug_display": {
+    "message": "Toon debug venster",
+    "description": "Display the debug window"
+  },
+
+  "save_preferences": {
+    "message": "Voorkeuren bewaren",
+    "description": "Save preferences"
+  },
+
+  "save_preferences_button": {
+    "message": "Opslaan",
+    "description": "Save preferences button"
   }
 }
diff --git a/webext/css/options.css b/webext/css/options.css
index f83ba25..6958a4e 100644
--- a/webext/css/options.css
+++ b/webext/css/options.css
@@ -60,8 +60,22 @@ body {
   color: dodgerblue;
 }
 
+#inputradio > input[type="radio"] {
+  margin: 0;
+}
+
+#inputradio > label {
+  display: inline;
+  vertical-align: top;
+}
+
+#inputcheck {
+  display: flex;
+  align-items: center;
+}
+
 #minimizeselect {
-  width: 20em;
+  width: 25em;
   border-style: solid;
   border-width: 1px;
   margin: 10px 10px 10px 10px;
@@ -77,7 +91,7 @@ body {
 }
 
 #defaulticonselect {
-  width: 20em;
+  width: 25em;
   border-style: solid;
   border-width: 1px;
   margin: 10px 10px 10px 10px;
@@ -85,7 +99,7 @@ body {
 }
 
 #iconselect {
-  width: 20em;
+  width: 25em;
   border-style: solid;
   border-width: 1px;
   margin: 10px 10px 10px 10px;
@@ -93,7 +107,7 @@ body {
 }
 
 #numberprops {
-  width: 20em;
+  width: 25em;
   border-style: solid;
   border-width: 1px;
   margin: 10px 10px 10px 10px;
@@ -107,7 +121,7 @@ ul,
 
 /* Remove margins and padding from the parent ul */
 #accountsTree {
-  width: 20em;
+  width: 25em;
   border-style: solid;
   border-width: 1px;
   margin: 0;
diff --git a/webext/options.html b/webext/options.html
index cf129c5..3566c97 100644
--- a/webext/options.html
+++ b/webext/options.html
@@ -32,31 +32,41 @@
 
     <div id="WindowsContent" class="tabcontent" style="display: block;">
       <form>
-        <h3>Windows</h3>
+        <h3>__MSG_windows__</h3>
         <table id="minimizeselect">
           <caption>
+<<<<<<< HEAD
             Minimize action
+=======
+            __MSG_windows_min_options__
+>>>>>>> ec8398d... Update locale
           </caption>
           <tr id="minimizedefault">
-            <td>
-              <input type="radio" name="minimizeType" value="0" />
-              <label for="0" id="minimizedefaultlabel">Default minimize</label
+            <td id="inputradio">
+              <input
+                type="radio"
+                name="minimizeType"
+                id="minDefault"
+                value="0"
+              />
+              <label for="minDefault" id="minimizedefaultlabel"
+                >&nbsp;__MSG_windows_min_default__</label
               ><br />
             </td>
           </tr>
           <tr id="minimizemethod1">
-            <td>
-              <input type="radio" name="minimizeType" value="1" />
-              <label for="1" id="minimizemethod1label"
-                >Minimize to tray, method 1</label
+            <td id="inputradio">
+              <input type="radio" name="minimizeType" id="minMeth1" value="1" />
+              <label for="minMeth1" id="minimizemethod1label"
+                >&nbsp;__MSG_windows_min_to_tray_1__</label
               ><br />
             </td>
           </tr>
           <tr id="minimizemethod2">
-            <td>
-              <input type="radio" name="minimizeType" value="2" />
-              <label for="2" id="minimizemethod2label"
-                >Minimize to tray, method 2</label
+            <td id="inputradio">
+              <input type="radio" name="minimizeType" id="minMeth2" value="2" />
+              <label for="minMeth2" id="minimizemethod2label"
+                >&nbsp;__MSG_windows_min_to_tray_2__</label
               ><br />
             </td>
           </tr>
@@ -91,35 +101,62 @@
           </tr>
         </table>
 
-        <input type="checkbox" name="startMinimized" value="" /> Start
-        application minimized<br />
+        <div id="inputcheck">
+          <input
+            type="checkbox"
+            name="startMinimized"
+            value=""
+          />&nbsp;__MSG_windows_start_min__
+          <br />
+        </div>
       </form>
     </div>
 
     <div id="IconContent" class="tabcontent">
       <form name="iconform">
-        <h3>Icon</h3>
+        <h3>__MSG_icons__</h3>
 
         <table id="defaulticonselect">
           <caption>
-            Default icon
+            __MSG_icons_default_options__
           </caption>
           <tr>
-            <td>
-              <input type="radio" name="defaultIconType" value="0" /> Default
-              Thunderbird
+            <td id="inputradio">
+              <input
+                type="radio"
+                name="defaultIconType"
+                id="defauttTb"
+                value="0"
+              />
+              <label for="defauttTb" id="defauttTbLabel"
+                >&nbsp;__MSG_icons_default_tb__</label
+              >
             </td>
           </tr>
           <tr>
-            <td>
-              <input type="radio" name="defaultIconType" value="1" />
-              Lookthrough icon
+            <td id="inputradio">
+              <input
+                type="radio"
+                name="defaultIconType"
+                id="defauttLookThrough"
+                value="1"
+              />
+              <label for="defauttLookThrough" id="defauttLookThroughLabel"
+                >&nbsp;__MSG_icons_default_lookthrough__</label
+              >
             </td>
           </tr>
           <tr>
-            <td>
-              <input type="radio" name="defaultIconType" value="2" /> Custom
-              icon
+            <td id="inputradio">
+              <input
+                type="radio"
+                name="defaultIconType"
+                id="defaultCustom"
+                value="2"
+              />
+              <label for="defaultCustom" id="defaultCustomLabel"
+                >&nbsp;__MSG_icons_default_custom__</label
+              >
             </td>
             <td>
               <img
@@ -135,7 +172,7 @@
                 for="selectedFileDefaultIconType"
                 style="-moz-appearance: button;"
                 }
-                >Browse...</label
+                >__MSG_icons_default_custom_choose__</label
               >
               <input
                 type="file"
@@ -151,25 +188,41 @@
         </table>
 
         <div id="kdeintegration">
-          <input type="checkbox" name="hideDefaultIcon" value="" /> KDE
-          integration (Hide)<br />
+          <div id="inputcheck">
+            <input
+              type="checkbox"
+              name="hideDefaultIcon"
+              value=""
+            />&nbsp;__MSG_icons_default_kde_integration__<br />
+          </div>
         </div>
 
         <table id="iconselect">
           <caption>
-            Unread mail icon
+            &nbsp;__MSG_icons_unread_options__
           </caption>
           <tr>
-            <td><input type="radio" name="iconType" value="0" /> Blank icon</td>
-          </tr>
-          <tr>
-            <td>
-              <input type="radio" name="iconType" value="1" /> New mail icon
+            <td id="inputradio">
+              <input type="radio" name="iconType" id="unreadBlank" value="0" />
+              <label for="unreadBlank" id="unreadBlankLabel"
+                >&nbsp;__MSG_icons_unread_blank__</label
+              >
             </td>
           </tr>
           <tr>
-            <td>
-              <input type="radio" name="iconType" value="2" /> Custom icon
+            <td id="inputradio">
+              <input type="radio" name="iconType" id="unreadNew" value="1" />
+              <label for="unreadNew" id="unreadNewLabel"
+                >&nbsp;__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>
             <td>
               <img
@@ -185,7 +238,7 @@
                 for="selectedFileIconType"
                 style="-moz-appearance: button;"
                 }
-                >Browse...</label
+                >__MSG_icons_unread_custom_choose__</label
               >
               <input
                 type="file"
@@ -199,18 +252,28 @@
             </td>
           </tr>
           <tr>
-            <td><input type="radio" name="iconType" value="3" /> No icon</td>
+            <td id="inputradio">
+              <input type="radio" name="iconType" id="unreadNo" value="3" />
+              <label for="unreadNo" id="unreadNoLabel"
+                >&nbsp;__MSG_icons_unread_no__</label
+              >
+            </td>
           </tr>
         </table>
 
         <table id="numberprops">
           <caption>
-            Number
+            __MSG_icons_number_options__
           </caption>
           <tr>
             <td>
-              <input type="checkbox" name="showNumber" value="" /> Display
-              unread message count &emsp;
+              <div id="inputcheck">
+                <input
+                  type="checkbox"
+                  name="showNumber"
+                  value=""
+                />&nbsp;__MSG_icons_number_display__
+              </div>
             </td>
           </tr>
           <tr>
@@ -221,7 +284,7 @@
           <tr></tr>
           <tr>
             <td>
-              <label for="numberColor">Number color:</label>
+              <label for="numberColor">__MSG_icons_number_color__&nbsp;</label>
               <input
                 type="color"
                 id="numberColor"
@@ -232,7 +295,7 @@
           </tr>
           <tr>
             <td>
-              <label for="numberSize">Number size:</label>
+              <label for="numberSize">__MSG_icons_number_size__&nbsp;</label>
               <input
                 type="number"
                 name="numberSize"
@@ -249,9 +312,19 @@
         <table id="countprops" style="display: none;">
           <tr>
             <td>
-              <label for="countType">Message count type: </label>
-              <input type="radio" name="countType" value="0" /> Unread
-              <input type="radio" name="countType" value="1" /> New
+              <label for="countType"
+                >__MSG_icons_number_count_type__&nbsp;</label
+              >
+              <input
+                type="radio"
+                name="countType"
+                value="0"
+              />&nbsp;__MSG_icons_number_count_unread__
+              <input
+                type="radio"
+                name="countType"
+                value="1"
+              />&nbsp;__MSG_icons_number_count_new__
             </td>
           </tr>
         </table>
@@ -270,7 +343,7 @@
 
     <div id="MailContent" class="tabcontent">
       <form name="mailform">
-        <h3>Accounts</h3>
+        <h3>__MSG_accounts__</h3>
 
         <ul id="accountsTree"></ul>
 
@@ -282,11 +355,21 @@
 
     <div id="DebugContent" class="tabcontent">
       <form name="debugform">
-        <h3>Debug options</h3>
+        <h3>__MSG_debug__</h3>
         <br />
         <div id="debugselect">
-          <input type="checkbox" name="debug" value="Debug" /> Display debug
-          window<br />
+          <div id="inputcheck">
+            <input
+              type="checkbox"
+              name="debug"
+              id="debugDisplay"
+              value="Debug"
+            />
+            <label for="debugDisplay" id="debugDisplayLabel"
+              >&nbsp;__MSG_debug_display__</label
+            >
+            <br />
+          </div>
         </div>
         <br />
       </form>
@@ -294,8 +377,8 @@
 
     <br />
     <form name="saveform">
-      <label>Save preferences</label>
-      <button type="submit">Save</button>
+      <label>__MSG_save_preferences__</label>
+      <button type="submit">__MSG_save_preferences_button__</button>
     </form>
 
     <script src="js/options_tabbutton.js"></script>