From 31f2224a938dddd750e60a20e21f60193a0f82e6 Mon Sep 17 00:00:00 2001
From: si458 <simonsmith5521@gmail.com>
Date: Sun, 26 Jan 2025 13:54:04 +0000
Subject: [PATCH] add notransval to fix select options translate issues

Signed-off-by: si458 <simonsmith5521@gmail.com>
---
 translate/translate.js    |   4 +-
 translate/translate.json  | 219 +-------------------------------------
 views/default.handlebars  | 102 +++++++++---------
 views/default3.handlebars | 102 +++++++++---------
 4 files changed, 106 insertions(+), 321 deletions(-)

diff --git a/translate/translate.js b/translate/translate.js
index f322f41a..6c1f709d 100644
--- a/translate/translate.js
+++ b/translate/translate.js
@@ -783,10 +783,12 @@ function getStringsHtml(name, node) {
 
         // Check if the "value" attribute exists and needs to be translated
         var subnodeignore = false;
+        var subnodevalueignore = false;
         if ((subnode.attributes != null) && (subnode.attributes.length > 0)) {
             var subnodevalue = null, subnodeplaceholder = null, subnodetitle = null;
             for (var j in subnode.attributes) {
                 if ((subnode.attributes[j].name == 'notrans') && (subnode.attributes[j].value == '1')) { subnodeignore = true; }
+                if ((subnode.attributes[j].name == 'notransval') && (subnode.attributes[j].value == '1')) { subnodevalueignore = true; }
                 if ((subnode.attributes[j].name == 'type') && (subnode.attributes[j].value == 'hidden')) { subnodeignore = true; }
                 if (subnode.attributes[j].name == 'value') { subnodevalue = subnode.attributes[j].value; }
                 if (subnode.attributes[j].name == 'placeholder') { subnodeplaceholder = subnode.attributes[j].value; }
@@ -795,7 +797,7 @@ function getStringsHtml(name, node) {
             if ((subnodevalue != null) && isNumber(subnodevalue) == true) { subnodevalue = null; }
             if ((subnodeplaceholder != null) && isNumber(subnodeplaceholder) == true) { subnodeplaceholder = null; }
             if ((subnodetitle != null) && isNumber(subnodetitle) == true) { subnodetitle = null; }
-            if ((subnodeignore == false) && (subnodevalue != null)) {
+            if ((subnodeignore == false) && (subnodevalueignore == false) && (subnodevalue != null)) {
                 // Add a new string to the list (value)
                 if (sourceStrings[subnodevalue] == null) { sourceStrings[subnodevalue] = { en: subnodevalue, xloc: [name] }; } else { if (sourceStrings[subnodevalue].xloc == null) { sourceStrings[subnodevalue].xloc = []; } sourceStrings[subnodevalue].xloc.push(name); }
             }
diff --git a/translate/translate.json b/translate/translate.json
index ce10734c..fbdbb947 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -1,38 +1,5 @@
 {
   "strings": [
-    {
-      "cs": "",
-      "da": "",
-      "de": "",
-      "en": "",
-      "es": " ",
-      "fi": "",
-      "fr": "",
-      "hi": "",
-      "it": "",
-      "ja": "",
-      "ko": "",
-      "nl": "",
-      "pt": "",
-      "ru": "",
-      "sv": "",
-      "tr": "",
-      "zh-chs": "",
-      "zh-cht": "",
-      "uk": "",
-      "xloc": [
-        "default.handlebars->container->column_l->p16->3->1->0->5->p16filterevents",
-        "default.handlebars->container->column_l->p3->3->1->0->5->p3filterevents",
-        "default.handlebars->container->column_l->p3->3->1->0->5->p3limitdropdown",
-        "default.handlebars->container->column_l->p31->3->1->0->5->p31filterevents",
-        "default.handlebars->container->column_l->p31->3->1->0->5->p31limitdropdown",
-        "default3.handlebars->container->column_l->p16->3->1->0->1->1->p16filterevents",
-        "default3.handlebars->container->column_l->p3->3->1->0->1->1->p3filterevents",
-        "default3.handlebars->container->column_l->p3->3->1->0->1->1->p3limitdropdown",
-        "default3.handlebars->container->column_l->p31->3->1->0->3->1->p31filterevents",
-        "default3.handlebars->container->column_l->p31->3->1->0->3->1->p31limitdropdown"
-      ]
-    },
     {
       "ca": " (",
       "en": " (",
@@ -3217,9 +3184,7 @@
       "zh-chs": "1024x768",
       "zh-cht": "1024x768",
       "xloc": [
-        "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize->9",
-        "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize->9"
       ]
     },
@@ -3365,9 +3330,7 @@
       "zh-chs": "1280x800",
       "zh-cht": "1280x800",
       "xloc": [
-        "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize->11",
-        "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize->11"
       ]
     },
@@ -3396,9 +3359,7 @@
       "zh-chs": "1440x900",
       "zh-cht": "1440x900",
       "xloc": [
-        "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize->13",
-        "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize->13"
       ]
     },
@@ -3491,9 +3452,7 @@
       "zh-chs": "1600x900",
       "zh-cht": "1600x900",
       "xloc": [
-        "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize->15",
-        "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize->15"
       ]
     },
@@ -3522,9 +3481,7 @@
       "zh-chs": "1680x1050",
       "zh-cht": "1680x1050",
       "xloc": [
-        "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize->17",
-        "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize->17"
       ]
     },
@@ -3553,9 +3510,7 @@
       "zh-chs": "1920x1080",
       "zh-cht": "1920x1080",
       "xloc": [
-        "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize->19",
-        "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize->19"
       ]
     },
@@ -4907,9 +4862,7 @@
       "zh-chs": "640x480",
       "zh-cht": "640x480",
       "xloc": [
-        "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize->7",
-        "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize",
         "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize->7"
       ]
     },
@@ -94201,18 +94154,6 @@
         "default3.handlebars->35->507"
       ]
     },
-    {
-      "en": "agentlog",
-      "nl": "agentlog",
-      "xloc": [
-        "default.handlebars->container->column_l->p16->3->1->0->5->p16filterevents",
-        "default.handlebars->container->column_l->p3->3->1->0->5->p3filterevents",
-        "default.handlebars->container->column_l->p31->3->1->0->5->p31filterevents",
-        "default3.handlebars->container->column_l->p16->3->1->0->1->1->p16filterevents",
-        "default3.handlebars->container->column_l->p3->3->1->0->1->1->p3filterevents",
-        "default3.handlebars->container->column_l->p31->3->1->0->3->1->p31filterevents"
-      ]
-    },
     {
       "bs": "amt:",
       "ca": "amt:",
@@ -94400,48 +94341,6 @@
         "default3.handlebars->35->830"
       ]
     },
-    {
-      "en": "batchupload",
-      "nL": "batch upload",
-      "xloc": [
-        "default.handlebars->container->column_l->p16->3->1->0->5->p16filterevents",
-        "default.handlebars->container->column_l->p3->3->1->0->5->p3filterevents",
-        "default.handlebars->container->column_l->p31->3->1->0->5->p31filterevents",
-        "default3.handlebars->container->column_l->p16->3->1->0->1->1->p16filterevents",
-        "default3.handlebars->container->column_l->p3->3->1->0->1->1->p3filterevents",
-        "default3.handlebars->container->column_l->p31->3->1->0->3->1->p31filterevents"
-      ]
-    },
-    {
-      "bs": "browser",
-      "ca": "browser",
-      "cs": "browser",
-      "da": "browser",
-      "de": "browser",
-      "en": "browser",
-      "es": "browser",
-      "fi": "browser",
-      "fr": "browser",
-      "hi": "browser",
-      "hu": "browser",
-      "it": "browser",
-      "ja": "browser",
-      "ko": "browser",
-      "nl": "browser",
-      "pl": "browser",
-      "pt": "browser",
-      "pt-br": "browser",
-      "ru": "browser",
-      "sv": "browser",
-      "tr": "browser",
-      "zh-chs": "browser",
-      "zh-cht": "browser",
-      "uk": "browser",
-      "xloc": [
-        "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize",
-        "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize"
-      ]
-    },
     {
       "bs": "bajtova",
       "ca": "bytes",
@@ -94498,48 +94397,6 @@
       "zh-cht": "取消幫助",
       "uk": "скасуватидопомогу"
     },
-    {
-      "bs": "canvas",
-      "ca": "canvas",
-      "cs": "canvas",
-      "da": "canvas",
-      "de": "canvas",
-      "en": "canvas",
-      "es": "canvas",
-      "fi": "canvas",
-      "fr": "canvas",
-      "hi": "canvas",
-      "hu": "canvas",
-      "it": "canvas",
-      "ja": "canvas",
-      "ko": "canvas",
-      "nl": "canvas",
-      "pl": "canvas",
-      "pt": "canvas",
-      "pt-br": "canvas",
-      "ru": "canvas",
-      "sv": "canvas",
-      "tr": "canvas",
-      "zh-chs": "canvas",
-      "zh-cht": "canvas",
-      "uk": "canvas",
-      "xloc": [
-        "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize",
-        "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize"
-      ]
-    },
-    {
-      "en": "changenode",
-      "nl": "wissel node",
-      "xloc": [
-        "default.handlebars->container->column_l->p16->3->1->0->5->p16filterevents",
-        "default.handlebars->container->column_l->p3->3->1->0->5->p3filterevents",
-        "default.handlebars->container->column_l->p31->3->1->0->5->p31filterevents",
-        "default3.handlebars->container->column_l->p16->3->1->0->1->1->p16filterevents",
-        "default3.handlebars->container->column_l->p3->3->1->0->1->1->p3filterevents",
-        "default3.handlebars->container->column_l->p31->3->1->0->3->1->p31filterevents"
-      ]
-    },
     {
       "bs": "hrom",
       "ca": "cromat",
@@ -96029,17 +95886,6 @@
         "default3.handlebars->35->631"
       ]
     },
-    {
-      "en": "manual",
-      "xloc": [
-        "default.handlebars->container->column_l->p16->3->1->0->5->p16filterevents",
-        "default.handlebars->container->column_l->p3->3->1->0->5->p3filterevents",
-        "default.handlebars->container->column_l->p31->3->1->0->5->p31filterevents",
-        "default3.handlebars->container->column_l->p16->3->1->0->1->1->p16filterevents",
-        "default3.handlebars->container->column_l->p3->3->1->0->1->1->p3filterevents",
-        "default3.handlebars->container->column_l->p31->3->1->0->3->1->p31filterevents"
-      ]
-    },
     {
       "bs": "meshagent",
       "ca": "agent de malla",
@@ -96432,39 +96278,6 @@
         "player.handlebars->3->15"
       ]
     },
-    {
-      "en": "relaylog",
-      "xloc": [
-        "default.handlebars->container->column_l->p16->3->1->0->5->p16filterevents",
-        "default.handlebars->container->column_l->p3->3->1->0->5->p3filterevents",
-        "default.handlebars->container->column_l->p31->3->1->0->5->p31filterevents",
-        "default3.handlebars->container->column_l->p16->3->1->0->1->1->p16filterevents",
-        "default3.handlebars->container->column_l->p3->3->1->0->1->1->p3filterevents",
-        "default3.handlebars->container->column_l->p31->3->1->0->3->1->p31filterevents"
-      ]
-    },
-    {
-      "en": "removenode",
-      "xloc": [
-        "default.handlebars->container->column_l->p16->3->1->0->5->p16filterevents",
-        "default.handlebars->container->column_l->p3->3->1->0->5->p3filterevents",
-        "default.handlebars->container->column_l->p31->3->1->0->5->p31filterevents",
-        "default3.handlebars->container->column_l->p16->3->1->0->1->1->p16filterevents",
-        "default3.handlebars->container->column_l->p3->3->1->0->1->1->p3filterevents",
-        "default3.handlebars->container->column_l->p31->3->1->0->3->1->p31filterevents"
-      ]
-    },
-    {
-      "en": "runcommands",
-      "xloc": [
-        "default.handlebars->container->column_l->p16->3->1->0->5->p16filterevents",
-        "default.handlebars->container->column_l->p3->3->1->0->5->p3filterevents",
-        "default.handlebars->container->column_l->p31->3->1->0->5->p31filterevents",
-        "default3.handlebars->container->column_l->p16->3->1->0->1->1->p16filterevents",
-        "default3.handlebars->container->column_l->p3->3->1->0->1->1->p3filterevents",
-        "default3.handlebars->container->column_l->p31->3->1->0->3->1->p31filterevents"
-      ]
-    },
     {
       "bs": "safari",
       "ca": "safari",
@@ -96495,36 +96308,6 @@
         "player.handlebars->3->14"
       ]
     },
-    {
-      "bs": "screen",
-      "ca": "screen",
-      "cs": "screen",
-      "da": "screen",
-      "de": "screen",
-      "en": "screen",
-      "es": "screen",
-      "fi": "screen",
-      "fr": "screen",
-      "hi": "screen",
-      "hu": "screen",
-      "it": "screen",
-      "ja": "screen",
-      "ko": "screen",
-      "nl": "screen",
-      "pl": "screen",
-      "pt": "screen",
-      "pt-br": "screen",
-      "ru": "screen",
-      "sv": "screen",
-      "tr": "screen",
-      "zh-chs": "screen",
-      "zh-cht": "screen",
-      "uk": "screen",
-      "xloc": [
-        "default.handlebars->container->dialog->dialogBody->dialog7->d7rdpkvm->3->d7rdpsize",
-        "default3.handlebars->container->xxAddAgentModal->xxAddAgentModalConf->1->xxAddAgentBody->dialog7->d7rdpkvm->3->d7rdpsize"
-      ]
-    },
     {
       "bs": "servererrors.txt",
       "ca": "servererrors.txt",
@@ -99566,4 +99349,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/views/default.handlebars b/views/default.handlebars
index e2293b51..9085b345 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -476,23 +476,23 @@
                         <td class="auto-style1">
                             Filter
                             <select id=p3filterevents onchange=refreshEvents()>
-                                <option value="">All Logs</option>
-                                <option value=agentlog>Agent Logs</option>
-                                <option value=relaylog>Relay Logs</option>
-                                <option value=manual>Manual Logs</option>
-                                <option value=runcommands>Run Command Logs</option>
-                                <option value=batchupload>Batch Upload Logs</option>
-                                <option value=changenode>Change Node Logs</option>
-                                <option value=removenode>Remove Node Logs</option>
+                                <option notransval=1 value="">All Logs</option>
+                                <option notransval=1 value=agentlog>Agent Logs</option>
+                                <option notransval=1 value=relaylog>Relay Logs</option>
+                                <option notransval=1 value=manual>Manual Logs</option>
+                                <option notransval=1 value=runcommands>Run Command Logs</option>
+                                <option notransval=1 value=batchupload>Batch Upload Logs</option>
+                                <option notransval=1 value=changenode>Change Node Logs</option>
+                                <option notransval=1 value=removenode>Remove Node Logs</option>
                             </select>
                             Show
                             <select id=p3limitdropdown onchange=refreshEvents()>
-                                <option value=60>Last 60</option>
-                                <option value=120>Last 120</option>
-                                <option value=250>Last 250</option>
-                                <option value=500>Last 500</option>
-                                <option value=1000>Last 1000</option>
-                                <option value="">No limit</option>
+                                <option notransval=1 value=60>Last 60</option>
+                                <option notransval=1 value=120>Last 120</option>
+                                <option notransval=1 value=250>Last 250</option>
+                                <option notransval=1 value=500>Last 500</option>
+                                <option notransval=1 value=1000>Last 1000</option>
+                                <option notransval=1 value="">No limit</option>
                             </select>&nbsp;
                             <a href=# onclick=p3showDownloadEventsDialog(2)><img src=images/link4.png height=10 width=10 title="Download Events" style=cursor:pointer></a>&nbsp;
                         </td>
@@ -993,22 +993,22 @@
                         <td class="auto-style1">
                             Filter
                             <select id=p16filterevents onchange=refreshDeviceEvents()>
-                                <option value="">All Logs</option>
-                                <option value=agentlog>Agent Logs</option>
-                                <option value=relaylog>Relay Logs</option>
-                                <option value=manual>Manual Logs</option>
-                                <option value=runcommands>Run Command Logs</option>
-                                <option value=batchupload>Batch Upload Logs</option>
-                                <option value=changenode>Change Node Logs</option>
-                                <option value=removenode>Remove Node Logs</option>
+                                <option notransval=1 value="">All Logs</option>
+                                <option notransval=1 value=agentlog>Agent Logs</option>
+                                <option notransval=1 value=relaylog>Relay Logs</option>
+                                <option notransval=1 value=manual>Manual Logs</option>
+                                <option notransval=1 value=runcommands>Run Command Logs</option>
+                                <option notransval=1 value=batchupload>Batch Upload Logs</option>
+                                <option notransval=1 value=changenode>Change Node Logs</option>
+                                <option notransval=1 value=removenode>Remove Node Logs</option>
                             </select>
                             Show
                             <select id=p16limitdropdown onchange=refreshDeviceEvents()>
-                                <option value=60>Last 60</option>
-                                <option value=120>Last 120</option>
-                                <option value=250>Last 250</option>
-                                <option value=500>Last 500</option>
-                                <option value=1000>Last 1000</option>
+                                <option notransval=1 value=60>Last 60</option>
+                                <option notransval=1 value=120>Last 120</option>
+                                <option notransval=1 value=250>Last 250</option>
+                                <option notransval=1 value=500>Last 500</option>
+                                <option notransval=1 value=1000>Last 1000</option>
                             </select>
                             <a href=# onclick=p3showDownloadEventsDialog(1)><img src=images/link4.png height=10 width=10 title="Download Events" style=cursor:pointer></a>&nbsp;
                         </td>
@@ -1133,23 +1133,23 @@
                         <td class="auto-style1">
                             Filter
                             <select id=p31filterevents onchange=refreshUsersEvents()>
-                                <option value="">All Logs</option>
-                                <option value=agentlog>Agent Logs</option>
-                                <option value=relaylog>Relay Logs</option>
-                                <option value=manual>Manual Logs</option>
-                                <option value=runcommands>Run Command Logs</option>
-                                <option value=batchupload>Batch Upload Logs</option>
-                                <option value=changenode>Change Node Logs</option>
-                                <option value=removenode>Remove Node Logs</option>
+                                <option notransval=1 value="">All Logs</option>
+                                <option notransval=1 value=agentlog>Agent Logs</option>
+                                <option notransval=1 value=relaylog>Relay Logs</option>
+                                <option notransval=1 value=manual>Manual Logs</option>
+                                <option notransval=1 value=runcommands>Run Command Logs</option>
+                                <option notransval=1 value=batchupload>Batch Upload Logs</option>
+                                <option notransval=1 value=changenode>Change Node Logs</option>
+                                <option notransval=1 value=removenode>Remove Node Logs</option>
                             </select>
                             Show
                             <select id=p31limitdropdown onchange=refreshUsersEvents()>
-                                <option value=60>Last 60</option>
-                                <option value=120>Last 120</option>
-                                <option value=250>Last 250</option>
-                                <option value=500>Last 500</option>
-                                <option value=1000>Last 1000</option>
-                                <option value="">No limit</option>
+                                <option notransval=1 value=60>Last 60</option>
+                                <option notransval=1 value=120>Last 120</option>
+                                <option notransval=1 value=250>Last 250</option>
+                                <option notransval=1 value=500>Last 500</option>
+                                <option notransval=1 value=1000>Last 1000</option>
+                                <option notransval=1 value="">No limit</option>
                             </select>
                             <a href=# onclick=p3showDownloadEventsDialog(3)><img src=images/link4.png height=10 width=10 title="Download Events" style=cursor:pointer></a>&nbsp;
                         </td>
@@ -1453,16 +1453,16 @@
                         <div style="margin-top:8px">
                             <div>Display Size</div>
                             <select id="d7rdpsize">
-                                <option value="canvas">Canvas Size</option>
-                                <option value="browser">Browser Size</option>
-                                <option value="screen">Screen Size</option>
-                                <option value="640x480">640x480</option>
-                                <option value="1024x768">1024x768</option>
-                                <option value="1280x800">1280x800</option>
-                                <option value="1440x900">1440x900</option>
-                                <option value="1600x900">1600x900</option>
-                                <option value="1680x1050">1680x1050</option>
-                                <option value="1920x1080">1920x1080</option>
+                                <option notransval=1 value="canvas">Canvas Size</option>
+                                <option notransval=1 value="browser">Browser Size</option>
+                                <option notransval=1 value="screen">Screen Size</option>
+                                <option notransval=1 value="640x480">640x480</option>
+                                <option notransval=1 value="1024x768">1024x768</option>
+                                <option notransval=1 value="1280x800">1280x800</option>
+                                <option notransval=1 value="1440x900">1440x900</option>
+                                <option notransval=1 value="1600x900">1600x900</option>
+                                <option notransval=1 value="1680x1050">1680x1050</option>
+                                <option notransval=1 value="1920x1080">1920x1080</option>
                             </select>
                         </div>
                         <div>
diff --git a/views/default3.handlebars b/views/default3.handlebars
index b5fbc7ba..ec3e90c3 100644
--- a/views/default3.handlebars
+++ b/views/default3.handlebars
@@ -612,23 +612,23 @@
                             <div class="d-flex align-items-center">
                                 <label for="p3filterevents" class="me-1">Filter</label>
                                 <select id=p3filterevents class="form-select-sm me-2" onchange=refreshEvents()>
-                                    <option value="">All Logs</option>
-                                    <option value=agentlog>Agent Logs</option>
-                                    <option value=relaylog>Relay Logs</option>
-                                    <option value=manual>Manual Logs</option>
-                                    <option value=runcommands>Run Command Logs</option>
-                                    <option value=batchupload>Batch Upload Logs</option>
-                                    <option value=changenode>Change Node Logs</option>
-                                    <option value=removenode>Remove Node Logs</option>
+                                    <option notransval=1 value="">All Logs</option>
+                                    <option notransval=1 value=agentlog>Agent Logs</option>
+                                    <option notransval=1 value=relaylog>Relay Logs</option>
+                                    <option notransval=1 value=manual>Manual Logs</option>
+                                    <option notransval=1 value=runcommands>Run Command Logs</option>
+                                    <option notransval=1 value=batchupload>Batch Upload Logs</option>
+                                    <option notransval=1 value=changenode>Change Node Logs</option>
+                                    <option notransval=1 value=removenode>Remove Node Logs</option>
                                 </select>
                                 <label for="p3limitdropdown" class="me-1">Show</label>
                                 <select id=p3limitdropdown class="form-select-sm me-2" onchange=refreshEvents()>
-                                    <option value=60>Last 60</option>
-                                    <option value=120>Last 120</option>
-                                    <option value=250>Last 250</option>
-                                    <option value=500>Last 500</option>
-                                    <option value=1000>Last 1000</option>
-                                    <option value="">No limit</option>
+                                    <option notransval=1 value=60>Last 60</option>
+                                    <option notransval=1 value=120>Last 120</option>
+                                    <option notransval=1 value=250>Last 250</option>
+                                    <option notransval=1 value=500>Last 500</option>
+                                    <option notransval=1 value=1000>Last 1000</option>
+                                    <option notransval=1 value="">No limit</option>
                                 </select>
                                 <a href=# onclick=p3showDownloadEventsDialog(2)><i class="fa-solid fa-download" title="Download Events"></i></a>
                             </div>
@@ -1334,22 +1334,22 @@
                             <div class="d-flex align-items-center">
                                 <label class="me-1" for="p16filterevents">Filter</label>
                                 <select id=p16filterevents class="form-control-sm me-2" onchange=refreshDeviceEvents()>
-                                    <option value="">All Logs</option>
-                                    <option value=agentlog>Agent Logs</option>
-                                    <option value=relaylog>Relay Logs</option>
-                                    <option value=manual>Manual Logs</option>
-                                    <option value=runcommands>Run Command Logs</option>
-                                    <option value=batchupload>Batch Upload Logs</option>
-                                    <option value=changenode>Change Node Logs</option>
-                                    <option value=removenode>Remove Node Logs</option>
+                                    <option notransval=1 value="">All Logs</option>
+                                    <option notransval=1 value=agentlog>Agent Logs</option>
+                                    <option notransval=1 value=relaylog>Relay Logs</option>
+                                    <option notransval=1 value=manual>Manual Logs</option>
+                                    <option notransval=1 value=runcommands>Run Command Logs</option>
+                                    <option notransval=1 value=batchupload>Batch Upload Logs</option>
+                                    <option notransval=1 value=changenode>Change Node Logs</option>
+                                    <option notransval=1 value=removenode>Remove Node Logs</option>
                                 </select>
                                 <label class="me-1" for="p16limitdropdown">Show</label>
                                 <select id=p16limitdropdown class="form-control-sm me-2" onchange=refreshDeviceEvents()>
-                                    <option value=60>Last 60</option>
-                                    <option value=120>Last 120</option>
-                                    <option value=250>Last 250</option>
-                                    <option value=500>Last 500</option>
-                                    <option value=1000>Last 1000</option>
+                                    <option notransval=1 value=60>Last 60</option>
+                                    <option notransval=1 value=120>Last 120</option>
+                                    <option notransval=1 value=250>Last 250</option>
+                                    <option notransval=1 value=500>Last 500</option>
+                                    <option notransval=1 value=1000>Last 1000</option>
                                 </select>
                                 <i onclick=p3showDownloadEventsDialog(1) class="fa-solid fa-download" title="Download Events" style=cursor:pointer></i>
                             </div>
@@ -1498,23 +1498,23 @@
                             <div class="d-flex align-items-center">
                                 <label for="p31filterevents" class="me-1">Filter</label>
                                 <select id=p31filterevents class="form-select-sm me-2" onchange=refreshUsersEvents()>
-                                    <option value="">All Logs</option>
-                                    <option value=agentlog>Agent Logs</option>
-                                    <option value=relaylog>Relay Logs</option>
-                                    <option value=manual>Manual Logs</option>
-                                    <option value=runcommands>Run Command Logs</option>
-                                    <option value=batchupload>Batch Upload Logs</option>
-                                    <option value=changenode>Change Node Logs</option>
-                                    <option value=removenode>Remove Node Logs</option>
+                                    <option notransval=1 value="">All Logs</option>
+                                    <option notransval=1 value=agentlog>Agent Logs</option>
+                                    <option notransval=1 value=relaylog>Relay Logs</option>
+                                    <option notransval=1 value=manual>Manual Logs</option>
+                                    <option notransval=1 value=runcommands>Run Command Logs</option>
+                                    <option notransval=1 value=batchupload>Batch Upload Logs</option>
+                                    <option notransval=1 value=changenode>Change Node Logs</option>
+                                    <option notransval=1 value=removenode>Remove Node Logs</option>
                                 </select>
                                 <label for="p31limitdropdown" class="me-1">Show</label>
                                 <select id=p31limitdropdown class="form-select-sm me-2" onchange=refreshUsersEvents()>
-                                    <option value=60>Last 60</option>
-                                    <option value=120>Last 120</option>
-                                    <option value=250>Last 250</option>
-                                    <option value=500>Last 500</option>
-                                    <option value=1000>Last 1000</option>
-                                    <option value="">No limit</option>
+                                    <option notransval=1 value=60>Last 60</option>
+                                    <option notransval=1 value=120>Last 120</option>
+                                    <option notransval=1 value=250>Last 250</option>
+                                    <option notransval=1 value=500>Last 500</option>
+                                    <option notransval=1 value=1000>Last 1000</option>
+                                    <option notransval=1 value="">No limit</option>
                                 </select>
                                 <a href=# onclick=p3showDownloadEventsDialog(3)><i class="fa-solid fa-download" role="button" title="Download Events"></i></a>
                             </div>
@@ -1848,16 +1848,16 @@
                                 <div style="margin-top:8px">
                                     <div>Display Size</div>
                                     <select id="d7rdpsize">
-                                        <option value="canvas">Canvas Size</option>
-                                        <option value="browser">Browser Size</option>
-                                        <option value="screen">Screen Size</option>
-                                        <option value="640x480">640x480</option>
-                                        <option value="1024x768">1024x768</option>
-                                        <option value="1280x800">1280x800</option>
-                                        <option value="1440x900">1440x900</option>
-                                        <option value="1600x900">1600x900</option>
-                                        <option value="1680x1050">1680x1050</option>
-                                        <option value="1920x1080">1920x1080</option>
+                                        <option notransval=1 value="canvas">Canvas Size</option>
+                                        <option notransval=1 value="browser">Browser Size</option>
+                                        <option notransval=1 value="screen">Screen Size</option>
+                                        <option notransval=1 value="640x480">640x480</option>
+                                        <option notransval=1 value="1024x768">1024x768</option>
+                                        <option notransval=1 value="1280x800">1280x800</option>
+                                        <option notransval=1 value="1440x900">1440x900</option>
+                                        <option notransval=1 value="1600x900">1600x900</option>
+                                        <option notransval=1 value="1680x1050">1680x1050</option>
+                                        <option notransval=1 value="1920x1080">1920x1080</option>
                                     </select>
                                 </div>
                                 <div>