Updated Dutch, improved back button in web app.

meshuser.js

@@ -412,7 +412,9 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                     if ((user.siteadmin & 21) == 0) return; // Only site administrators with "site backup" or "site restore" or "site update" permissions can use this.
                     if (common.validateInt(command.hours, 0, 24 * 30) == false) return;
                     db.GetServerStats(command.hours, function (err, docs) {
-                        if (err == null) { ws.send(JSON.stringify({ action: 'servertimelinestats', events: docs })); }
+                        if (err == null) {
+                            try { ws.send(JSON.stringify({ action: 'servertimelinestats', events: docs })); } catch (ex) { }
+                        }
                     });
                     break;
                 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.4.5-z",
+  "version": "0.4.6-a",
   "keywords": [
     "Remote Management",
     "Intel AMT",

public/translations/player_ja.htm

@@ -175,8 +175,8 @@
                 var p = recFileMetadata.protocol;
                 if (p == 1) { p = "MeshCentralターミナル"; }
                 else if (p == 2) { p = "MeshCentralデスクトップ"; }
-                else if (p == 100) { p = "Intel＆reg; AMT WSMAN"; }
-                else if (p == 101) { p = "Intel＆reg; AMTリダイレクト"; }
+                else if (p == 100) { p = "Intel® AMT WSMAN"; }
+                else if (p == 101) { p = "Intel® AMTリダイレクト"; }
                 x += addInfoNoEsc("プロトコル", p);
             }
             QV('DeskParent', true);

public/translations/player_nl.htm

@@ -51,12 +51,12 @@
                     <input id="PauseButton" type="button" value="Pause" disabled="disabled" onclick="pause()">
                     <input id="RestartButton" type="button" value="Herstarten" disabled="disabled" onclick="restart()">
                     <select id="PlaySpeed" onchange="this.blur();">
-                        <option value="4">kwart snelheid</option>
-                        <option value="2">halve snelheid</option>
+                        <option value="4">1/4 snelheid</option>
+                        <option value="2">1/2 snelheid</option>
                         <option value="1" selected="">Normale snelheid</option>
                         <option value="0.5">2x Snelheid</option>
                         <option value="0.25">4x snelheid</option>
-                        <option value="0.1">10x Sneheid</option>
+                        <option value="0.1">10x Snelheid</option>
                     </select>
                 </div>
             </div>
@@ -163,7 +163,7 @@
             try { recFileMetadata = JSON.parse(data) } catch (ex) { cleanup(); return; }
             if ((recFileMetadata == null) || (recFileMetadata.magic != 'MeshCentralRelaySession') || (recFileMetadata.ver != 1)) { cleanup(); return; }
             var x = '';
-            x += addInfo("Time", recFileMetadata.time);
+            x += addInfo("Tijd", recFileMetadata.time);
             if (recFileEndTime != 0) { var secs = Math.floor((recFileEndTime - time) / 1000); x += addInfo("Looptijd", format("{0} seconde {1}", secs, (secs > 1) ? 's' : '')); }
             x += addInfo("Gebruikersnaam", recFileMetadata.username);
             x += addInfo("GebruikersID", recFileMetadata.userid);

translate/translate.json

@@ -41,7 +41,8 @@
       ],
       "pt": " + CIRA",
       "ja": " + CIRA",
-      "cs": " + CIRA"
+      "cs": " + CIRA",
+      "nl": " + CIRA"
     },
     {
       "en": " - Reset in {0} day{1}.",
@@ -112,7 +113,7 @@
       ],
       "pt": " Adicionar usuário",
       "ja": " ユーザーを追加する",
-      "nl": " gebruiker toevoegen"
+      "nl": " Gebruiker toevoegen"
     },
     {
       "en": " and authenticate to the server using this username and any password.",
@@ -177,7 +178,8 @@
         "default.handlebars->23->1037"
       ],
       "pt": " Os usuários precisam fazer login neste servidor uma vez antes de poderem ser adicionados a um grupo de dispositivos.",
-      "ja": " ユーザーは、デバイスグループに追加する前にこのサーバーに1回ログインする必要があります。"
+      "ja": " ユーザーは、デバイスグループに追加する前にこのサーバーに1回ログインする必要があります。",
+      "nl": " Gebruikers moeten inloggen bij de server voordat ze kunnen worden toegevoegd aan een apparaatgroep."
     },
     {
       "en": " with TLS.",
@@ -293,8 +295,8 @@
         "default.handlebars->23->145",
         "default-mobile.handlebars->9->89"
       ],
-      "pt": "Intelreg; ",
-      "ja": "、Intel＆reg; AMTのみ",
+      "pt": ", Intel® AMT only",
+      "ja": "、Intel® AMTのみ",
       "nl": ", Intel® AMT alleen"
     },
     {
@@ -485,7 +487,7 @@
       ],
       "pt": "Mais 1 usuário não mostrado, use a caixa de pesquisa para procurar usuários...",
       "ja": "さらに1人のユーザーが表示されていません。検索ボックスを使用してユーザーを検索してください...",
-      "nl": "1 gebruiker niet getoond, gebruik de zoekfunctie om gebruikers te vinden"
+      "nl": "1 gebruiker niet getoond, gebruik de zoekfunctie om gebruikers te vinden..."
     },
     {
       "en": "1 node",
@@ -555,7 +557,7 @@
       ],
       "pt": "1/2 velocidade",
       "ja": "1/2速度",
-      "nl": "halve snelheid"
+      "nl": "1/2 snelheid"
     },
     {
       "en": "1/4 Speed",
@@ -566,7 +568,7 @@
       ],
       "pt": "1/4 de velocidade",
       "ja": "1/4スピード",
-      "nl": "kwart snelheid"
+      "nl": "1/4 snelheid"
     },
     {
       "en": "100%",
@@ -598,7 +600,7 @@
       ],
       "pt": "10x Velocidade",
       "ja": "10倍速",
-      "nl": "10x Sneheid"
+      "nl": "10x Snelheid"
     },
     {
       "en": "12.5%",
@@ -1116,7 +1118,7 @@
       ],
       "pt": "Ação",
       "ja": "アクション",
-      "nl": "Aktie"
+      "nl": "Actie"
     },
     {
       "en": "Actions",
@@ -1131,7 +1133,7 @@
       ],
       "pt": "Ações",
       "ja": "行動",
-      "nl": "Akties"
+      "nl": "Acties"
     },
     {
       "en": "Activate camera & microphone",
@@ -1190,7 +1192,7 @@
       ],
       "pt": "Usuário ativo {0}",
       "ja": "アクティブユーザー{0}",
-      "nl": "Actieve gebruiker(s){0}"
+      "nl": "Actieve gebruikers{0}"
     },
     {
       "en": "Add a new computer to this mesh by installing the mesh agent.",
@@ -1210,8 +1212,8 @@
         "default.handlebars->23->191"
       ],
       "pt": "Adicione um novo Intelreg; Computador AMT digitalizando a rede local.",
-      "ja": "新しいIntel＆reg;を追加しますローカルネットワークをスキャンしてAMTコンピューター。",
-      "nl": "Voeg een nieuwe Intel® AMT computer toe door het lokale netwerk te scannen."
+      "ja": "新しいIntel®を追加しますローカルネットワークをスキャンしてAMTコンピューター。",
+      "nl": "Voeg een nieuwe Intel® AMT computer toe door het lokale netwerk te scannen."
     },
     {
       "en": "Add a new Intel® AMT computer that is located on the internet.",
@@ -1221,8 +1223,8 @@
         "default.handlebars->23->972"
       ],
       "pt": "Adicione um novo Intel® Computador AMT localizado na Internet.",
-      "ja": "新しいIntel＆reg;を追加しますインターネット上にあるAMTコンピューター。",
-      "nl": "Voeg een nieuwe Intel® AMT computer toe welke zich op het internet bevind."
+      "ja": "新しいIntel®を追加しますインターネット上にあるAMTコンピューター。",
+      "nl": "Voeg een nieuwe Intel® AMT computer toe welke zich op het internet bevind."
     },
     {
       "en": "Add a new Intel® AMT computer that is located on the local network.",
@@ -1232,8 +1234,8 @@
         "default.handlebars->23->974"
       ],
       "pt": "Adicione um novo Intel® AMT computer that is located on the local network.",
-      "ja": "新しいIntel＆reg;を追加しますローカルネットワーク上にあるAMTコンピューター。",
-      "nl": "Voeg een nieuwe Intel® AMT computer toe welke zich op het lokale netwerk bevind."
+      "ja": "新しいIntel®を追加しますローカルネットワーク上にあるAMTコンピューター。",
+      "nl": "Voeg een nieuwe Intel® AMT computer toe welke zich op het lokale netwerk bevind."
     },
     {
       "en": "Add a new Intel® AMT device to device group \\\"{0}\\\".",
@@ -1242,7 +1244,7 @@
         "default.handlebars->23->201"
       ],
       "pt": "Adicione um novo Intel® Dispositivo AMT para grupo de dispositivos \\\"{0}\\\".",
-      "ja": "新しいIntel＆reg;を追加しますAMTデバイスからデバイスグループ\\\"{0}\\\"へ。",
+      "ja": "新しいIntel®を追加しますAMTデバイスからデバイスグループ\\\"{0}\\\"へ。",
       "nl": "Voeg een nieuwe Intel® AMT computer toe aan een apparaatgroep \\\"{0}\\\"."
     },
     {
@@ -1295,9 +1297,9 @@
       "xloc": [
         "default.handlebars->23->243"
       ],
-      "pt": "Adicione Intelreg; ",
-      "ja": "Intel＆reg;を追加AMT CIRAデバイス",
-      "nl": "Toevoegen Intel® AMT CIRA apparaat"
+      "pt": "Adicione Intelreg; AMT",
+      "ja": "Intel®を追加AMT CIRAデバイス",
+      "nl": "Toevoegen Intel® AMT CIRA apparaat"
     },
     {
       "en": "Add Intel® AMT device",
@@ -1306,8 +1308,8 @@
         "default.handlebars->23->211"
       ],
       "pt": "Adicione Intelreg; dispositivo AMT",
-      "ja": "Intel＆reg;を追加AMTデバイス",
-      "nl": "Add Intel® AMT aaparaat"
+      "ja": "Intel®を追加AMTデバイス",
+      "nl": "Add Intel® AMT apparaat"
     },
     {
       "en": "Add Key",
@@ -1406,8 +1408,8 @@
         "default.handlebars->23->108"
       ],
       "pt": "Adicione YubiKeyreg; OTP",
-      "ja": "YubiKey＆reg;を追加OTP",
-      "nl": "Voeg YubiKey® OTP toe"
+      "ja": "YubiKey®を追加OTP",
+      "nl": "Voeg YubiKey® OTP toe"
     },
     {
       "en": "Address",
@@ -2014,7 +2016,7 @@
       ],
       "ja": "{0}台のデバイスに接続してもよろしいですか？",
       "cs": "Opravdu připojit k {0} zařízení?",
-      "nl": "Weet u zeker dat u verbinding wilt maken met {0} -apparaten?"
+      "nl": "Weet u zeker dat u verbinding wilt maken met {0} apparaten?"
     },
     {
       "en": "Are you sure you want to delete group {0}? Deleting the device group will also delete all information about devices within this group.",
@@ -4013,7 +4015,7 @@
       "pt": "Área de Trabalho - ",
       "ja": "デスクトップ-",
       "cs": "Plocha -",
-      "nl": "bureaublad - "
+      "nl": "Bureaublad - "
     },
     {
       "en": "Desktop Notify",
@@ -4168,7 +4170,7 @@
       ],
       "pt": "O dispositivo foi detectado, mas não foi possível obter o estado de energia.",
       "ja": "デバイスは検出されましたが、電源状態を取得できませんでした。",
-      "nl": "Apparaat is gedetecteerd, maar de stroomstatus kon niet worden verkregen."
+      "nl": "Apparaat is gedetecteerd, maar de status kon niet worden verkregen."
     },
     {
       "en": "Device is hibernating (S4)",
@@ -4305,7 +4307,7 @@
       "pt": "O dispositivo está presente, mas o estado de energia não pode ser determinado",
       "ja": "デバイスは存在しますが、電源状態を判別できません",
       "cs": "Zařízení je přítomno, ale nelze získat stav napájení",
-      "nl": "Apparaat is aanwezig, maar de stroomstatus kan niet worden bepaald"
+      "nl": "Apparaat is aanwezig, maar de status kan niet worden bepaald"
     },
     {
       "en": "Device Location",
@@ -4358,7 +4360,7 @@
       "pt": "Brinde do dispositivo",
       "ja": "デバイストースト",
       "cs": "Device Toast",
-      "nl": "undefined"
+      "nl": ""
     },
     {
       "en": "DeviceCheckbox",
@@ -4486,7 +4488,7 @@
       "pt": "Não configure",
       "ja": "設定しないでください",
       "cs": "Nekonfigurovat",
-      "nl": "Configureer niet"
+      "nl": "Niet configureren"
     },
     {
       "en": "Don\\'t connect to server",
@@ -4808,9 +4810,9 @@
         "default-mobile.handlebars->9->214"
       ],
       "pt": "Editar Intel & reg; Credenciais AMT",
-      "ja": "Intelを編集＆reg; AMTクレデンシャル",
+      "ja": "Intelを編集® AMTクレデンシャル",
       "cs": "Upravit Intel® AMT pověření",
-      "nl": "Bewerk Intel® AMT-gegevens"
+      "nl": "Bewerk Intel® AMT-gegevens"
     },
     {
       "en": "Edit Notes",
@@ -5337,7 +5339,8 @@
       ],
       "pt": "O servidor remoto retornou um erro: (429) Too Many Requests.",
       "ja": "フェロー語",
-      "cs": "Faeroese"
+      "cs": "Faeroese",
+      "nl": "Faeroese"
     },
     {
       "en": "Failed",
@@ -5714,7 +5717,7 @@
       "pt": "Friuliano",
       "ja": "フリウリアン",
       "cs": "Friulian",
-      "nl": " "
+      "nl": "Friulian"
     },
     {
       "en": "Full Administrator",
@@ -6147,7 +6150,7 @@
       ],
       "ja": "お待ちください、送信されたメールをリセットします。",
       "cs": "Vydržte, email je na cestě.",
-      "nl": "Wacht even, reset e-mail verzonden."
+      "nl": "even wachten, reset e-mail verzonden."
     },
     {
       "en": "Holding 1 entrie for copy",
@@ -6612,7 +6615,7 @@
         "default.handlebars->23->449"
       ],
       "pt": "Intel® Tecnologia de gerenciamento ativo",
-      "ja": "Intel＆reg;アクティブ管理テクノロジー",
+      "ja": "Intel®アクティブ管理テクノロジー",
       "cs": "Intel® Active Management Technology",
       "nl": "Intel® Active Management Technology"
     },
@@ -6629,7 +6632,7 @@
         "default-mobile.handlebars->9->189"
       ],
       "pt": "Intel® AMT",
-      "ja": "Intel＆reg; AMT",
+      "ja": "Intel® AMT",
       "cs": "Intel® AMT",
       "nl": "Intel® AMT"
     },
@@ -6640,7 +6643,7 @@
         "default.handlebars->23->216"
       ],
       "pt": "Intel® Ativação AMT",
-      "ja": "Intel＆reg; AMTアクティベーション",
+      "ja": "Intel® AMTアクティベーション",
       "cs": "Intel® AMT aktivace",
       "nl": "Intel® AMT activatie"
     },
@@ -6651,7 +6654,7 @@
         "default-mobile.handlebars->9->188"
       ],
       "pt": "Intel® AMT CIRA",
-      "ja": "Intel＆reg; AMT CIRA",
+      "ja": "Intel® AMT CIRA",
       "cs": "Intel® AMT CIRA",
       "nl": "Intel® AMT CIRA"
     },
@@ -6663,9 +6666,9 @@
         "default.handlebars->23->463"
       ],
       "pt": "Intel® O AMT CIRA está conectado e pronto para uso.",
-      "ja": "Intel＆reg; AMT CIRAが接続され、使用できる状態になりました。",
+      "ja": "Intel® AMT CIRAが接続され、使用できる状態になりました。",
       "cs": "Intel® AMT CIRA je připojeno a připraveno k použití.",
-      "nl": "Intel® AMT CIRA is verbonden en klaar voor gebruik."
+      "nl": "Intel® AMT CIRA is verbonden en klaar voor gebruik."
     },
     {
       "en": "Intel® AMT Connected",
@@ -6674,9 +6677,9 @@
         "default-mobile.handlebars->9->5"
       ],
       "pt": "Intel® AMT conectado",
-      "ja": "Intel＆reg;接続されたAMT",
+      "ja": "Intel®接続されたAMT",
       "cs": "Intel® AMT připojeno",
-      "nl": "Intel® AMT verbonden"
+      "nl": "Intel® AMT verbonden"
     },
     {
       "en": "Intel® AMT connected",
@@ -6686,9 +6689,9 @@
         "default-mobile.handlebars->9->198"
       ],
       "pt": "Intel® AMT conectado",
-      "ja": "Intel＆reg;接続されたAMT",
+      "ja": "Intel®接続されたAMT",
       "cs": "Intel® AMT připojeno",
-      "nl": "Intel® AMT verbonden"
+      "nl": "Intel® AMT verbonden"
     },
     {
       "en": "Intel® AMT desktop and serial events.",
@@ -6696,9 +6699,9 @@
         "default.handlebars->23->885"
       ],
       "pt": "Intel® Área de trabalho AMT e eventos seriais.",
-      "ja": "Intel＆reg; AMTデスクトップおよびシリアルイベント。",
+      "ja": "Intel® AMTデスクトップおよびシリアルイベント。",
       "cs": "Intel® AMT desktop and serial události.",
-      "nl": "Intel® AMT desktop- en seriële gebeurtenissen."
+      "nl": "Intel® AMT desktop- en seriële gebeurtenissen."
     },
     {
       "en": "Intel® AMT detected",
@@ -6708,7 +6711,7 @@
         "default-mobile.handlebars->9->199"
       ],
       "pt": "Intel® AMT detectado",
-      "ja": "Intel＆reg; AMTが検出されました",
+      "ja": "Intel® AMTが検出されました",
       "cs": "Intel® AMT detekováno",
       "nl": "Intel® AMT gedetecteerd"
     },
@@ -6718,9 +6721,9 @@
         "default.handlebars->23->465"
       ],
       "pt": "Intel® O AMT é roteável e pronto para uso.",
-      "ja": "Intel＆reg; AMTはルーティング可能であり、すぐに使用できます。",
+      "ja": "Intel® AMTはルーティング可能であり、すぐに使用できます。",
       "cs": "Intel® AMT je směrovatelný a připraven k použití.",
-      "nl": "Intel® AMT is routeerbaar en klaar voor gebruik."
+      "nl": "Intel® AMT is routeerbaar en klaar voor gebruik."
     },
     {
       "en": "Intel® AMT is routable.",
@@ -6729,9 +6732,9 @@
         "default.handlebars->23->338"
       ],
       "pt": "Intel® AMT é roteável.",
-      "ja": "Intel＆reg; AMTはルーティング可能です。",
+      "ja": "Intel® AMTはルーティング可能です。",
       "cs": "Intel® AMT je směrovatelný.",
-      "nl": "Intel® AMT is routeerbaar."
+      "nl": "Intel® AMT is routeerbaar."
     },
     {
       "en": "Intel® AMT only",
@@ -6739,7 +6742,7 @@
         "default-mobile.handlebars->9->56"
       ],
       "pt": "Intel® Apenas AMT",
-      "ja": "Intel＆reg; AMTのみ",
+      "ja": "Intel® AMTのみ",
       "cs": "Intel® AMT pouze",
       "nl": "Intel® AMT alleen"
     },
@@ -6751,7 +6754,7 @@
         "default-mobile.handlebars->9->271"
       ],
       "pt": "Intel® Apenas AMT, nenhum agente",
-      "ja": "Intel＆reg; AMTのみ、エージェントなし",
+      "ja": "Intel® AMTのみ、エージェントなし",
       "cs": "Intel® AMT pouze, bez agenta",
       "nl": "Intel® AMT alleen, geen agent"
     },
@@ -6761,9 +6764,9 @@
         "default.handlebars->23->999"
       ],
       "pt": "Intel® Política da AMT",
-      "ja": "Intel＆reg; AMTポリシー",
+      "ja": "Intel® AMTポリシー",
       "cs": "Intel® AMT politika",
-      "nl": "Intel® AMT beleid"
+      "nl": "Intel® AMT beleid"
     },
     {
       "en": "Intel® AMT Redirection",
@@ -6771,7 +6774,7 @@
         "player.htm->3->14"
       ],
       "pt": "Intel® Redirecionamento AMT",
-      "ja": "Intel＆reg; AMTリダイレクト",
+      "ja": "Intel® AMTリダイレクト",
       "cs": "Intel® AMT přesměrování",
       "nl": "Intel® AMT omleiding"
     },
@@ -6781,7 +6784,7 @@
         "default.handlebars->23->454"
       ],
       "pt": "Intel® Tag AMT ",
-      "ja": "Intel＆reg; AMTタグ",
+      "ja": "Intel® AMTタグ",
       "cs": "Intel® AMT značka",
       "nl": "Intel® AMT Tag"
     },
@@ -6791,7 +6794,7 @@
         "player.htm->3->13"
       ],
       "pt": "Intel® AMT WSMAN",
-      "ja": "Intel＆reg; AMT WSMAN",
+      "ja": "Intel® AMT WSMAN",
       "cs": "Intel® AMT WSMAN",
       "nl": "Intel® AMT WSMAN"
     },
@@ -6802,7 +6805,7 @@
         "default-mobile.handlebars->9->183"
       ],
       "pt": "Intel® ME",
-      "ja": "Intel＆reg;私",
+      "ja": "Intel®私",
       "cs": "Intel® ME",
       "nl": "Intel® ME"
     },
@@ -6813,7 +6816,7 @@
         "default-mobile.handlebars->9->185"
       ],
       "pt": "Intel® SM",
-      "ja": "Intel＆reg; SM",
+      "ja": "Intel® SM",
       "cs": "Intel® SM",
       "nl": "Intel® SM"
     },
@@ -6823,9 +6826,9 @@
         "default.handlebars->23->451"
       ],
       "pt": "Intel® Gerenciamento padrão",
-      "ja": "Intel＆reg;標準の管理性",
+      "ja": "Intel®標準の管理性",
       "cs": "Intel® Standard Manageability",
-      "nl": "Standaard beheerbaarheid van Intel®"
+      "nl": "Standaard beheerbaarheid van Intel®"
     },
     {
       "en": "Intel® AMT",
@@ -6833,7 +6836,7 @@
         "default.handlebars->container->topbar->1->1->MainSubMenuSpan->MainSubMenu->1->0->MainDevAmt"
       ],
       "pt": "Intel® AMT",
-      "ja": "インテル®AMT",
+      "ja": "Intel® AMT",
       "cs": "Intel® AMT",
       "nl": "Intel® AMT"
     },
@@ -6843,7 +6846,7 @@
         "default.handlebars->container->column_l->p14->p14title->5"
       ],
       "pt": "Intel® AMT -",
-      "ja": "インテル®AMT-",
+      "ja": "Intel® AMT -",
       "cs": "Intel® AMT -",
       "nl": "Intel® AMT -"
     },
@@ -6854,7 +6857,7 @@
         "default-mobile.handlebars->dialog->3->dialog7->d7amtkvm->1"
       ],
       "pt": "Intel® AMT Hardware KVM",
-      "ja": "インテル®AMTハードウェアKVM",
+      "ja": "Intel® AMTハードウェアKVM",
       "cs": "Intel® AMT Hardware KVM",
       "nl": "Intel® AMT Hardware KVM"
     },
@@ -9282,7 +9285,7 @@
         "default-mobile.handlebars->9->319"
       ],
       "pt": "Nenhum Intel® AMT",
-      "ja": "Intel＆reg;なしAMT",
+      "ja": "Intel®なしAMT",
       "cs": "Žádné Intel® AMT",
       "nl": "Geen Intel® AMT"
     },
@@ -9292,7 +9295,7 @@
         "default-mobile.handlebars->9->93"
       ],
       "pt": "Nenhum Intel® AMT devices in this group",
-      "ja": "Intel＆reg;なしこのグループのAMTデバイス",
+      "ja": "Intel®なしこのグループのAMTデバイス",
       "cs": "Žádné Intel® AMT zařízení v této skupině",
       "nl": "Geen Intel® AMT-apparaten in deze groep"
     },
@@ -9302,7 +9305,7 @@
         "default.handlebars->23->164"
       ],
       "pt": "Nenhum Intel® dispositivos AMT nessa malha",
-      "ja": "Intel＆reg;なしこのメッシュのAMTデバイス",
+      "ja": "Intel®なしこのメッシュのAMTデバイス",
       "cs": "Žádné Intel® AMT zařízení",
       "nl": "Geen Intel® AMT-apparaten in deze mesh"
     },
@@ -10575,7 +10578,7 @@
       "pt": "Solicitar consentimento do usuário",
       "ja": "ユーザーの同意を求める",
       "cs": "Výzva k souhlasu uživatele",
-      "nl": "Vragen gebruikerstoestemming"
+      "nl": "Vraag gebruikerstoestemming"
     },
     {
       "en": "Protocol",
@@ -10723,9 +10726,9 @@
         "default.handlebars->23->1004"
       ],
       "pt": "Reativar Intel®AMT",
-      "ja": "インテルを再アクティブ化＆reg; AMT",
+      "ja": "インテルを再アクティブ化® AMT",
       "cs": "ReaktivaceIntel® AMT",
-      "nl": "Heractiveer Intel® AMT"
+      "nl": "Heractiveer Intel® AMT"
     },
     {
       "en": "Realms",
@@ -11466,9 +11469,9 @@
         "default.handlebars->23->220"
       ],
       "pt": "Digitalizar para Intel® dispositivos AMT",
-      "ja": "Intelをスキャン＆reg; AMTデバイス",
+      "ja": "Intelをスキャン® AMTデバイス",
       "cs": "Hledat Intel® AMT zařízení",
-      "nl": "Scannen naar Intel® AMT-apparaten"
+      "nl": "Scannen naar Intel®  AMT-apparaten"
     },
     {
       "en": "Scan Network",
@@ -12995,7 +12998,8 @@
       ],
       "pt": "Prompt do terminal",
       "ja": "端末プロンプト",
-      "cs": "Výzva terminálu"
+      "cs": "Výzva terminálu",
+      "nl": ""
     },
     {
       "en": "Terms & Privacy",
@@ -13141,7 +13145,8 @@
         "error404-mobile.handlebars->container->page_content->column_l->3"
       ],
       "pt": "Esta página não existe",
-      "ja": "このページは存在しません"
+      "ja": "このページは存在しません",
+      "nl": ""
     },
     {
       "en": "This policy will not impact devices with Intel® AMT in ACM mode.",
@@ -13149,8 +13154,9 @@
         "default.handlebars->23->1015"
       ],
       "pt": "Esta política não afetará os dispositivos com Intel® AMT no modo ACM.",
-      "ja": "このポリシーは、Intel＆reg;を搭載したデバイスには影響しません。 ACMモードのAMT。",
-      "cs": "Tato zásada nebude mít vliv na zařízení s Intel® AMT in ACM módem."
+      "ja": "このポリシーは、Intel®を搭載したデバイスには影響しません。 ACMモードのAMT。",
+      "cs": "Tato zásada nebude mít vliv na zařízení s Intel® AMT in ACM módem.",
+      "nl": ""
     },
     {
       "en": "This software consists of voluntary contributions made by many individuals (AUTHORS.txt, http://jqueryui.com/about ). For exact contribution history,see the revision history and logs, available at http://jquery-ui.googlecode.com/svn/",
@@ -13160,7 +13166,8 @@
       ],
       "pt": "Este software consiste em contribuições voluntárias feitas por muitos indivíduos (AUTORES.txt, http://jqueryui.com/about ). Para obter o histórico exato de contribuições, consulte o histórico de revisões e os logs, disponíveis em http://jquery-ui.googlecode.com/svn/",
       "ja": "このソフトウェアは、多くの個人による自発的な貢献で構成されています（AUTHORS.txt、http：//jqueryui.com/about）。正確な貢献履歴については、http：//jquery-ui.googlecode.com/svn/にある改訂履歴とログをご覧ください",
-      "cs": "Tento software se skládá z dobrovolných příspěvků mnoha jednotlivců (AUTHORS.txt, http://jqueryui.com/about ). Přesnou historii příspěvků naleznete v historii revizí a protokolech dostupných na adrese http://jquery-ui.googlecode.com/svn/"
+      "cs": "Tento software se skládá z dobrovolných příspěvků mnoha jednotlivců (AUTHORS.txt, http://jqueryui.com/about ). Přesnou historii příspěvků naleznete v historii revizí a protokolech dostupných na adrese http://jquery-ui.googlecode.com/svn/",
+      "nl": ""
     },
     {
       "en": "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
@@ -13229,7 +13236,8 @@
       ],
       "pt": "Tigre",
       "ja": "ティグレ",
-      "cs": "Tigre"
+      "cs": "Tigre",
+      "nl": "Tigre"
     },
     {
       "en": "Time",
@@ -13239,7 +13247,8 @@
       ],
       "pt": "Tempo",
       "ja": "時間",
-      "cs": "Čas"
+      "cs": "Čas",
+      "nl": "Tijd"
     },
     {
       "en": "time, conn.agent, conn.users, conn.usersessions, conn.relaysession, conn.intelamt, mem.external, mem.heapused, mem.heaptotal, mem.rss",
@@ -13248,7 +13257,8 @@
       ],
       "pt": "tempo, conn.agente, conn.usuários.usersessions, conn.relaysession, conn.intelamt, mem.externo mem.amontoado, mem.heaptotal, mem.rss",
       "ja": "time、conn.agent、conn.users、conn.usersessions、conn.relaysession、conn.intelamt、mem.external、mem.heapused、mem.heaptotal、mem.rss",
-      "cs": "time, conn.agent, conn.users, conn.usersessions, conn.relaysession, conn.intelamt, mem.external, mem.heapused, mem.heaptotal, mem.rss"
+      "cs": "time, conn.agent, conn.users, conn.usersessions, conn.relaysession, conn.intelamt, mem.external, mem.heapused, mem.heaptotal, mem.rss",
+      "nl": "tijd, conn.agent, conn.gebruikers, conn.gebruikerssessies, conn.relaysessie, conn.intelamt, mem.extern, mem.heapused, mem.heaptotaal, mem.rss"
     },
     {
       "en": "time, source, message",
@@ -13257,7 +13267,8 @@
       ],
       "pt": "hora, fonte, mensagem",
       "ja": "時間、ソース、メッセージ",
-      "cs": "time, source, message"
+      "cs": "time, source, message",
+      "nl": "tijd, bron, bericht"
     },
     {
       "en": "time, type, action, user, message",
@@ -13266,7 +13277,8 @@
       ],
       "pt": "hora, tipo, ação, usuário, mensagem",
       "ja": "時間、タイプ、アクション、ユーザー、メッセージ",
-      "cs": "time, type, action, user, message"
+      "cs": "time, type, action, user, message",
+      "nl": "tijd, type, actie, gebruiker, bericht"
     },
     {
       "en": "TLS",
@@ -13277,7 +13289,8 @@
       ],
       "pt": "TLS",
       "ja": "TLS",
-      "cs": "TLS"
+      "cs": "TLS",
+      "nl": "TLS"
     },
     {
       "en": "TLS security required",
@@ -13328,9 +13341,9 @@
         "default.handlebars->23->226"
       ],
       "pt": "Para adicionar um novo Intel&reg; Dispositivo AMT para grupo de dispositivos \\\"{0}\\\" com CIRA, baixe os seguintes arquivos de script e use <a href='http://meshcommander.com' rel='noreferrer noopener' target='_blank'>MeshCommander</a> para executar o script para configurar computadores.",
-      "ja": "新しいIntel＆reg;を追加するにはCIRAを使用してAMTデバイスからデバイスグループ\\\"{0}\\\"に移動し、次のスクリプトファイルをダウンロードして、<a href='http://meshcommander.com' rel='noreferrer noopener' target='_blank'> MeshCommander </を使用しますa>スクリプトを実行してコンピューターを構成します。",
+      "ja": "新しいIntel&reg;を追加するにはCIRAを使用してAMTデバイスからデバイスグループ\\\"{0}\\\"に移動し、次のスクリプトファイルをダウンロードして、<a href='http://meshcommander.com' rel='noreferrer noopener' target='_blank'> MeshCommander </を使用しますa>スクリプトを実行してコンピューターを構成します。",
       "cs": "Pro přidání nového Intel&reg; AMT zařízení do skupiny \\\"{0}\\\" s CIRA, si musíte stáhnout následující skript <a href='http://meshcommander.com' rel='noreferrer noopener' target='_blank'>MeshCommander</a> a spustit pro konfiguraci počítačů.",
-      "nl": "Om een nieuw Intel® AMT-apparaat toe te voegen aan apparaatgroep \\\"{0}\\\" met CIRA, downloadt u de volgende scriptbestanden en gebruikt u <a href = 'http: //meshcommander.com' rel = 'noreferrer noopener' target = ' _blank '> MeshCommander </a> om het script uit te voeren om computers te configureren."
+      "nl": "Om een nieuw Intel&reg; AMT-apparaat toe te voegen aan apparaatgroep \\\"{0}\\\" met CIRA, downloadt u de volgende scriptbestanden en gebruikt u <a href='http://meshcommander.com' rel='noreferrer noopener' target='_blank'>MeshCommander</a> om het script uit te voeren om computers te configureren."
     },
     {
       "en": "To add a new Intel&reg; AMT device to device group \\\"{0}\\\" with CIRA, load the following certificate as trusted root within Intel AMT",
@@ -13338,9 +13351,9 @@
         "default.handlebars->23->229"
       ],
       "pt": "Para adicionar um novo Intel&reg; Dispositivo AMT para grupo de dispositivos \\\"{0}\\\" com CIRA, carregue o seguinte certificado como raiz confiável no Intel AMT",
-      "ja": "新しいIntel＆reg;を追加するにはAMTデバイスからCIRAを使用したデバイスグループ\\\"{0}\\\"に、Intel AMT内で信頼されたルートとして次の証明書をロード",
+      "ja": "新しいIntel&reg;を追加するにはAMTデバイスからCIRAを使用したデバイスグループ\\\"{0}\\\"に、Intel AMT内で信頼されたルートとして次の証明書をロード",
       "cs": "Pro přidání nového Intel&reg; AMT zařízení do skupiny \\\"{0}\\\" s CIRA, nahrajte následující certifikát mezi důvěryhodné kořenové v rámci Intel AMT",
-      "nl": "v"
+      "nl": "Om een nieuw Intel&reg; AMT-apparaat toe te voegen aan apparaatgroep \\\"{0}\\\" met CIRA, laadt u het volgende certificaat als vertrouwde root in Intel AMT"
     },
     {
       "en": "To add a new Intel&reg; AMT device to device group \\\"{0}\\\" with CIRA, load the following certificate as trusted root within Intel AMT, authenticate using a client certificate with the following common name and connect to the following server.",
@@ -13348,9 +13361,9 @@
         "default.handlebars->23->238"
       ],
       "pt": "Para adicionar um novo Intel&reg; Dispositivo AMT para grupo de dispositivos \\\"{0}\\\" com CIRA, carregue o seguinte certificado como raiz confiável no Intel AMT, autentique usando um certificado de cliente com o seguinte nome comum e conecte-se ao servidor a seguir.",
-      "ja": "新しいIntel＆reg;を追加するにはCIRAを使用してデバイスグループ\\\"{0}\\\"へのAMTデバイス、Intel AMT内の信頼されたルートとして次の証明書を読み込み、次の共通名を持つクライアント証明書を使用して認証し、次のサーバーに接続します。",
+      "ja": "新しいIntel&reg;を追加するにはCIRAを使用してデバイスグループ\\\"{0}\\\"へのAMTデバイス、Intel AMT内の信頼されたルートとして次の証明書を読み込み、次の共通名を持つクライアント証明書を使用して認証し、次のサーバーに接続します。",
       "cs": "Pro přidání nového Intel&reg; AMT zařízení do skupiny \\\"{0}\\\" s CIRA, nahrajte následující certifikát mezi důvěryhodné kořenové v rámci Intel AMT, tímto klientským certifikátem se pak bude autentizovat s následujícím běžným názvem a připojí se k následujícímu serveru.",
-      "nl": "Om een nieuw Intel® AMT-apparaat toe te voegen aan apparaatgroep \\\"{0}\\\" met CIRA, laadt u het volgende certificaat als vertrouwde root in Intel AMT, verifieert u met een clientcertificaat met de volgende gemeenschappelijke naam en maakt u verbinding met de volgende server."
+      "nl": "Om een nieuw Intel&reg; AMT-apparaat toe te voegen aan apparaatgroep \\\"{0}\\\" met CIRA, laadt u het volgende certificaat als vertrouwde root in Intel AMT, verifieert u met een clientcertificaat met de volgende gemeenschappelijke naam en maakt u verbinding met de volgende server."
     },
     {
       "en": "To delete this account, type in the account password in both boxes below and hit ok.",
@@ -13420,7 +13433,7 @@
       "pt": "Alterna o tipo de emulação de teclas F1 a F10",
       "ja": "F1からF10キーのエミュレーションタイプを切り替えます",
       "cs": "Přepněte typ emulace kláves F1 na F10",
-      "nl": "Schakel het emulatietype van F1 naar F10-toetsen"
+      "nl": "Schakel het emulatietype van F1 naar F10 toetsen"
     },
     {
       "en": "Toggle focus mode, when active only the region around the mouse is updated",
@@ -14128,7 +14141,7 @@
       "pt": "Identificador do usuário",
       "ja": "ユーザー識別子",
       "cs": "Identifikátor uživatele",
-      "nl": "gebruikers-ID"
+      "nl": "gebruikersID"
     },
     {
       "en": "User interface selection",
@@ -14254,7 +14267,7 @@
       ],
       "ja": "ユーザー名は既に存在します。",
       "cs": "Uživatel již existuje.",
-      "nl": "Gebruikersnaam bestaal al."
+      "nl": "Gebruikersnaam bestaat al."
     },
     {
       "en": "Username:",
@@ -14443,7 +14456,7 @@
       ],
       "pt": "Aguardando outro usuário ...",
       "ja": "他のユーザーを待っています...",
-      "nl": "Wachten op andere gebruiker ..."
+      "nl": "Wachten op de gebruiker ..."
     },
     {
       "en": "Wake Devices",
@@ -14929,7 +14942,7 @@
         "agentinvite.handlebars->container->column_l->3"
       ],
       "pt": "Você foi convidado a instalar um software que permitirá que um operador remoto acesse totalmente seu computador remotamente, incluindo a área de trabalho e os arquivos.\n                Siga apenas as instruções abaixo se esse convite for esperado e você sabe quem acessará seu computador.\n                Selecionando seu sistema operacional e siga as instruções abaixo.",
-      "nl": "U bent uitgenodigd om software te installeren waarmee een externe operator op afstand volledige toegang heeft tot uw computer, inclusief het bureaublad en de bestanden.\n                 Volg de onderstaande instructies alleen als deze uitnodiging werd verwacht en u weet wie toegang krijgt tot uw computer.\n                 Selecteer uw besturingssysteem en volg de onderstaande instructies."
+      "nl": "U bent uitgenodigd om software te installeren waarmee een externe operator op afstand volledige toegang heeft tot uw computer, inclusief het bureaublad en de bestanden. Volg de onderstaande instructies alleen als deze uitnodiging werd verwacht en u weet wie toegang krijgt tot uw computer. Selecteer uw besturingssysteem en volg de onderstaande instructies."
     },
     {
       "en": "You will now need a valid token to login again.",
@@ -14950,7 +14963,7 @@
       "pt": "YubiKey&trade; OTP",
       "ja": "YubiKey＆trade; OTP",
       "cs": "YubiKey&trade; OTP",
-      "nl": "YubiKey™ OTP"
+      "nl": "YubiKey&trade; OTP"
     },
     {
       "en": "Zoom to fit extent",

views/default-min.handlebars

@@ -63,6 +63,7 @@
         var pluginHandler = null;
         if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
         var installedPluginList = null;
+        var goBackStack = [];
 
         // Console Message Display Timers
         var p11DeskConsoleMsgTimer = null;
@@ -8561,11 +8562,10 @@
 
         function goBack() {
             setSessionActivity();
-            if (xxdialogMode) return;
+            if (xxdialogMode || (goBackStack.length == 0)) return;
             if (fullscreen) { deskToggleFull(); }
-            if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
-            if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
-            if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
+            go(goBackStack.pop());
+            goBackStack.pop();
         }
 
         function go(x, event) {
@@ -8584,8 +8584,15 @@
                 return;
             }
 
+            // If we are going to the same place, do nothing.
             if (xxcurrentView == x) return;
 
+            // Set the goback stack, if going to top-level view, clear the stack.
+            if ((xxcurrentView < 0) || (x < 10)) { goBackStack = []; } else {
+                // Do not push into the back stack if we are changing tabs at the same level.
+                if (Math.floor(xxcurrentView / 10) != Math.floor(x / 10)) { goBackStack.push(xxcurrentView); }
+            }
+
             // Edit this line when adding a new screen
             for (var i = 0; i < 44; i++) { QV('p' + i, i == x); }
             xxcurrentView = x;
@@ -8608,29 +8615,34 @@
             var mainMenuActiveClass = (x < 9 ? 'fullselect' : 'semiselect');
             var leftMenuActiveClass = (((x < 9) || (x == 115) || (x == 40) || (x == 41) || (x == 42)) ? 'lbbuttonsel2' : 'lbbuttonsel');
 
+            var backView = 0;
+            if (goBackStack.length > 0) { backView = goBackStack[goBackStack.length - 1]; }
+
             // My Devices
-            if (x == 1 || (x >= 10 && x < 20)) QC('MainMenuMyDevices').add(mainMenuActiveClass);
-            if (x == 1 || (x >= 10 && x < 20)) QC('LeftMenuMyDevices').add(leftMenuActiveClass);
-
+            if (x == 1 || (backView == 1) || ((backView == 0) && (x >= 10 && x < 20))) {
+                QC('MainMenuMyDevices').add(mainMenuActiveClass);
+                QC('LeftMenuMyDevices').add(leftMenuActiveClass);
+            } else if (x == 2 || (backView == 2) || ((backView == 0) && (x >= 20 && x < 30))) {
                 // My Account
-            if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
-            if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
+                QC('MainMenuMyAccount').add(mainMenuActiveClass);
+                QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+            } else if (x == 3) {
                 // My Events
-            if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
-            if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
+                QC('MainMenuMyEvents').add(mainMenuActiveClass);
+                QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+            } else if (x == 4 || (x >= 30 && x < 40)) {
                 // My Users
-            if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
-            if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
+                QC('MainMenuMyUsers').add(mainMenuActiveClass);
+                QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+            } else if (x == 5) {
                 // My Files
-            if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
-            if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
+                QC('MainMenuMyFiles').add(mainMenuActiveClass);
+                QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+            } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
                 // My Server
-            if ((x == 6) || (x == 115)) QC('MainMenuMyServer').add(mainMenuActiveClass);
-            if ((x == 6) || (x == 115) || (x == 40) || (x == 41) || (x == 42) || (x == 43)) QC('LeftMenuMyServer').add(leftMenuActiveClass);
+                QC('MainMenuMyServer').add(mainMenuActiveClass);
+                QC('LeftMenuMyServer').add(leftMenuActiveClass);
+            }
             QV('ServerPlugins', pluginHandler != null);
 
             // column_l max-height

views/default.handlebars

@@ -1103,6 +1103,7 @@
         var pluginHandler = null;
         if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
         var installedPluginList = null;
+        var goBackStack = [];
 
         // Console Message Display Timers
         var p11DeskConsoleMsgTimer = null;
@@ -9601,11 +9602,10 @@
 
         function goBack() {
             setSessionActivity();
-            if (xxdialogMode) return;
+            if (xxdialogMode || (goBackStack.length == 0)) return;
             if (fullscreen) { deskToggleFull(); }
-            if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
-            if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
-            if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
+            go(goBackStack.pop());
+            goBackStack.pop();
         }
 
         function go(x, event) {
@@ -9624,8 +9624,15 @@
                 return;
             }
 
+            // If we are going to the same place, do nothing.
             if (xxcurrentView == x) return;
 
+            // Set the goback stack, if going to top-level view, clear the stack.
+            if ((xxcurrentView < 0) || (x < 10)) { goBackStack = []; } else {
+                // Do not push into the back stack if we are changing tabs at the same level.
+                if (Math.floor(xxcurrentView / 10) != Math.floor(x / 10)) { goBackStack.push(xxcurrentView); }
+            }
+
             // Edit this line when adding a new screen
             for (var i = 0; i < 44; i++) { QV('p' + i, i == x); }
             xxcurrentView = x;
@@ -9648,29 +9655,34 @@
             var mainMenuActiveClass = (x < 9 ? 'fullselect' : 'semiselect');
             var leftMenuActiveClass = (((x < 9) || (x == 115) || (x == 40) || (x == 41) || (x == 42)) ? 'lbbuttonsel2' : 'lbbuttonsel');
 
+            var backView = 0;
+            if (goBackStack.length > 0) { backView = goBackStack[goBackStack.length - 1]; }
+
             // My Devices
-            if (x == 1 || (x >= 10 && x < 20)) QC('MainMenuMyDevices').add(mainMenuActiveClass);
-            if (x == 1 || (x >= 10 && x < 20)) QC('LeftMenuMyDevices').add(leftMenuActiveClass);
-
+            if (x == 1 || (backView == 1) || ((backView == 0) && (x >= 10 && x < 20))) {
+                QC('MainMenuMyDevices').add(mainMenuActiveClass);
+                QC('LeftMenuMyDevices').add(leftMenuActiveClass);
+            } else if (x == 2 || (backView == 2) || ((backView == 0) && (x >= 20 && x < 30))) {
                 // My Account
-            if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
-            if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
+                QC('MainMenuMyAccount').add(mainMenuActiveClass);
+                QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+            } else if (x == 3) {
                 // My Events
-            if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
-            if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
+                QC('MainMenuMyEvents').add(mainMenuActiveClass);
+                QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+            } else if (x == 4 || (x >= 30 && x < 40)) {
                 // My Users
-            if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
-            if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
+                QC('MainMenuMyUsers').add(mainMenuActiveClass);
+                QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+            } else if (x == 5) {
                 // My Files
-            if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
-            if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
+                QC('MainMenuMyFiles').add(mainMenuActiveClass);
+                QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+            } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
                 // My Server
-            if ((x == 6) || (x == 115)) QC('MainMenuMyServer').add(mainMenuActiveClass);
-            if ((x == 6) || (x == 115) || (x == 40) || (x == 41) || (x == 42) || (x == 43)) QC('LeftMenuMyServer').add(leftMenuActiveClass);
+                QC('MainMenuMyServer').add(mainMenuActiveClass);
+                QC('LeftMenuMyServer').add(leftMenuActiveClass);
+            }
             QV('ServerPlugins', pluginHandler != null);
 
             // column_l max-height

views/translations/agentinvite_nl.handlebars

@@ -71,9 +71,7 @@
         <div id="column_l" style="max-height:calc(100vh - 135px);overflow-y:auto">
             <h1>Remote Agent installatie<span id="groupname"></span></h1>
             <p>
-                U bent uitgenodigd om software te installeren waarmee een externe operator op afstand volledige toegang heeft tot uw computer, inclusief het bureaublad en de bestanden.
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Volg de onderstaande instructies alleen als deze uitnodiging werd verwacht en u weet wie toegang krijgt tot uw computer.
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Selecteer uw besturingssysteem en volg de onderstaande instructies.
+                U bent uitgenodigd om software te installeren waarmee een externe operator op afstand volledige toegang heeft tot uw computer, inclusief het bureaublad en de bestanden. Volg de onderstaande instructies alleen als deze uitnodiging werd verwacht en u weet wie toegang krijgt tot uw computer. Selecteer uw besturingssysteem en volg de onderstaande instructies.
             </p>
             <div>
                 <div class="tab">

views/translations/default-min_cs.handlebars

@@ -63,6 +63,7 @@
         var pluginHandler = null;
         if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
         var installedPluginList = null;
+        var goBackStack = [];
 
         // Console Message Display Timers
         var p11DeskConsoleMsgTimer = null;
@@ -8561,11 +8562,10 @@
 
         function goBack() {
             setSessionActivity();
-            if (xxdialogMode) return;
+            if (xxdialogMode || (goBackStack.length == 0)) return;
             if (fullscreen) { deskToggleFull(); }
-            if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
-            if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
-            if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
+            go(goBackStack.pop());
+            goBackStack.pop();
         }
 
         function go(x, event) {
@@ -8584,8 +8584,15 @@
                 return;
             }
 
+            // If we are going to the same place, do nothing.
             if (xxcurrentView == x) return;
 
+            // Set the goback stack, if going to top-level view, clear the stack.
+            if ((xxcurrentView < 0) || (x < 10)) { goBackStack = []; } else {
+                // Do not push into the back stack if we are changing tabs at the same level.
+                if (Math.floor(xxcurrentView / 10) != Math.floor(x / 10)) { goBackStack.push(xxcurrentView); }
+            }
+
             // Edit this line when adding a new screen
             for (var i = 0; i < 44; i++) { QV('p' + i, i == x); }
             xxcurrentView = x;
@@ -8608,29 +8615,34 @@
             var mainMenuActiveClass = (x < 9 ? 'fullselect' : 'semiselect');
             var leftMenuActiveClass = (((x < 9) || (x == 115) || (x == 40) || (x == 41) || (x == 42)) ? 'lbbuttonsel2' : 'lbbuttonsel');
 
+            var backView = 0;
+            if (goBackStack.length > 0) { backView = goBackStack[goBackStack.length - 1]; }
+
             // My Devices
-            if (x == 1 || (x >= 10 && x < 20)) QC('MainMenuMyDevices').add(mainMenuActiveClass);
-            if (x == 1 || (x >= 10 && x < 20)) QC('LeftMenuMyDevices').add(leftMenuActiveClass);
-
+            if (x == 1 || (backView == 1) || ((backView == 0) && (x >= 10 && x < 20))) {
+                QC('MainMenuMyDevices').add(mainMenuActiveClass);
+                QC('LeftMenuMyDevices').add(leftMenuActiveClass);
+            } else if (x == 2 || (backView == 2) || ((backView == 0) && (x >= 20 && x < 30))) {
                 // My Account
-            if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
-            if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
+                QC('MainMenuMyAccount').add(mainMenuActiveClass);
+                QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+            } else if (x == 3) {
                 // My Events
-            if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
-            if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
+                QC('MainMenuMyEvents').add(mainMenuActiveClass);
+                QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+            } else if (x == 4 || (x >= 30 && x < 40)) {
                 // My Users
-            if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
-            if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
+                QC('MainMenuMyUsers').add(mainMenuActiveClass);
+                QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+            } else if (x == 5) {
                 // My Files
-            if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
-            if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
+                QC('MainMenuMyFiles').add(mainMenuActiveClass);
+                QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+            } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
                 // My Server
-            if ((x == 6) || (x == 115)) QC('MainMenuMyServer').add(mainMenuActiveClass);
-            if ((x == 6) || (x == 115) || (x == 40) || (x == 41) || (x == 42) || (x == 43)) QC('LeftMenuMyServer').add(leftMenuActiveClass);
+                QC('MainMenuMyServer').add(mainMenuActiveClass);
+                QC('LeftMenuMyServer').add(leftMenuActiveClass);
+            }
             QV('ServerPlugins', pluginHandler != null);
 
             // column_l max-height

views/translations/default-min_fr.handlebars

@@ -63,6 +63,7 @@
         var pluginHandler = null;
         if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
         var installedPluginList = null;
+        var goBackStack = [];
 
         // Console Message Display Timers
         var p11DeskConsoleMsgTimer = null;
@@ -8561,11 +8562,10 @@
 
         function goBack() {
             setSessionActivity();
-            if (xxdialogMode) return;
+            if (xxdialogMode || (goBackStack.length == 0)) return;
             if (fullscreen) { deskToggleFull(); }
-            if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
-            if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
-            if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
+            go(goBackStack.pop());
+            goBackStack.pop();
         }
 
         function go(x, event) {
@@ -8584,8 +8584,15 @@
                 return;
             }
 
+            // If we are going to the same place, do nothing.
             if (xxcurrentView == x) return;
 
+            // Set the goback stack, if going to top-level view, clear the stack.
+            if ((xxcurrentView < 0) || (x < 10)) { goBackStack = []; } else {
+                // Do not push into the back stack if we are changing tabs at the same level.
+                if (Math.floor(xxcurrentView / 10) != Math.floor(x / 10)) { goBackStack.push(xxcurrentView); }
+            }
+
             // Edit this line when adding a new screen
             for (var i = 0; i < 44; i++) { QV('p' + i, i == x); }
             xxcurrentView = x;
@@ -8608,29 +8615,34 @@
             var mainMenuActiveClass = (x < 9 ? 'fullselect' : 'semiselect');
             var leftMenuActiveClass = (((x < 9) || (x == 115) || (x == 40) || (x == 41) || (x == 42)) ? 'lbbuttonsel2' : 'lbbuttonsel');
 
+            var backView = 0;
+            if (goBackStack.length > 0) { backView = goBackStack[goBackStack.length - 1]; }
+
             // My Devices
-            if (x == 1 || (x >= 10 && x < 20)) QC('MainMenuMyDevices').add(mainMenuActiveClass);
-            if (x == 1 || (x >= 10 && x < 20)) QC('LeftMenuMyDevices').add(leftMenuActiveClass);
-
+            if (x == 1 || (backView == 1) || ((backView == 0) && (x >= 10 && x < 20))) {
+                QC('MainMenuMyDevices').add(mainMenuActiveClass);
+                QC('LeftMenuMyDevices').add(leftMenuActiveClass);
+            } else if (x == 2 || (backView == 2) || ((backView == 0) && (x >= 20 && x < 30))) {
                 // My Account
-            if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
-            if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
+                QC('MainMenuMyAccount').add(mainMenuActiveClass);
+                QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+            } else if (x == 3) {
                 // My Events
-            if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
-            if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
+                QC('MainMenuMyEvents').add(mainMenuActiveClass);
+                QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+            } else if (x == 4 || (x >= 30 && x < 40)) {
                 // My Users
-            if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
-            if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
+                QC('MainMenuMyUsers').add(mainMenuActiveClass);
+                QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+            } else if (x == 5) {
                 // My Files
-            if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
-            if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
+                QC('MainMenuMyFiles').add(mainMenuActiveClass);
+                QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+            } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
                 // My Server
-            if ((x == 6) || (x == 115)) QC('MainMenuMyServer').add(mainMenuActiveClass);
-            if ((x == 6) || (x == 115) || (x == 40) || (x == 41) || (x == 42) || (x == 43)) QC('LeftMenuMyServer').add(leftMenuActiveClass);
+                QC('MainMenuMyServer').add(mainMenuActiveClass);
+                QC('LeftMenuMyServer').add(leftMenuActiveClass);
+            }
             QV('ServerPlugins', pluginHandler != null);
 
             // column_l max-height

views/translations/default-min_pt.handlebars

@@ -63,6 +63,7 @@
         var pluginHandler = null;
         if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
         var installedPluginList = null;
+        var goBackStack = [];
 
         // Console Message Display Timers
         var p11DeskConsoleMsgTimer = null;
@@ -1680,7 +1681,7 @@
                             deviceHeaderSet();
                             var extra = '';
                             if (view == 2) { r += '<tr><td colspan=5>'; }
-                            if (meshes[node.meshid].mtype == 1) { extra = '<span class=devHeaderx>' + "Intelreg; " + '</span>'; }
+                            if (meshes[node.meshid].mtype == 1) { extra = '<span class=devHeaderx>' + ", Intel&reg; AMT only" + '</span>'; }
                             if ((view == 1) && (current != null)) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } if (r != '') { r += '</tr></table>'; } }
                             if (view == 2) { r += '<div>'; }
                             r += '<div class=DevSt style=width:100%;padding-top:4px><span style=float:right>';
@@ -2199,7 +2200,7 @@
                 x += '</div>';
             }
 
-            setDialogMode(2, "Adicione Intelreg; ", 2, null, x, 'fileDownload');
+            setDialogMode(2, "Adicione Intelreg; AMT", 2, null, x, 'fileDownload');
             Q('dlgAddCiraSel').focus();
             return false;
         }
@@ -8561,11 +8562,10 @@
 
         function goBack() {
             setSessionActivity();
-            if (xxdialogMode) return;
+            if (xxdialogMode || (goBackStack.length == 0)) return;
             if (fullscreen) { deskToggleFull(); }
-            if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
-            if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
-            if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
+            go(goBackStack.pop());
+            goBackStack.pop();
         }
 
         function go(x, event) {
@@ -8584,8 +8584,15 @@
                 return;
             }
 
+            // If we are going to the same place, do nothing.
             if (xxcurrentView == x) return;
 
+            // Set the goback stack, if going to top-level view, clear the stack.
+            if ((xxcurrentView < 0) || (x < 10)) { goBackStack = []; } else {
+                // Do not push into the back stack if we are changing tabs at the same level.
+                if (Math.floor(xxcurrentView / 10) != Math.floor(x / 10)) { goBackStack.push(xxcurrentView); }
+            }
+
             // Edit this line when adding a new screen
             for (var i = 0; i < 44; i++) { QV('p' + i, i == x); }
             xxcurrentView = x;
@@ -8608,29 +8615,34 @@
             var mainMenuActiveClass = (x < 9 ? 'fullselect' : 'semiselect');
             var leftMenuActiveClass = (((x < 9) || (x == 115) || (x == 40) || (x == 41) || (x == 42)) ? 'lbbuttonsel2' : 'lbbuttonsel');
 
+            var backView = 0;
+            if (goBackStack.length > 0) { backView = goBackStack[goBackStack.length - 1]; }
+
             // My Devices
-            if (x == 1 || (x >= 10 && x < 20)) QC('MainMenuMyDevices').add(mainMenuActiveClass);
-            if (x == 1 || (x >= 10 && x < 20)) QC('LeftMenuMyDevices').add(leftMenuActiveClass);
-
+            if (x == 1 || (backView == 1) || ((backView == 0) && (x >= 10 && x < 20))) {
+                QC('MainMenuMyDevices').add(mainMenuActiveClass);
+                QC('LeftMenuMyDevices').add(leftMenuActiveClass);
+            } else if (x == 2 || (backView == 2) || ((backView == 0) && (x >= 20 && x < 30))) {
                 // My Account
-            if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
-            if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
+                QC('MainMenuMyAccount').add(mainMenuActiveClass);
+                QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+            } else if (x == 3) {
                 // My Events
-            if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
-            if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
+                QC('MainMenuMyEvents').add(mainMenuActiveClass);
+                QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+            } else if (x == 4 || (x >= 30 && x < 40)) {
                 // My Users
-            if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
-            if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
+                QC('MainMenuMyUsers').add(mainMenuActiveClass);
+                QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+            } else if (x == 5) {
                 // My Files
-            if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
-            if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
+                QC('MainMenuMyFiles').add(mainMenuActiveClass);
+                QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+            } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
                 // My Server
-            if ((x == 6) || (x == 115)) QC('MainMenuMyServer').add(mainMenuActiveClass);
-            if ((x == 6) || (x == 115) || (x == 40) || (x == 41) || (x == 42) || (x == 43)) QC('LeftMenuMyServer').add(leftMenuActiveClass);
+                QC('MainMenuMyServer').add(mainMenuActiveClass);
+                QC('LeftMenuMyServer').add(leftMenuActiveClass);
+            }
             QV('ServerPlugins', pluginHandler != null);
 
             // column_l max-height

views/translations/default-mobile_ja.handlebars

@@ -554,7 +554,7 @@
                     </div>
                 </div>
                 <div id="d7amtkvm">
-                    <h4 style="width:100%;border-bottom:1px solid gray">インテル®AMTハードウェアKVM</h4>
+                    <h4 style="width:100%;border-bottom:1px solid gray">Intel® AMTハードウェアKVM</h4>
                     <div style="height:26px">
                         <select id="d7desktopmode" style="float:right;width:200px">
                             <option value="1">RLE8、最速</option>
@@ -616,7 +616,7 @@
         var serverPublicNamePort = '{{{serverDnsName}}}:{{{serverPublicPort}}}';
         var debugmode = false;
         var attemptWebRTC = ((features & 128) != 0);
-        var StatusStrs = ["切断されました", "接続しています...", "セットアップ...", "接続済み", "Intel＆reg;接続されたAMT"];
+        var StatusStrs = ["切断されました", "接続しています...", "セットアップ...", "接続済み", "Intel&reg;接続されたAMT"];
         var files;
         var passRequirements = '{{{passRequirements}}}';
         if (passRequirements != '') { passRequirements = JSON.parse(decodeURIComponent(passRequirements)); }
@@ -1253,7 +1253,7 @@
 
             // We are allowed, let's prompt to information
             var x = addHtmlValue("名", '<input id=dp3meshname style=width:170px maxlength=64 onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate() />');
-            x += addHtmlValue("タイプ", '<div style=width:170px;margin:0;padding:0><select id=dp3meshtype style=width:100% onchange=account_validateMeshCreate() ><option value=2>' + "ソフトウェアエージェントグループ" + '</option><option value=1>' + "Intel＆reg; AMTのみ" + '</option></select></div>');
+            x += addHtmlValue("タイプ", '<div style=width:170px;margin:0;padding:0><select id=dp3meshtype style=width:100% onchange=account_validateMeshCreate() ><option value=2>' + "ソフトウェアエージェントグループ" + '</option><option value=1>' + "Intel&reg; AMTのみ" + '</option></select></div>');
             x += addHtmlValue("説明", '<div style=width:170px;margin:0;padding:0><textarea id=dp3meshdesc maxlength=1024 style=width:100%;resize:none></textarea></div>');
             setDialogMode(2, "デバイスグループを作成する", 3, account_createMeshEx, x);
             account_validateMeshCreate();
@@ -1663,7 +1663,7 @@
                     if (nodes[i].meshid != current) {
                         deviceHeaderSet();
                         var extra = '';
-                        if (meshes[nodes[i].meshid].mtype == 1) { extra = '<span style=color:lightgray>' + "、Intel＆reg; AMTのみ" + '</span>'; }
+                        if (meshes[nodes[i].meshid].mtype == 1) { extra = '<span style=color:lightgray>' + "、Intel&reg; AMTのみ" + '</span>'; }
                         if (current != null) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } if (r != '') { r += '</tr></table>'; } }
                         r += '<div class=DevSt style=padding-top:4px><span style=float:right>';
                         //r += getMeshActions(mesh2, meshrights);
@@ -1732,7 +1732,7 @@
                             r += '<div><div colspan=3 class=DevSt><span style=float:right>';
                             //r += getMeshActions(mesh, meshrights);
                             r += '</span><span id=MxMESH style=cursor:pointer onclick=goForward("' + mesh._id + '")>' + EscapeHtml(mesh.name) + '</span></div>';
-                            if (mesh.mtype == 1) { r += '<div style=padding:10px><i>' + "Intel＆reg;なしこのグループのAMTデバイス"; }
+                            if (mesh.mtype == 1) { r += '<div style=padding:10px><i>' + "Intel&reg;なしこのグループのAMTデバイス"; }
                             if (mesh.mtype == 2) { r += '<div style=padding:10px><i>' + "このグループにデバイスはありません"; }
                             r += '.</i></div></div>';
                             current = mesh._id;
@@ -1762,7 +1762,7 @@
             if (node.conn) {
                 if ((node.conn & 1) != 0) { states.push('<span>' + "エージェント" + '</span>'); }
                 if ((node.conn & 2) != 0) { states.push('<span>' + "CIRA" + '</span>'); }
-                else if ((node.conn & 4) != 0) { states.push('<span>' + "Intel＆reg; AMT" + '</span>'); }
+                else if ((node.conn & 4) != 0) { states.push('<span>' + "Intel&reg; AMT" + '</span>'); }
                 if ((node.conn & 8) != 0) { states.push('<span>' + "リレー" + '</span>'); }
                 if ((node.conn & 16) != 0) { states.push('<span>' + "MQTT" + '</span>'); }
             }
@@ -1913,10 +1913,10 @@
                         }
                     }
 
-                    var meName = "Intel＆reg;私";
+                    var meName = "Intel&reg;私";
                     if (typeof node.intelamt.sku == 'number') {
-                        if ((node.intelamt.sku & 8) != 0) { meName = "Intel＆reg; AMT"; }
-                        else if ((node.intelamt.sku & 16) != 0) { meName = "Intel＆reg; SM"; }
+                        if ((node.intelamt.sku & 8) != 0) { meName = "Intel&reg; AMT"; }
+                        else if ((node.intelamt.sku & 16) != 0) { meName = "Intel&reg; SM"; }
                     }
                     x += addDeviceAttribute(meName, str);
                 }
@@ -1936,8 +1936,8 @@
                 if (connectivity && connectivity > 1) {
                     var cstate = [];
                     if ((node.conn & 1) != 0) cstate.push('<span>' + "エージェント" + '</span>');
-                    if ((node.conn & 2) != 0) cstate.push('<span>' + "Intel＆reg; AMT CIRA" + '</span>');
-                    else if ((node.conn & 4) != 0) cstate.push('<span>' + "Intel＆reg; AMT" + '</span>');
+                    if ((node.conn & 2) != 0) cstate.push('<span>' + "Intel&reg; AMT CIRA" + '</span>');
+                    else if ((node.conn & 4) != 0) cstate.push('<span>' + "Intel&reg; AMT" + '</span>');
                     if ((node.conn & 8) != 0) cstate.push('<span>' + "エージェントリレー" + '</span>');
                     if ((node.conn & 16) != 0) cstate.push('<span>' + "MQTT" + '</span>');
                     x += addDeviceAttribute("接続性", cstate.join(', '));
@@ -1977,8 +1977,8 @@
                 var powerstate = PowerStateStr(node.state);
                 //if (node.state == 0) { powerstate = 'Unknown State'; }
                 if ((connectivity & 1) != 0) { if (powerstate.length > 0) { powerstate += ', '; } powerstate += '<span style=font-size:10px>' + "メッシュエージェント" + '</span>'; }
-                if ((connectivity & 2) != 0) { if (powerstate.length > 0) { powerstate += ', '; } powerstate += '<span style=font-size:10px>' + "Intel＆reg;接続されたAMT" + '</span>'; }
-                else if ((connectivity & 4) != 0) { if (powerstate.length > 0) { powerstate += ', '; } powerstate += '<span style=font-size:10px>' + "Intel＆reg; AMTが検出されました" + '</span>'; }
+                if ((connectivity & 2) != 0) { if (powerstate.length > 0) { powerstate += ', '; } powerstate += '<span style=font-size:10px>' + "Intel&reg;接続されたAMT" + '</span>'; }
+                else if ((connectivity & 4) != 0) { if (powerstate.length > 0) { powerstate += ', '; } powerstate += '<span style=font-size:10px>' + "Intel&reg; AMTが検出されました" + '</span>'; }
                 if ((connectivity & 16) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px>' + "MQTTチャネルが接続されました" + '</span>'; }
                 QH('MainComputerState', powerstate);
 
@@ -2121,7 +2121,7 @@
             x += addHtmlValue("パスワード", '<input id=dp10password type=password style=width:170px autocomplete=nope maxlength=32 onchange=validateDeviceAmtSettings() onkeyup=validateDeviceAmtSettings() />');
             x += addHtmlValue("セキュリティ", '<select id=dp10tls style=width:176px><option value=0>' + "TLSセキュリティなし" + '</option><option value=1>' + "TLSセキュリティが必要" + '</option></select>');
             if ((node.intelamt.user != null) && (node.intelamt.user != '')) { buttons = 7; }
-            setDialogMode(2, "Intelを編集＆reg; AMTクレデンシャル", buttons, editDeviceAmtSettingsEx, x, { node: node, func: func });
+            setDialogMode(2, "Intelを編集&reg; AMTクレデンシャル", buttons, editDeviceAmtSettingsEx, x, { node: node, func: func });
             if ((node.intelamt.user != null) && (node.intelamt.user != '')) { Q('dp10username').value = node.intelamt.user; } else { Q('dp10username').value = 'admin'; }
             Q('dp10tls').value = node.intelamt.tls;
             validateDeviceAmtSettings();
@@ -3095,7 +3095,7 @@
             QH('p20meshName', EscapeHtml(currentMesh.name));
             var meshtype = format("不明な＃{0}", currentMesh.mtype);
             var meshrights = currentMesh.links[userinfo._id].rights;
-            if (currentMesh.mtype == 1) meshtype = "Intel＆reg; AMTのみ、エージェントなし";
+            if (currentMesh.mtype == 1) meshtype = "Intel&reg; AMTのみ、エージェントなし";
             if (currentMesh.mtype == 2) meshtype = "ソフトウェアエージェントを使用して管理";
 
             var x = '';
@@ -3212,7 +3212,7 @@
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20remotelimitedinput style=margin-left:12px>' + "限定入力のみ" + '</label><br>';
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20noterminal style=margin-left:12px>' + "ターミナルアクセスなし" + '</label><br>';
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20nofiles style=margin-left:12px>' + "ファイルアクセスなし" + '</label><br>';
-            x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20noamt style=margin-left:12px>' + "Intel＆reg;なしAMT" + '</label><br>';
+            x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20noamt style=margin-left:12px>' + "Intel&reg;なしAMT" + '</label><br>';
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20meshagentconsole>' + "メッシュエージェントコンソール" + '</label><br>';
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20meshserverfiles>' + "サーバーファイル" + '</label><br>';
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20wakedevices>' + "ウェイクデバイス" + '</label><br>';
@@ -3289,7 +3289,7 @@
                 if ((meshrights & 256) != 0) r.push("リモートビューのみ");
                 if ((meshrights & 512) != 0) r.push("ターミナルなし");
                 if ((meshrights & 1024) != 0) r.push("ファイルなし");
-                if ((meshrights & 2048) != 0) r.push("Intel＆reg;なしAMT");
+                if ((meshrights & 2048) != 0) r.push("Intel&reg;なしAMT");
                 if (((meshrights & 8) != 0) && ((meshrights & 4096) != 0) && ((meshrights & 256) == 0)) r.push("制限された入力");
                 if ((meshrights & 8192) != 0) r.push("自己イベントのみ");
                 if ((meshrights & 16384) != 0) r.push("チャットと通知");

views/translations/default-mobile_nl.handlebars

@@ -393,7 +393,7 @@
                                     <!--<input id=DeskToolsButton type=button value=Tools onkeypress="return false" onkeydown="return false" onclick="toggleDeskTools()">&nbsp;-->
                                 </div>
                                 <div>
-                                    <input id="deskActionsBtn" type="button" style="margin-left:3px" onkeypress="return false" onkeydown="return false" value="Akties" onclick="deviceActionFunction()">
+                                    <input id="deskActionsBtn" type="button" style="margin-left:3px" onkeypress="return false" onkeydown="return false" value="Acties" onclick="deviceActionFunction()">
                                     <input type="button" value="Instellingen" onkeypress="return false" onkeydown="return false" onclick="showDesktopSettings()">
                                     <input type="button" onkeypress="return false" onkeydown="return false" value="Power Actie's..." onclick="showPowerActionDlg()" style="display:none">
                                     <input id="DeskSpecialKeys" type="button" value="Speciale toetsen" onkeypress="return false" onkeydown="return false" onclick="sendSpecialKeys()">
@@ -408,7 +408,7 @@
                             <tbody><tr>
                                 <td style="background-color:#C0C0C0;border-bottom:2px solid black;padding:2px">
                                     <div style="float:right;text-align:right">
-                                        <input id="filesActionsBtn" type="button" onkeypress="return false" onkeydown="return false" value="Akties" onclick="deviceActionFunction()" style="margin-right:2px">
+                                        <input id="filesActionsBtn" type="button" onkeypress="return false" onkeydown="return false" value="Acties" onclick="deviceActionFunction()" style="margin-right:2px">
                                     </div>
                                     <div style="margin-left:2px">
                                         <input id="p13AutoConnect" value="Automatisch verbinden" onclick="autoConnectFiles(event)" onkeypress="return false" onkeydown="return false" type="button" style="display:none">
@@ -616,7 +616,7 @@
         var serverPublicNamePort = '{{{serverDnsName}}}:{{{serverPublicPort}}}';
         var debugmode = false;
         var attemptWebRTC = ((features & 128) != 0);
-        var StatusStrs = ["Verbroken", "Verbinden...", "Setup...", "Verbonden", "Intel® AMT verbonden"];
+        var StatusStrs = ["Verbroken", "Verbinden...", "Setup...", "Verbonden", "Intel&reg; AMT verbonden"];
         var files;
         var passRequirements = '{{{passRequirements}}}';
         if (passRequirements != '') { passRequirements = JSON.parse(decodeURIComponent(passRequirements)); }
@@ -1754,7 +1754,7 @@
 
         var powerStatetable = ['', "ingeschakeld", "Slaap", "Slaap", "Slaap", "Slaapstand", "Uitzetten", "Aanwezig"];
         var powerStateStrings = ['', "ingeschakeld", "Slapen", "Slapen", "Slaapstand", "Slaapstand", "softwarematig uit", "Aanwezig"];
-        var powerStateStrings2 = ['', "Apparaat is ingeschakeld", "Apparaat bevindt zich in slaapstand (S1)", "Apparaat bevindt zich in slaapstand (S2)", "Apparaat bevindt zich in diepe slaapstand (S3)", "Apparaat is in slaapstand (S4)", "Apparaat is uitgeschakeld (S5)", "Apparaat is aanwezig, maar de stroomstatus kan niet worden bepaald"];
+        var powerStateStrings2 = ['', "Apparaat is ingeschakeld", "Apparaat bevindt zich in slaapstand (S1)", "Apparaat bevindt zich in slaapstand (S2)", "Apparaat bevindt zich in diepe slaapstand (S3)", "Apparaat is in slaapstand (S4)", "Apparaat is uitgeschakeld (S5)", "Apparaat is aanwezig, maar de status kan niet worden bepaald"];
         var powerColorTable = ['#00000000', 'black', 'blue', 'blue', 'lightblue', 'blueviolet', 'darkgreen', 'lightseagreen', 'lightseagreen'];
         function NodeStateStr(node) {
             var states = [];
@@ -1977,7 +1977,7 @@
                 var powerstate = PowerStateStr(node.state);
                 //if (node.state == 0) { powerstate = 'Unknown State'; }
                 if ((connectivity & 1) != 0) { if (powerstate.length > 0) { powerstate += ', '; } powerstate += '<span style=font-size:10px>' + "Mesh Agent" + '</span>'; }
-                if ((connectivity & 2) != 0) { if (powerstate.length > 0) { powerstate += ', '; } powerstate += '<span style=font-size:10px>' + "Intel® AMT verbonden" + '</span>'; }
+                if ((connectivity & 2) != 0) { if (powerstate.length > 0) { powerstate += ', '; } powerstate += '<span style=font-size:10px>' + "Intel&reg; AMT verbonden" + '</span>'; }
                 else if ((connectivity & 4) != 0) { if (powerstate.length > 0) { powerstate += ', '; } powerstate += '<span style=font-size:10px>' + "Intel&reg; AMT gedetecteerd" + '</span>'; }
                 if ((connectivity & 16) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px>' + "MQTT-kanaal verbonden" + '</span>'; }
                 QH('MainComputerState', powerstate);
@@ -1998,7 +1998,7 @@
 
         function deviceToastFunction() {
             if (xxdialogMode) return;
-            setDialogMode(2, "undefined", 3, deviceToastFunctionEx, '<textarea id=d2devToast style=width:100%;height:80px;resize:none;overflow-y:scroll></textarea>');
+            setDialogMode(2, "Device Toast", 3, deviceToastFunctionEx, '<textarea id=d2devToast style=width:100%;height:80px;resize:none;overflow-y:scroll></textarea>');
         }
 
         function deviceToastFunctionEx() {
@@ -2121,7 +2121,7 @@
             x += addHtmlValue("wachtwoord", '<input id=dp10password type=password style=width:170px autocomplete=nope maxlength=32 onchange=validateDeviceAmtSettings() onkeyup=validateDeviceAmtSettings() />');
             x += addHtmlValue("Veiligheid", '<select id=dp10tls style=width:176px><option value=0>' + "Geen TLS beveiliging" + '</option><option value=1>' + "TLS beveiliging vereist" + '</option></select>');
             if ((node.intelamt.user != null) && (node.intelamt.user != '')) { buttons = 7; }
-            setDialogMode(2, "Bewerk Intel® AMT-gegevens", buttons, editDeviceAmtSettingsEx, x, { node: node, func: func });
+            setDialogMode(2, "Bewerk Intel&reg; AMT-gegevens", buttons, editDeviceAmtSettingsEx, x, { node: node, func: func });
             if ((node.intelamt.user != null) && (node.intelamt.user != '')) { Q('dp10username').value = node.intelamt.user; } else { Q('dp10username').value = 'admin'; }
             Q('dp10tls').value = node.intelamt.tls;
             validateDeviceAmtSettings();
@@ -3108,7 +3108,7 @@
 
             x += '<br style=clear:both><br>';
             var currentMeshLinks = currentMesh.links[userinfo._id];
-            if (currentMeshLinks && ((currentMeshLinks.rights & 2) != 0)) { x += '<div style=margin-bottom:6px><a onclick=p20showAddMeshUserDialog() style=cursor:pointer><img src=images/icon-addnew.png border=0 height=12 width=12>' + " gebruiker toevoegen" + '</a></div>'; }
+            if (currentMeshLinks && ((currentMeshLinks.rights & 2) != 0)) { x += '<div style=margin-bottom:6px><a onclick=p20showAddMeshUserDialog() style=cursor:pointer><img src=images/icon-addnew.png border=0 height=12 width=12>' + " Gebruiker toevoegen" + '</a></div>'; }
 
             /*
             if ((meshrights & 4) != 0) {

views/translations/default-mobile_pt.handlebars

@@ -1663,7 +1663,7 @@
                     if (nodes[i].meshid != current) {
                         deviceHeaderSet();
                         var extra = '';
-                        if (meshes[nodes[i].meshid].mtype == 1) { extra = '<span style=color:lightgray>' + "Intelreg; " + '</span>'; }
+                        if (meshes[nodes[i].meshid].mtype == 1) { extra = '<span style=color:lightgray>' + ", Intel&reg; AMT only" + '</span>'; }
                         if (current != null) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } if (r != '') { r += '</tr></table>'; } }
                         r += '<div class=DevSt style=padding-top:4px><span style=float:right>';
                         //r += getMeshActions(mesh2, meshrights);

views/translations/default_cs.handlebars

@@ -1101,6 +1101,7 @@
         var pluginHandler = null;
         if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
         var installedPluginList = null;
+        var goBackStack = [];
 
         // Console Message Display Timers
         var p11DeskConsoleMsgTimer = null;
@@ -9599,11 +9600,10 @@
 
         function goBack() {
             setSessionActivity();
-            if (xxdialogMode) return;
+            if (xxdialogMode || (goBackStack.length == 0)) return;
             if (fullscreen) { deskToggleFull(); }
-            if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
-            if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
-            if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
+            go(goBackStack.pop());
+            goBackStack.pop();
         }
 
         function go(x, event) {
@@ -9622,8 +9622,15 @@
                 return;
             }
 
+            // If we are going to the same place, do nothing.
             if (xxcurrentView == x) return;
 
+            // Set the goback stack, if going to top-level view, clear the stack.
+            if ((xxcurrentView < 0) || (x < 10)) { goBackStack = []; } else {
+                // Do not push into the back stack if we are changing tabs at the same level.
+                if (Math.floor(xxcurrentView / 10) != Math.floor(x / 10)) { goBackStack.push(xxcurrentView); }
+            }
+
             // Edit this line when adding a new screen
             for (var i = 0; i < 44; i++) { QV('p' + i, i == x); }
             xxcurrentView = x;
@@ -9646,29 +9653,34 @@
             var mainMenuActiveClass = (x < 9 ? 'fullselect' : 'semiselect');
             var leftMenuActiveClass = (((x < 9) || (x == 115) || (x == 40) || (x == 41) || (x == 42)) ? 'lbbuttonsel2' : 'lbbuttonsel');
 
+            var backView = 0;
+            if (goBackStack.length > 0) { backView = goBackStack[goBackStack.length - 1]; }
+
             // My Devices
-            if (x == 1 || (x >= 10 && x < 20)) QC('MainMenuMyDevices').add(mainMenuActiveClass);
-            if (x == 1 || (x >= 10 && x < 20)) QC('LeftMenuMyDevices').add(leftMenuActiveClass);
-
+            if (x == 1 || (backView == 1) || ((backView == 0) && (x >= 10 && x < 20))) {
+                QC('MainMenuMyDevices').add(mainMenuActiveClass);
+                QC('LeftMenuMyDevices').add(leftMenuActiveClass);
+            } else if (x == 2 || (backView == 2) || ((backView == 0) && (x >= 20 && x < 30))) {
                 // My Account
-            if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
-            if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
+                QC('MainMenuMyAccount').add(mainMenuActiveClass);
+                QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+            } else if (x == 3) {
                 // My Events
-            if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
-            if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
+                QC('MainMenuMyEvents').add(mainMenuActiveClass);
+                QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+            } else if (x == 4 || (x >= 30 && x < 40)) {
                 // My Users
-            if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
-            if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
+                QC('MainMenuMyUsers').add(mainMenuActiveClass);
+                QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+            } else if (x == 5) {
                 // My Files
-            if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
-            if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
+                QC('MainMenuMyFiles').add(mainMenuActiveClass);
+                QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+            } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
                 // My Server
-            if ((x == 6) || (x == 115)) QC('MainMenuMyServer').add(mainMenuActiveClass);
-            if ((x == 6) || (x == 115) || (x == 40) || (x == 41) || (x == 42) || (x == 43)) QC('LeftMenuMyServer').add(leftMenuActiveClass);
+                QC('MainMenuMyServer').add(mainMenuActiveClass);
+                QC('LeftMenuMyServer').add(leftMenuActiveClass);
+            }
             QV('ServerPlugins', pluginHandler != null);
 
             // column_l max-height

views/translations/default_fr.handlebars

@@ -1101,6 +1101,7 @@
         var pluginHandler = null;
         if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
         var installedPluginList = null;
+        var goBackStack = [];
 
         // Console Message Display Timers
         var p11DeskConsoleMsgTimer = null;
@@ -9599,11 +9600,10 @@
 
         function goBack() {
             setSessionActivity();
-            if (xxdialogMode) return;
+            if (xxdialogMode || (goBackStack.length == 0)) return;
             if (fullscreen) { deskToggleFull(); }
-            if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
-            if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
-            if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
+            go(goBackStack.pop());
+            goBackStack.pop();
         }
 
         function go(x, event) {
@@ -9622,8 +9622,15 @@
                 return;
             }
 
+            // If we are going to the same place, do nothing.
             if (xxcurrentView == x) return;
 
+            // Set the goback stack, if going to top-level view, clear the stack.
+            if ((xxcurrentView < 0) || (x < 10)) { goBackStack = []; } else {
+                // Do not push into the back stack if we are changing tabs at the same level.
+                if (Math.floor(xxcurrentView / 10) != Math.floor(x / 10)) { goBackStack.push(xxcurrentView); }
+            }
+
             // Edit this line when adding a new screen
             for (var i = 0; i < 44; i++) { QV('p' + i, i == x); }
             xxcurrentView = x;
@@ -9646,29 +9653,34 @@
             var mainMenuActiveClass = (x < 9 ? 'fullselect' : 'semiselect');
             var leftMenuActiveClass = (((x < 9) || (x == 115) || (x == 40) || (x == 41) || (x == 42)) ? 'lbbuttonsel2' : 'lbbuttonsel');
 
+            var backView = 0;
+            if (goBackStack.length > 0) { backView = goBackStack[goBackStack.length - 1]; }
+
             // My Devices
-            if (x == 1 || (x >= 10 && x < 20)) QC('MainMenuMyDevices').add(mainMenuActiveClass);
-            if (x == 1 || (x >= 10 && x < 20)) QC('LeftMenuMyDevices').add(leftMenuActiveClass);
-
+            if (x == 1 || (backView == 1) || ((backView == 0) && (x >= 10 && x < 20))) {
+                QC('MainMenuMyDevices').add(mainMenuActiveClass);
+                QC('LeftMenuMyDevices').add(leftMenuActiveClass);
+            } else if (x == 2 || (backView == 2) || ((backView == 0) && (x >= 20 && x < 30))) {
                 // My Account
-            if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
-            if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
+                QC('MainMenuMyAccount').add(mainMenuActiveClass);
+                QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+            } else if (x == 3) {
                 // My Events
-            if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
-            if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
+                QC('MainMenuMyEvents').add(mainMenuActiveClass);
+                QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+            } else if (x == 4 || (x >= 30 && x < 40)) {
                 // My Users
-            if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
-            if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
+                QC('MainMenuMyUsers').add(mainMenuActiveClass);
+                QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+            } else if (x == 5) {
                 // My Files
-            if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
-            if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
+                QC('MainMenuMyFiles').add(mainMenuActiveClass);
+                QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+            } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
                 // My Server
-            if ((x == 6) || (x == 115)) QC('MainMenuMyServer').add(mainMenuActiveClass);
-            if ((x == 6) || (x == 115) || (x == 40) || (x == 41) || (x == 42) || (x == 43)) QC('LeftMenuMyServer').add(leftMenuActiveClass);
+                QC('MainMenuMyServer').add(mainMenuActiveClass);
+                QC('LeftMenuMyServer').add(leftMenuActiveClass);
+            }
             QV('ServerPlugins', pluginHandler != null);
 
             // column_l max-height

views/translations/default_ja.handlebars

@@ -133,7 +133,7 @@
                                 <td tabindex="0" id="MainDevFiles" class="topbar_td style3x" onclick="go(13,event)" onkeypress="if (event.key == 'Enter') go(13)">ファイル</td>
                                 <td tabindex="0" id="MainDevEvents" class="topbar_td style3x" onclick="go(16,event)" onkeypress="if (event.key == 'Enter') go(16)">イベント</td>
                                 <td tabindex="0" id="MainDevInfo" class="topbar_td style3x" onclick="go(17,event)" onkeypress="if (event.key == 'Enter') go(17)">詳細</td>
-                                <td tabindex="0" id="MainDevAmt" class="topbar_td style3x" onclick="go(14,event)" onkeypress="if (event.key == 'Enter') go(14)">インテル®AMT</td>
+                                <td tabindex="0" id="MainDevAmt" class="topbar_td style3x" onclick="go(14,event)" onkeypress="if (event.key == 'Enter') go(14)">Intel® AMT</td>
                                 <td tabindex="0" id="MainDevConsole" class="topbar_td style3x" onclick="go(15,event)" onkeypress="if (event.key == 'Enter') go(15)">コンソール</td>
                                 <td tabindex="0" id="MainDevPlugins" class="topbar_td style3x" onclick="go(19,event)" onkeypress="if (event.key == 'Enter') go(19)">プラグイン</td>
                                 <td class="topbar_td_end style3">&nbsp;</td>
@@ -686,7 +686,7 @@
                 <div id="p14title">
                     <div id="p14BackButton" style="float:left"><div class="backButton" tabindex="0" onclick="goBack()" title="バック" onkeypress="if (event.key == 'Enter') goBack()"><div class="backButtonEx"></div></div></div>
                     <div id="devListToolbarViewIcons"><div class="viewSelector" onclick="deskToggleFull(event)" title="全画面表示。ブラウザの全画面表示に移行します。"><div class="viewSelector5"></div></div></div>
-                    <h1>インテル®AMT- <span id="p14deviceName"></span></h1>
+                    <h1>Intel® AMT - <span id="p14deviceName"></span></h1>
                 </div>
                 <iframe id="p14iframe" src="{{{domainurl}}}commander.htm"></iframe>
             </div>
@@ -1003,7 +1003,7 @@
                         </div>
                     </div>
                     <div id="d7amtkvm">
-                        <h4>インテル®AMTハードウェアKVM</h4>
+                        <h4>Intel® AMTハードウェアKVM</h4>
                         <div>
                             <div>画像エンコーディング</div>
                             <select id="d7desktopmode">
@@ -1047,7 +1047,7 @@
         var args;
         var autoReconnect = true;
         var powerStatetable = ['', "パワード", "睡眠", "睡眠", "睡眠", "冬眠", "電源を切る", "プレゼント"];
-        var StatusStrs = ["切断されました", "接続しています...", "セットアップ...", "接続済み", "Intel＆reg;接続されたAMT"];
+        var StatusStrs = ["切断されました", "接続しています...", "セットアップ...", "接続済み", "Intel&reg;接続されたAMT"];
         var agentsStr = ["未知の", "Windows 32ビットコンソール", "Windows 64ビットコンソール", "Windows 32ビットサービス", "Windows 64ビットサービス", "Linux 32ビット", "Linux 64ビット", "MIPS", "XENx86", "Android ARM", "Linux ARM", "MacOS 32ビット", "Android x86", "PogoPlug ARM", "Android APK", "Linux Poky x86-32bit", "MacOS 64ビット", "ChromeOS", "Linux Poky x86-64bit", "Linux NoKVM x86-32bit", "Linux NoKVM x86-64ビット", "Windows MinCoreコンソール", "Windows MinCoreサービス", "NodeJS", "ARM-リナロ", "ARMv6l / ARMv7l", "ARMv8 64ビット", "ARMv6l / ARMv7l / NoKVM", "未知の", "未知の", "FreeBSD x86-64"];
         var sort = 0;
         var searchFocus = 0;
@@ -1101,6 +1101,7 @@
         var pluginHandler = null;
         if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
         var installedPluginList = null;
+        var goBackStack = [];
 
         // Console Message Display Timers
         var p11DeskConsoleMsgTimer = null;
@@ -1943,7 +1944,7 @@
                     x += '</div>';
                     x += '<div><input type=button value="' + "閉じる" + '" onclick=setDialogMode(0) style=float:right></input>';
                     if ((features & 0x00020000) != 0) { x += '<input id=d2addkey3 type=button value="' + "キーを追加" + '" onclick="account_addhkey(3);"></input>'; }
-                    if ((features & 0x00004000) != 0) { x += '<input id=d2addkey2 type=button value="' + "YubiKey＆reg;を追加OTP" + '" onclick="account_addhkey(2);"></input>'; }
+                    if ((features & 0x00004000) != 0) { x += '<input id=d2addkey2 type=button value="' + "YubiKey&reg;を追加OTP" + '" onclick="account_addhkey(2);"></input>'; }
                     x += '</div><br />';
                     setDialogMode(2, "セキュリティキーを管理する", 8, null, x, 'otpauth-hardware-manage');
                     if (u2fSupported() == false) { QE('d2addkey1', false); }
@@ -2718,7 +2719,7 @@
                             deviceHeaderSet();
                             var extra = '';
                             if (view == 2) { r += '<tr><td colspan=5>'; }
-                            if (meshes[node.meshid].mtype == 1) { extra = '<span class=devHeaderx>' + "、Intel＆reg; AMTのみ" + '</span>'; }
+                            if (meshes[node.meshid].mtype == 1) { extra = '<span class=devHeaderx>' + "、Intel&reg; AMTのみ" + '</span>'; }
                             if ((view == 1) && (current != null)) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } if (r != '') { r += '</tr></table>'; } }
                             if (view == 2) { r += '<div>'; }
                             r += '<div class=DevSt style=width:100%;padding-top:4px><span style=float:right>';
@@ -2764,8 +2765,8 @@
                         var states = [];
                         if (node.conn) {
                             if ((node.conn & 1) != 0) { states.push('<span title=\"' + "メッシュエージェントが接続され、使用できる状態になりました。" + '\">' + "エージェント" + '</span>'); }
-                            if ((node.conn & 2) != 0) { states.push('<span title=\"' + "Intel＆reg; AMT CIRAが接続され、使用できる状態になりました。" + '\">' + "CIRA" + '</span>'); }
-                            else if ((node.conn & 4) != 0) { states.push('<span title=\"' + "Intel＆reg; AMTはルーティング可能です。" + '\">' + "AMT" + '</span>'); }
+                            if ((node.conn & 2) != 0) { states.push('<span title=\"' + "Intel&reg; AMT CIRAが接続され、使用できる状態になりました。" + '\">' + "CIRA" + '</span>'); }
+                            else if ((node.conn & 4) != 0) { states.push('<span title=\"' + "Intel&reg; AMTはルーティング可能です。" + '\">' + "AMT" + '</span>'); }
                             if ((node.conn & 8) != 0) { states.push('<span title=\"' + "メッシュエージェントは、別のエージェントをリレーとして使用して到達可能です。" + '\">' + "リレー" + '</span>'); }
                             if ((node.conn & 16) != 0) { states.push('<span title=\"' + "デバイスへのMQTT接続がアクティブです。" + '\">' + "MQTT" + '</span>'); }
                         }
@@ -2848,7 +2849,7 @@
                                 r += getMeshActions(mesh, meshrights);
                                 r += '</span></td></tr><tr>';
                                 if (mesh.mtype == 1) {
-                                    r += '<td><div style=padding:10px><i>' + "Intel＆reg;なしこのメッシュのAMTデバイス";
+                                    r += '<td><div style=padding:10px><i>' + "Intel&reg;なしこのメッシュのAMTデバイス";
                                     if ((meshrights & 4) != 0) { r += ', <a href=# style=cursor:pointer onclick=\'return addDeviceToMesh(\"' + mesh._id + '\")\'>' + "ひとつ追加" + '</a>'; }
                                 }
                                 if (mesh.mtype == 2) {
@@ -3076,12 +3077,12 @@
             if ((meshrights & 4) == 0) return '';
             var r = '';
             if ((features & 1024) == 0) { // If CIRA is allowed
-                r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "新しいIntel＆reg;を追加しますインターネット上にあるAMTコンピューター。" + '\" onclick=\'return addCiraDeviceToMesh(\"' + mesh._id + '\")\'>' + "CIRAを追加" + '</a>';
+                r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "新しいIntel&reg;を追加しますインターネット上にあるAMTコンピューター。" + '\" onclick=\'return addCiraDeviceToMesh(\"' + mesh._id + '\")\'>' + "CIRAを追加" + '</a>';
             }
             if (mesh.mtype == 1) {
                 if ((features & 1) == 0) { // If not WAN-Only
-                    r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "新しいIntel＆reg;を追加しますローカルネットワーク上にあるAMTコンピューター。" + '\" onclick=\'return addDeviceToMesh(\"' + mesh._id + '\")\'>' + "ローカルを追加" + '</a>';
-                    r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "新しいIntel＆reg;を追加しますローカルネットワークをスキャンしてAMTコンピューター。" + '\" onclick=\'return addAmtScanToMesh(\"' + mesh._id + '\")\'>' + "スキャンネットワーク" + '</a>';
+                    r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "新しいIntel&reg;を追加しますローカルネットワーク上にあるAMTコンピューター。" + '\" onclick=\'return addDeviceToMesh(\"' + mesh._id + '\")\'>' + "ローカルを追加" + '</a>';
+                    r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "新しいIntel&reg;を追加しますローカルネットワークをスキャンしてAMTコンピューター。" + '\" onclick=\'return addAmtScanToMesh(\"' + mesh._id + '\")\'>' + "スキャンネットワーク" + '</a>';
                 }
                 if (mesh.amt && (mesh.amt.type == 2)) { // CCM activation
                     r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "Intel AMTクライアント制御モード（CCM）アクティベーションを実行します。" + '\" onclick=\'return showCcmActivation(\"' + mesh._id + '\")\'>' + "アクティベーション" + '</a>';
@@ -3099,13 +3100,13 @@
         function addDeviceToMesh(meshid) {
             if (xxdialogMode) return false;
             var mesh = meshes[meshid];
-            var x = format("新しいIntel＆reg;を追加しますAMTデバイスからデバイスグループ\"{0}\"へ。", EscapeHtml(mesh.name)) + '<br /><br />';
+            var x = format("新しいIntel&reg;を追加しますAMTデバイスからデバイスグループ\"{0}\"へ。", EscapeHtml(mesh.name)) + '<br /><br />';
             x += addHtmlValue("装置名", '<input id=dp1devicename style=width:230px maxlength=32 autocomplete=off onchange=validateDeviceToMesh() onkeyup=validateDeviceToMesh() />');
             x += addHtmlValue("ホスト名", '<input id=dp1hostname style=width:230px maxlength=32 autocomplete=off placeholder=\"' + "デバイス名と同じ" + '\" onchange=validateDeviceToMesh() onkeyup=validateDeviceToMesh() />');
             x += addHtmlValue("ユーザー名", '<input id=dp1username style=width:230px maxlength=32 autocomplete=off placeholder=\"' + "管理者" + '\" onchange=validateDeviceToMesh() onkeyup=validateDeviceToMesh() />');
             x += addHtmlValue("パスワード", '<input id=dp1password type=password style=width:230px autocomplete=off maxlength=32 onchange=validateDeviceToMesh() onkeyup=validateDeviceToMesh() />');
             x += addHtmlValue("セキュリティ", '<select id=dp1tls style=width:236px><option value=0>' + "TLSセキュリティなし" + '</option><option value=1>' + "TLSセキュリティが必要" + '</option></select>');
-            setDialogMode(2, "Intel＆reg;を追加AMTデバイス", 3, addDeviceToMeshEx, x, meshid);
+            setDialogMode(2, "Intel&reg;を追加AMTデバイス", 3, addDeviceToMeshEx, x, meshid);
             validateDeviceToMesh();
             Q('dp1devicename').focus();
             return false;
@@ -3126,7 +3127,7 @@
             }
             var x = format("MeshCMDツールをダウンロードして次のように実行することにより、グループ\"{0}\"にIntel AMTクライアントコントロールモード（CCM）アクティベーションを実行します。", EscapeHtml(mesh.name)) + '<br /><br />';
             x += '<textarea readonly=readonly style=width:100%;resize:none;height:100px;overflow:auto;font-size:12px readonly>meshcmd amtccm --url ' + url + 'amtactivate?id=' + meshid.split('/')[2] + ' --serverhttpshash ' + serverinfo.tlshash + '</textarea>';
-            setDialogMode(2, "Intel＆reg; AMTアクティベーション", 9, null, x);
+            setDialogMode(2, "Intel&reg; AMTアクティベーション", 9, null, x);
             Q('idx_dlgOkButton').focus();
             return false;
         }
@@ -3149,7 +3150,7 @@
             if (serverinfo.amtAcmFqdn != null) {
                 x += ('<div style=margin-top:8px>' + "Intel AMTは、MEBxで信頼できるFQDNを使用して設定するか、ネットワーク上に有線LANが必要です。" + ' <b>' + serverinfo.amtAcmFqdn.join(', ') + '</b></div>');
             }
-            setDialogMode(2, "Intel＆reg; AMTアクティベーション", 9, null, x);
+            setDialogMode(2, "Intel&reg; AMTアクティベーション", 9, null, x);
             Q('idx_dlgOkButton').focus();
             return false;
         }
@@ -3160,7 +3161,7 @@
             var x = "IPアドレスの範囲を入力して、Intel AMTデバイスをスキャンします。" + '<br /><br />';
             x += addHtmlValue("IP範囲", '<input id=dp1range style=width:184px value="192.168.1.0/24" onkeyup=addAmtScanToMeshKeyUp(event) /><input id=dp1rangebutton type=button value=\"' + "スキャン" + '\" onclick=addAmtScanToMeshButton()></input>');
             x += '<div id=dp1results style="width:100%;height:200px;background-color:white;border:1px gray solid;overflow-y:scroll"></div>';
-            setDialogMode(2, "Intelをスキャン＆reg; AMTデバイス", 3, addAmtScanToMeshEx, x, meshid);
+            setDialogMode(2, "Intelをスキャン&reg; AMTデバイス", 3, addAmtScanToMeshEx, x, meshid);
             QE('idx_dlgOkButton', false);
             QH('dp1results', '<div style=width:100%;text-align:center;margin-top:12px;color:gray;line-height:1.5>Sample IP range values<br />192.168.0.100<br />192.168.1.0/24<br />192.167.0.1-192.168.0.100</div>');
             focusTextBox('dp1range');
@@ -3213,14 +3214,14 @@
             x += '<hr>';
 
             // Setup CIRA using a MeshCommander script (Pretty Simple)
-            x += '<div id=dlgAddCira0>' + format("新しいIntel＆reg;を追加するにはCIRAを使用してAMTデバイスからデバイスグループ\"{0}\"に移動し、次のスクリプトファイルをダウンロードして、<a href='http://meshcommander.com' rel='noreferrer noopener' target='_blank'> MeshCommander </を使用しますa>スクリプトを実行してコンピューターを構成します。", EscapeHtml(mesh.name)) + '<br /><br />';
+            x += '<div id=dlgAddCira0>' + format("新しいIntel&reg;を追加するにはCIRAを使用してAMTデバイスからデバイスグループ\"{0}\"に移動し、次のスクリプトファイルをダウンロードして、<a href='http://meshcommander.com' rel='noreferrer noopener' target='_blank'> MeshCommander </を使用しますa>スクリプトを実行してコンピューターを構成します。", EscapeHtml(mesh.name)) + '<br /><br />';
             //x += addHtmlValue('Setup CIRA', '<a href="mescript.ashx?type=1&meshid=' + meshidx.substring(0, 16) + '" download>cira_setup.mescript</a>');
             x += addHtmlValue("CIRAのセットアップ", '<a href="mescript.ashx?type=1&meshid=' + meshid + '" download>cira_setup.mescript</a>');
             x += addHtmlValue("CIRAのクリーンアップ", '<a href="mescript.ashx?type=2" download>cira_clean.mescript</a>');
             x += '</div>';
 
             // Setup CIRA with user/pass authentication (Somewhat difficult)
-            x += '<div id=dlgAddCira1 style=display:none>' + format("新しいIntel＆reg;を追加するにはAMTデバイスからCIRAを使用したデバイスグループ\"{0}\"に、Intel AMT内で信頼されたルートとして次の証明書をロード", EscapeHtml(mesh.name));
+            x += '<div id=dlgAddCira1 style=display:none>' + format("新しいIntel&reg;を追加するにはAMTデバイスからCIRAを使用したデバイスグループ\"{0}\"に、Intel AMT内で信頼されたルートとして次の証明書をロード", EscapeHtml(mesh.name));
             if (serverinfo.mpspass) { x += (" このユーザー名とパスワードを使用してサーバーに対して認証します。" + '<br /><br />'); } else { x += (" このユーザー名とパスワードを使用してサーバーに対して認証します。" + '<br /><br />'); }
             x += addHtmlValue("ルート証明書", '<a href=\"' + "MeshServerRootCert.cer" + '\" download>' + "ルート証明書ファイル" + '</a>');
             x += addHtmlValue("ユーザー名", '<input style=width:230px readonly value="' + meshidx.substring(0, 16) + '" />');
@@ -3230,14 +3231,14 @@
 
             // Setup CIRA with certificate authentication (Really difficult, only if TLS offload is not used)
             if ((features & 16) == 0) {
-                x += '<div id=dlgAddCira2 style=display:none>' + format("新しいIntel＆reg;を追加するにはCIRAを使用してデバイスグループ\"{0}\"へのAMTデバイス、Intel AMT内の信頼されたルートとして次の証明書を読み込み、次の共通名を持つクライアント証明書を使用して認証し、次のサーバーに接続します。", EscapeHtml(mesh.name)) + '<br /><br />';
+                x += '<div id=dlgAddCira2 style=display:none>' + format("新しいIntel&reg;を追加するにはCIRAを使用してデバイスグループ\"{0}\"へのAMTデバイス、Intel AMT内の信頼されたルートとして次の証明書を読み込み、次の共通名を持つクライアント証明書を使用して認証し、次のサーバーに接続します。", EscapeHtml(mesh.name)) + '<br /><br />';
                 x += addHtmlValue("ルート証明書", '<a href="MeshServerRootCert.cer" download>' + "ルート証明書ファイル" + '</a>');
                 x += addHtmlValue("組織", '<input style=width:230px readonly value="' + meshidx + '" />');
                 if (serverinfo != null) { x += addHtmlValue("MPSサーバー", '<input style=width:230px readonly value="' + EscapeHtml(serverinfo.mpsname) + ':' + serverinfo.mpsport + '" />'); }
                 x += '</div>';
             }
 
-            setDialogMode(2, "Intel＆reg;を追加AMT CIRAデバイス", 2, null, x, 'fileDownload');
+            setDialogMode(2, "Intel&reg;を追加AMT CIRAデバイス", 2, null, x, 'fileDownload');
             Q('dlgAddCiraSel').focus();
             return false;
         }
@@ -3448,8 +3449,8 @@
             if (node.state > 0 && node.state < powerStatetable.length) state.push(powerStatetable[node.state]);
             if (node.conn) {
                 if ((node.conn & 1) != 0) { states.push('<span title=\"' + "メッシュエージェントが接続され、使用できる状態になりました。" + '\">' + "エージェント" + '</span>'); }
-                if ((node.conn & 2) != 0) { states.push('<span title=\"' + "Intel＆reg; AMT CIRAが接続され、使用できる状態になりました。" + '\">' + "CIRA" + '</span>'); }
-                else if ((node.conn & 4) != 0) { states.push('<span title=\"' + "Intel＆reg; AMTはルーティング可能です。" + '\">' + "AMT" + '</span>'); }
+                if ((node.conn & 2) != 0) { states.push('<span title=\"' + "Intel&reg; AMT CIRAが接続され、使用できる状態になりました。" + '\">' + "CIRA" + '</span>'); }
+                else if ((node.conn & 4) != 0) { states.push('<span title=\"' + "Intel&reg; AMTはルーティング可能です。" + '\">' + "AMT" + '</span>'); }
                 if ((node.conn & 8) != 0) { states.push('<span title=\"' + "メッシュエージェントは、別のエージェントをリレーとして使用して到達可能です。" + '\">' + "リレー" + '</span>'); }
                 if ((node.conn & 16) != 0) { states.push('<span title=\"' + "デバイスへのMQTT接続がアクティブです。" + '\">' + "MQTT" + '</span>'); }
             }
@@ -3785,7 +3786,7 @@
             { text: "一般情報", callback: function (obj) { if (obj.data !=null) { gotoDevice(obj.data, 10); } } },
             { text: "デスクトップ", callback: function (obj) { if (obj.data !=null) { gotoDevice(obj.data, 11); } } },
             { text: "ターミナル", callback: function (obj) { if (obj.data !=null) { gotoDevice(obj.data, 12); } } },
-            { text: "Intel＆reg; AMT", callback: function (obj) { if (obj.data !=null) { gotoDevice(obj.data, 14); } } },
+            { text: "Intel&reg; AMT", callback: function (obj) { if (obj.data !=null) { gotoDevice(obj.data, 14); } } },
             '-',
             { text: "拡大する", callback: function(obj) { var coords = obj.data.getGeometry().getCoordinates(); zoomToLocation(coords, 19); } },
             { text: "ズームアウト", callback: function(obj) { var coords = obj.data.getGeometry().getCoordinates(); zoomToLocation(coords, 2); } }
@@ -4439,21 +4440,21 @@
                     if (node.intelamt.state == 2) {
                         if (node.intelamt.user == null || node.intelamt.user == '') {
                             if ((meshrights & 4) != 0) {
-                                str += ', <i style=color:#FF0000;cursor:pointer title=\"' + "Intelを編集＆reg; AMTクレデンシャル" + '\" onclick=editDeviceAmtSettings("' + node._id + '")>' + "資格情報なし" + '</i>';
+                                str += ', <i style=color:#FF0000;cursor:pointer title=\"' + "Intelを編集&reg; AMTクレデンシャル" + '\" onclick=editDeviceAmtSettings("' + node._id + '")>' + "資格情報なし" + '</i>';
                             } else {
                                 str += ', <i style=color:#FF0000>' + "資格情報なし" + '</i>';
                             }
                         }
                         str += ' ';
                         if ((meshrights & 4) != 0) {
-                            str += '<img src=images/link4.png height=10 width=10 title=\"' + "Intelを編集＆reg; AMTクレデンシャル" + '\" style=cursor:pointer onclick=editDeviceAmtSettings("' + node._id + '")>';
+                            str += '<img src=images/link4.png height=10 width=10 title=\"' + "Intelを編集&reg; AMTクレデンシャル" + '\" style=cursor:pointer onclick=editDeviceAmtSettings("' + node._id + '")>';
                         }
                     }
 
-                    var meName = '<span title=\"Intel&reg; Manageability Engine\">' + "Intel＆reg;私" + '<span>';
+                    var meName = '<span title=\"Intel&reg; Manageability Engine\">' + "Intel&reg;私" + '<span>';
                     if (typeof node.intelamt.sku == 'number') {
-                        if ((node.intelamt.sku & 8) != 0) { meName = '<span title=\"' + "Intel＆reg;アクティブ管理テクノロジー" + '\">' + "Intel＆reg; AMT" + '<span>'; }
-                        else if ((node.intelamt.sku & 16) != 0) { meName = '<span title=\"' + "Intel＆reg;標準の管理性" + '\">' + "Intel＆reg; SM" + '<span>'; }
+                        if ((node.intelamt.sku & 8) != 0) { meName = '<span title=\"' + "Intel&reg;アクティブ管理テクノロジー" + '\">' + "Intel&reg; AMT" + '<span>'; }
+                        else if ((node.intelamt.sku & 16) != 0) { meName = '<span title=\"' + "Intel&reg;標準の管理性" + '\">' + "Intel&reg; SM" + '<span>'; }
                     }
                     x += addDeviceAttribute(meName, str);
                 }
@@ -4470,7 +4471,7 @@
                     if ((node.intelamt != null) && (node.intelamt.tag != null)) {
                         var tag = EscapeHtml(node.intelamt.tag);
                         if (tag.startsWith('mailto:')) { tag = '<a href="' + tag + '">' + tag.substring(7) + '</a>'; }
-                        x += addDeviceAttribute("Intel＆reg; AMTタグ", tag);
+                        x += addDeviceAttribute("Intel&reg; AMTタグ", tag);
                     }
                 }
 
@@ -4503,8 +4504,8 @@
                 if (connectivity && connectivity > 1) {
                     var cstate = [];
                     if ((node.conn & 1) != 0) cstate.push('<span title=\"' + "メッシュエージェントが接続され、使用できる状態になりました。" + '\">' + "メッシュエージェント" + '</span>');
-                    if ((node.conn & 2) != 0) cstate.push('<span title=\"' + "Intel＆reg; AMT CIRAが接続され、使用できる状態になりました。" + '\">' + "Intel＆reg; AMT CIRA" + '</span>');
-                    else if ((node.conn & 4) != 0) cstate.push('<span title=\"' + "Intel＆reg; AMTはルーティング可能であり、すぐに使用できます。" + '\">' + "Intel＆reg; AMT" + '</span>');
+                    if ((node.conn & 2) != 0) cstate.push('<span title=\"' + "Intel&reg; AMT CIRAが接続され、使用できる状態になりました。" + '\">' + "Intel&reg; AMT CIRA" + '</span>');
+                    else if ((node.conn & 4) != 0) cstate.push('<span title=\"' + "Intel&reg; AMTはルーティング可能であり、すぐに使用できます。" + '\">' + "Intel&reg; AMT" + '</span>');
                     if ((node.conn & 8) != 0) cstate.push('<span title=\"' + "メッシュエージェントは、別のエージェントをリレーとして使用して到達可能です。" + '\">' + "メッシュリレー" + '</span>');
                     if ((node.conn & 16) != 0) { cstate.push('<span title=\"' + "デバイスへのMQTT接続がアクティブです。" + '\">' + "MQTT" + '</span>'); }
                     x += addDeviceAttribute("接続性", cstate.join(', '));
@@ -4561,8 +4562,8 @@
                 var powerstate = PowerStateStr(node.state);
                 //if (node.state == 0) { powerstate = 'Unknown State'; }
                 if ((connectivity & 1) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title=\"' + "接続されたエージェント" + '\">' + "接続されたエージェント" + '</span>'; }
-                if ((connectivity & 2) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title=\"' + "Intel＆reg;接続されたAMT" + '\">' + "Intel＆reg;接続されたAMT" + '</span>'; }
-                else if ((connectivity & 4) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title=\"' + "Intel＆reg; AMTが検出されました" + '\">' + "Intel＆reg; AMTが検出されました" + '</span>'; }
+                if ((connectivity & 2) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title=\"' + "Intel&reg;接続されたAMT" + '\">' + "Intel&reg;接続されたAMT" + '</span>'; }
+                else if ((connectivity & 4) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title=\"' + "Intel&reg; AMTが検出されました" + '\">' + "Intel&reg; AMTが検出されました" + '</span>'; }
                 if ((connectivity & 16) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title=\"' + "MQTT接続済み" + '\">' + "MQTTチャネルが接続されました" + '</span>'; }
                 if ((powerstate == '') && node.lastconnect) { powerstate = '<span style=font-size:12px>' + "最後に見たのは：" + '<br />' + printDateTime(new Date(node.lastconnect)) + '</span>'; }
                 QH('MainComputerState', powerstate);
@@ -4830,7 +4831,7 @@
             x += addHtmlValue("パスワード", '<input id=dp10password type=password style=width:230px autocomplete=nope maxlength=32 onchange=validateDeviceAmtSettings() onkeyup=validateDeviceAmtSettings() />');
             x += addHtmlValue("セキュリティ", '<select id=dp10tls style=width:236px><option value=0>' + "TLSセキュリティなし" + '</option><option value=1>' + "TLSセキュリティが必要" + '</option></select>');
             if ((node.intelamt.user != null) && (node.intelamt.user != '')) { buttons = 7; }
-            setDialogMode(2, "Intelを編集＆reg; AMTクレデンシャル", buttons, editDeviceAmtSettingsEx, x, { node: node, func: func, arg: arg });
+            setDialogMode(2, "Intelを編集&reg; AMTクレデンシャル", buttons, editDeviceAmtSettingsEx, x, { node: node, func: func, arg: arg });
             if ((node.intelamt.user != null) && (node.intelamt.user != '')) { Q('dp10username').value = node.intelamt.user; } else { Q('dp10username').value = 'admin'; }
             Q('dp10tls').value = node.intelamt.tls;
             validateDeviceAmtSettings();
@@ -7090,7 +7091,7 @@
             x += '<div><label><input id=p2notifyGroupName type=checkbox />' + "Display Device Group Name" + '</label></div>';
             x += '<div><label><input id=p2notifyIntelDeviceConnect type=checkbox />' + "デバイス接続。" + '</label></div>';
             x += '<div><label><input id=p2notifyIntelDeviceDisconnect type=checkbox />' + "デバイスの切断。" + '</label></div>';
-            x += '<div><label><input id=p2notifyIntelAmtKvmActions type=checkbox />' + "Intel＆reg; AMTデスクトップおよびシリアルイベント。" + '</label></div>';
+            x += '<div><label><input id=p2notifyIntelAmtKvmActions type=checkbox />' + "Intel&reg; AMTデスクトップおよびシリアルイベント。" + '</label></div>';
             setDialogMode(2, "通知設定", 3, account_showAccountNotifySettingsEx, x);
             var n = getstore('notifications', 0);
             Q('p2notifyPlayNotifySound').checked = (n & 1);
@@ -7209,7 +7210,7 @@
             // We are allowed, let's prompt to information
             var x = "以下のオプションを使用して、新しいデバイスグループを作成します。" + '<br /><br />';
             x += addHtmlValue("名", '<input id=dp2meshname style=width:230px maxlength=64 onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,1) />');
-            x += addHtmlValue("タイプ", '<div style=width:230px;margin:0;padding:0><select id=dp2meshtype style=width:100% onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,2) ><option value=2>' + "ソフトウェアエージェントを使用して管理する" + '</option><option value=1>' + "Intel＆reg; AMTのみ、エージェントなし" + '</option></select></div>');
+            x += addHtmlValue("タイプ", '<div style=width:230px;margin:0;padding:0><select id=dp2meshtype style=width:100% onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,2) ><option value=2>' + "ソフトウェアエージェントを使用して管理する" + '</option><option value=1>' + "Intel&reg; AMTのみ、エージェントなし" + '</option></select></div>');
             x += addHtmlValue("説明", '<div style=width:230px;margin:0;padding:0><textarea id=dp2meshdesc maxlength=1024 style=width:100%;resize:none></textarea></div>');
             setDialogMode(2, "新しいデバイスグループ", 3, account_createMeshEx, x);
             account_validateMeshCreate();
@@ -7358,7 +7359,7 @@
             var meshtype = format("不明な＃{0}", currentMesh.mtype);
             var meshrights = 0;
             try { meshrights = currentMesh.links[userinfo._id].rights; } catch (ex) { }
-            if (currentMesh.mtype == 1) meshtype = "Intel＆reg; AMTのみ、エージェントなし";
+            if (currentMesh.mtype == 1) meshtype = "Intel&reg; AMTのみ、エージェントなし";
             if (currentMesh.mtype == 2) meshtype = "ソフトウェアエージェントを使用して管理";
 
             var x = '';
@@ -7403,7 +7404,7 @@
             if (userinfo.links && userinfo.links[currentMesh._id] && userinfo.links[currentMesh._id].notify) { meshNotify = userinfo.links[currentMesh._id].notify; }
             if (meshNotify & 2) { meshNotifyStr.push("つなぐ"); }
             if (meshNotify & 4) { meshNotifyStr.push("切断する"); }
-            if (meshNotify & 8) { meshNotifyStr.push("Intel＆reg; AMT"); }
+            if (meshNotify & 8) { meshNotifyStr.push("Intel&reg; AMT"); }
             if (meshNotifyStr.length == 0) { meshNotifyStr.push('<i>' + "なし" + '</i>'); }
             x += addHtmlValue("通知", addLink(meshNotifyStr.join(', '), 'p20editMeshNotify()'));
 
@@ -7419,7 +7420,7 @@
                     if (currentMesh.amt.cirasetup == 2) { intelAmtPolicy += " + CIRA"; }
                 }
             }
-            x += addHtmlValue("Intel＆reg; AMT", addLinkConditional(intelAmtPolicy, 'p20editMeshAmt()', meshrights & 1));
+            x += addHtmlValue("Intel&reg; AMT", addLinkConditional(intelAmtPolicy, 'p20editMeshAmt()', meshrights & 1));
 
             // Display group note support
             if (meshrights & 1) { x += '<br><input type=button value=' + "ノート" + ' title=\"' + "このデバイスグループに関するメモを表示する" + '\" onclick=showNotes(false,"' + encodeURIComponent(currentMesh._id) + '") />'; }
@@ -7430,8 +7431,8 @@
 
             if ((meshrights & 4) != 0) {
                 if (currentMesh.mtype == 1) {
-                    x += '<a href=# onclick=\'return addCiraDeviceToMesh(\"' + currentMesh._id + '\")\' style=cursor:pointer;margin-right:10px title=\"' + "新しいIntel＆reg;を追加しますインターネット上にあるAMTコンピューター。" + '\"><img src=images/icon-installmesh.png border=0 height=12 width=12> ' + "CIRAをインストールする" + '</a>';
-                    x += '<a href=# onclick=\'return addDeviceToMesh(\"' + currentMesh._id + '\")\' style=cursor:pointer;margin-right:10px title=\"' + "新しいIntel＆reg;を追加しますローカルネットワーク上にあるAMTコンピューター。" + '\"><img src=images/icon-installmesh.png border=0 height=12 width=12> ' + "ローカルにインストール" + '</a>';
+                    x += '<a href=# onclick=\'return addCiraDeviceToMesh(\"' + currentMesh._id + '\")\' style=cursor:pointer;margin-right:10px title=\"' + "新しいIntel&reg;を追加しますインターネット上にあるAMTコンピューター。" + '\"><img src=images/icon-installmesh.png border=0 height=12 width=12> ' + "CIRAをインストールする" + '</a>';
+                    x += '<a href=# onclick=\'return addDeviceToMesh(\"' + currentMesh._id + '\")\' style=cursor:pointer;margin-right:10px title=\"' + "新しいIntel&reg;を追加しますローカルネットワーク上にあるAMTコンピューター。" + '\"><img src=images/icon-installmesh.png border=0 height=12 width=12> ' + "ローカルにインストール" + '</a>';
                     if (currentMesh.amt && (currentMesh.amt.type == 2)) { // CCM activation
                         x += '<a href=# onclick=\'return showCcmActivation(\"' + currentMesh._id + '\")\' style=cursor:pointer;margin-right:10px title=\"' + "Intel AMTクライアント制御モード（CCM）アクティベーションを実行します。" + '\"><img src=images/icon-installmesh.png border=0 height=12 width=12> ' + "アクティベーション" + '</a>';
                     } else if (currentMesh.amt && (currentMesh.amt.type == 3) && ((features & 0x00100000) != 0)) { // ACM activation
@@ -7483,7 +7484,7 @@
                 x += addHtmlValue("タイプ", '<select id=dp20amtpolicy style=width:230px onchange=p20editMeshAmtChange()><option value=0>' + "ポリシーなし" + '</option><option value=1>' + "クライアント制御モード（CCM）を無効にする" + '</option><option value=2>' + "シンプルクライアントコントロールモード（CCM）" + '</option>' + acmoption + '</select>');
             }
             x += '<div id=dp20amtpolicydiv></div>';
-            setDialogMode(2, "Intel＆reg; AMTポリシー", 3, p20editMeshAmtEx, x);
+            setDialogMode(2, "Intel&reg; AMTポリシー", 3, p20editMeshAmtEx, x);
             if (currentMesh.amt) { Q('dp20amtpolicy').value = currentMesh.amt.type; }
             p20editMeshAmtChange();
 
@@ -7502,7 +7503,7 @@
             if (ptype >= 2) {
                 x = addHtmlValue("パスワード*", '<input id=dp20amtpolicypass type=password style=width:230px maxlength=32 onchange=dp20amtValidatePolicy() onkeyup=dp20amtValidatePolicy() autocomplete=off />')
                 x += addHtmlValue("パスワード*", '<input id=dp20amtpolicypass2 type=password style=width:230px maxlength=32 onchange=dp20amtValidatePolicy() onkeyup=dp20amtValidatePolicy() autocomplete=off />')
-                if ((ptype == 2) && (currentMesh.mtype == 2)) { x += addHtmlValue("パスワード", '<select id=dp20amtbadpass style=width:230px><option value=0>' + "何もしない" + '</option><option value=1>' + "インテルを再アクティブ化＆reg; AMT" + '</option></select>'); }
+                if ((ptype == 2) && (currentMesh.mtype == 2)) { x += addHtmlValue("パスワード", '<select id=dp20amtbadpass style=width:230px><option value=0>' + "何もしない" + '</option><option value=1>' + "インテルを再アクティブ化&reg; AMT" + '</option></select>'); }
                 if ((features & 0x400) == 0) {
                     if (ptype == 2) {
                         x += addHtmlValue('<span title="' + "クライアントが開始したリモートアクセス" + '">' + "CIRA" + '</span>', '<select id=dp20amtcira style=width:230px><option value=0>' + "設定しないでください" + '</option><option value=1>' + "サーバーに接続しない" + '</option><option value=2>' + "サーバーに接続する" + '</option></select>');
@@ -7513,7 +7514,7 @@
                 x += '<br/><span style="font-size:10px">' + "*空白のままにして、各デバイスにランダムなパスワードを割り当てます。" + '</span><br/>';
                 if (currentMesh.mtype == 2) {
                     if (ptype == 2) {
-                        x += '<span style="font-size:10px">' + "このポリシーは、Intel＆reg;を搭載したデバイスには影響しません。 ACMモードのAMT。" + '</span><br/>';
+                        x += '<span style="font-size:10px">' + "このポリシーは、Intel&reg;を搭載したデバイスには影響しません。 ACMモードのAMT。" + '</span><br/>';
                         x += '<span style="font-size:10px">' + "エージェントはアクティベーションを実行するため、これは安全なポリシーではありません。" + '</span>';
                     } else {
                         x += '<span style="font-size:10px">' + "アクティベーション中、エージェントは管理者パスワード情報にアクセスできます。" + '</span>';
@@ -7669,7 +7670,7 @@
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20remotelimitedinput style=margin-left:12px>' + "限定入力のみ" + '</label><br>';
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20noterminal style=margin-left:12px>' + "ターミナルアクセスなし" + '</label><br>';
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20nofiles style=margin-left:12px>' + "ファイルアクセスなし" + '</label><br>';
-            x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20noamt style=margin-left:12px>' + "Intel＆reg;なしAMT" + '</label><br>';
+            x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20noamt style=margin-left:12px>' + "Intel&reg;なしAMT" + '</label><br>';
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20meshagentconsole>' + "メッシュエージェントコンソール" + '</label><br>';
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20meshserverfiles>' + "サーバーファイル" + '</label><br>';
             x += '<label><input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20wakedevices>' + "ウェイクデバイス" + '</label><br>';
@@ -7826,7 +7827,7 @@
                     if (((meshrights & 8) != 0) && (meshrights & 256) != 0) r.push("リモートビューのみ");
                     if (((meshrights & 8) != 0) && (meshrights & 512) != 0) r.push("ターミナルなし");
                     if (((meshrights & 8) != 0) && (meshrights & 1024) != 0) r.push("ファイルなし");
-                    if (((meshrights & 8) != 0) && (meshrights & 2048) != 0) r.push("Intel＆reg;なしAMT");
+                    if (((meshrights & 8) != 0) && (meshrights & 2048) != 0) r.push("Intel&reg;なしAMT");
                     if (((meshrights & 8) != 0) && ((meshrights & 4096) != 0) && ((meshrights & 256) == 0)) r.push("制限された入力");
                     if ((meshrights & 8192) != 0) r.push("自己イベントのみ");
                     if ((meshrights & 16384) != 0) r.push("チャットと通知");
@@ -9599,11 +9600,10 @@
 
         function goBack() {
             setSessionActivity();
-            if (xxdialogMode) return;
+            if (xxdialogMode || (goBackStack.length == 0)) return;
             if (fullscreen) { deskToggleFull(); }
-            if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
-            if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
-            if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
+            go(goBackStack.pop());
+            goBackStack.pop();
         }
 
         function go(x, event) {
@@ -9622,8 +9622,15 @@
                 return;
             }
 
+            // If we are going to the same place, do nothing.
             if (xxcurrentView == x) return;
 
+            // Set the goback stack, if going to top-level view, clear the stack.
+            if ((xxcurrentView < 0) || (x < 10)) { goBackStack = []; } else {
+                // Do not push into the back stack if we are changing tabs at the same level.
+                if (Math.floor(xxcurrentView / 10) != Math.floor(x / 10)) { goBackStack.push(xxcurrentView); }
+            }
+
             // Edit this line when adding a new screen
             for (var i = 0; i < 44; i++) { QV('p' + i, i == x); }
             xxcurrentView = x;
@@ -9646,29 +9653,34 @@
             var mainMenuActiveClass = (x < 9 ? 'fullselect' : 'semiselect');
             var leftMenuActiveClass = (((x < 9) || (x == 115) || (x == 40) || (x == 41) || (x == 42)) ? 'lbbuttonsel2' : 'lbbuttonsel');
 
+            var backView = 0;
+            if (goBackStack.length > 0) { backView = goBackStack[goBackStack.length - 1]; }
+
             // My Devices
-            if (x == 1 || (x >= 10 && x < 20)) QC('MainMenuMyDevices').add(mainMenuActiveClass);
-            if (x == 1 || (x >= 10 && x < 20)) QC('LeftMenuMyDevices').add(leftMenuActiveClass);
-
+            if (x == 1 || (backView == 1) || ((backView == 0) && (x >= 10 && x < 20))) {
+                QC('MainMenuMyDevices').add(mainMenuActiveClass);
+                QC('LeftMenuMyDevices').add(leftMenuActiveClass);
+            } else if (x == 2 || (backView == 2) || ((backView == 0) && (x >= 20 && x < 30))) {
                 // My Account
-            if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
-            if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
+                QC('MainMenuMyAccount').add(mainMenuActiveClass);
+                QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+            } else if (x == 3) {
                 // My Events
-            if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
-            if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
+                QC('MainMenuMyEvents').add(mainMenuActiveClass);
+                QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+            } else if (x == 4 || (x >= 30 && x < 40)) {
                 // My Users
-            if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
-            if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
+                QC('MainMenuMyUsers').add(mainMenuActiveClass);
+                QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+            } else if (x == 5) {
                 // My Files
-            if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
-            if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
+                QC('MainMenuMyFiles').add(mainMenuActiveClass);
+                QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+            } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
                 // My Server
-            if ((x == 6) || (x == 115)) QC('MainMenuMyServer').add(mainMenuActiveClass);
-            if ((x == 6) || (x == 115) || (x == 40) || (x == 41) || (x == 42) || (x == 43)) QC('LeftMenuMyServer').add(leftMenuActiveClass);
+                QC('MainMenuMyServer').add(mainMenuActiveClass);
+                QC('LeftMenuMyServer').add(leftMenuActiveClass);
+            }
             QV('ServerPlugins', pluginHandler != null);
 
             // column_l max-height

views/translations/default_nl.handlebars

@@ -448,7 +448,7 @@
                     <div id="p11deviceNameHeader">
                         <div id="p11BackButton"><div class="backButton" tabindex="0" onclick="goBack()" title="Terug" onkeypress="if (event.key == 'Enter') goBack()"><div class="backButtonEx"></div></div></div>
                         <div id="devListToolbarViewIcons"><div class="viewSelector" onclick="deskToggleFull(event)" title="Volledig scherm. Houd shift ingedrukt om de browser op volledig scherm weer te geven."><div class="viewSelector5"></div></div></div>
-                        <h1>bureaublad -  <span id="p11deviceName"></span></h1>
+                        <h1>Bureaublad -  <span id="p11deviceName"></span></h1>
                     </div>
                 </div>
                 <div id="p11warning" onclick="showFeaturesDlg()">
@@ -469,7 +469,7 @@
                             <div id="deskRecordIcon" class="deskareaicon" title="Server neemt deze sessie op" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px"></div>
                             <input id="deskFocusBtn" type="button" title="Schakel focusmodus in, indien actief wordt alleen het gebied rond de muis bijgewerkt" onkeypress="return false" onkeydown="return false" value="Focus alles" onclick="deskToggleFocus()" style="margin-right:3px;display:none">
                             <input id="deskSaveBtn" type="button" title="Bewaar een screenshot van het externe bureaublad" onkeypress="return false" onkeydown="return false" value="Opslaan..." onclick="deskSaveImage()" class="mR">
-                            <input id="deskActionsBtn" type="button" title="Voer krachtacties uit op het apparaat" onkeypress="return false" onkeydown="return false" value="Akties" onclick="deviceActionFunction()" class="mR">
+                            <input id="deskActionsBtn" type="button" title="Voer krachtacties uit op het apparaat" onkeypress="return false" onkeydown="return false" value="Acties" onclick="deviceActionFunction()" class="mR">
                             <input id="deskActionsSettings" type="button" value="Instellingen ..." title="Bewerk externe bureaubladinstellingen" onkeypress="return false" onkeydown="return false" onclick="showDesktopSettings()" class="mR">
                             <input type="button" title="Wijzig de stroomstatus van het externe apparaat" onkeypress="return false" onkeydown="return false" value="Power Actie's..." onclick="showPowerActionDlg()" style="display:none">
                         </div>
@@ -569,7 +569,7 @@
                             <td class="areaHead">
                                 <div class="toright2">
                                     <div id="termRecordIcon" class="deskareaicon" title="Server neemt deze sessie op" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px;margin-left:5px"></div>
-                                    <input id="termActionsBtn" type="button" title="Voer krachtacties uit op het apparaat" onkeypress="return false" onkeydown="return false" value="Akties" onclick="deviceActionFunction()">
+                                    <input id="termActionsBtn" type="button" title="Voer krachtacties uit op het apparaat" onkeypress="return false" onkeydown="return false" value="Acties" onclick="deviceActionFunction()">
                                 </div>
                                 <div>
                                     <input type="button" id="autoconnectbutton2" value="Automatisch verbinden" onclick="autoConnectTerminal(event)" onkeypress="return false" onkeydown="return false" style="display:none">
@@ -596,7 +596,7 @@
                                     <span id="TermTimer" title="Sessie tijd"></span>&nbsp;
                                     <span id="terminalSettingsButtons" style="display:none">
                                         <input id="id_tcrbutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="CR+LF" title="Wissel wat de return toets zal verzenden" onclick="termToggleCr()">
-                                        <input id="id_tfxkeysbutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="Intel (F10 = ESC+[OM)" title="Schakel het emulatietype van F1 naar F10-toetsen" onclick="termToggleFx()">
+                                        <input id="id_tfxkeysbutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="Intel (F10 = ESC+[OM)" title="Schakel het emulatietype van F1 naar F10 toetsen" onclick="termToggleFx()">
                                         <input id="id_ttypebutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="Extended Ascii" title="Schakel het type terminal emulatie in" onclick="termToggleType()">
                                     </span>
                                     <span id="terminalSizeDropDown">
@@ -628,7 +628,7 @@
                     <tbody><tr>
                         <td class="areaHead">
                             <div class="toright2">
-                                <input id="filesActionsBtn" type="button" title="Voer krachtacties uit op het apparaat" value="Akties" onclick="deviceActionFunction()">
+                                <input id="filesActionsBtn" type="button" title="Voer krachtacties uit op het apparaat" value="Acties" onclick="deviceActionFunction()">
                                 <div id="filesRecordIcon" class="deskareaicon" title="Server neemt deze sessie op" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px;margin-left:5px"></div>
                             </div>
                             <div>
@@ -908,7 +908,7 @@
                     </div>
                 </div>
                 <table id="p42tbl">
-                    <tbody><tr class="DevSt"><th style="width:26px"></th><th style="width:10px"></th><th class="chName">Naam</th><th class="chDescription">Omschrijving</th><th class="chSite" style="text-align:center">Link</th><th class="chVersion" style="text-align:center">Versie</th><th class="chUpgradeAvail" style="text-align:center">Laatste</th><th class="chStatus" style="text-align:center">Status</th><th class="chAction" style="text-align:center">Aktie</th><th style="width:10px"></th></tr>
+                    <tbody><tr class="DevSt"><th style="width:26px"></th><th style="width:10px"></th><th class="chName">Naam</th><th class="chDescription">Omschrijving</th><th class="chSite" style="text-align:center">Link</th><th class="chVersion" style="text-align:center">Versie</th><th class="chUpgradeAvail" style="text-align:center">Laatste</th><th class="chStatus" style="text-align:center">Status</th><th class="chAction" style="text-align:center">Actie</th><th style="width:10px"></th></tr>
                 </tbody></table>
                 <div id="pluginNoneNotice" style="width:100%;text-align:center;padding-top:10px;display:none"><i>Geen plug-ins op server.</i></div>
             </div>
@@ -1047,7 +1047,7 @@
         var args;
         var autoReconnect = true;
         var powerStatetable = ['', "ingeschakeld", "Slaap", "Slaap", "Slaap", "Slaapstand", "Uitzetten", "Aanwezig"];
-        var StatusStrs = ["Verbroken", "Verbinden...", "Setup...", "Verbonden", "Intel® AMT verbonden"];
+        var StatusStrs = ["Verbroken", "Verbinden...", "Setup...", "Verbonden", "Intel&reg; AMT verbonden"];
         var agentsStr = ["Onbekend", "Windows 32bit console", "Windows 64bit console", "Windows 32bit service", "Windows 64bit service", "Linux 32bit", "Linux 64bit", "MIPS", "XENx86", "Android ARM", "Linux ARM", "MacOS 32bit", "Android x86", "PogoPlug ARM", "Android APK", "Linux Poky x86-32bit", "MacOS 64bit", "ChromeOS", "Linux Poky x86-64bit", "Linux NoKVM x86-32bit", "Linux NoKVM x86-64bit", "Windows MinCore console", "Windows MinCore service", "NodeJS", "ARM-Linaro", "ARMv6l / ARMv7l", "ARMv8 64bit", "ARMv6l / ARMv7l / NoKVM", "Onbekend", "Onbekend", "FreeBSD x86-64"];
         var sort = 0;
         var searchFocus = 0;
@@ -1101,6 +1101,7 @@
         var pluginHandler = null;
         if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
         var installedPluginList = null;
+        var goBackStack = [];
 
         // Console Message Display Timers
         var p11DeskConsoleMsgTimer = null;
@@ -1943,7 +1944,7 @@
                     x += '</div>';
                     x += '<div><input type=button value="' + "Sluiten" + '" onclick=setDialogMode(0) style=float:right></input>';
                     if ((features & 0x00020000) != 0) { x += '<input id=d2addkey3 type=button value="' + "Sleutel toevoegen" + '" onclick="account_addhkey(3);"></input>'; }
-                    if ((features & 0x00004000) != 0) { x += '<input id=d2addkey2 type=button value="' + "Voeg YubiKey® OTP toe" + '" onclick="account_addhkey(2);"></input>'; }
+                    if ((features & 0x00004000) != 0) { x += '<input id=d2addkey2 type=button value="' + "Voeg YubiKey&reg; OTP toe" + '" onclick="account_addhkey(2);"></input>'; }
                     x += '</div><br />';
                     setDialogMode(2, "Beheer beveiligingssleutels", 8, null, x, 'otpauth-hardware-manage');
                     if (u2fSupported() == false) { QE('d2addkey1', false); }
@@ -2764,8 +2765,8 @@
                         var states = [];
                         if (node.conn) {
                             if ((node.conn & 1) != 0) { states.push('<span title=\"' + "Mesh-agent is verbonden en klaar voor gebruik." + '\">' + "Agent" + '</span>'); }
-                            if ((node.conn & 2) != 0) { states.push('<span title=\"' + "Intel® AMT CIRA is verbonden en klaar voor gebruik." + '\">' + "CIRA" + '</span>'); }
-                            else if ((node.conn & 4) != 0) { states.push('<span title=\"' + "Intel® AMT is routeerbaar." + '\">' + "AMT" + '</span>'); }
+                            if ((node.conn & 2) != 0) { states.push('<span title=\"' + "Intel&reg; AMT CIRA is verbonden en klaar voor gebruik." + '\">' + "CIRA" + '</span>'); }
+                            else if ((node.conn & 4) != 0) { states.push('<span title=\"' + "Intel&reg; AMT is routeerbaar." + '\">' + "AMT" + '</span>'); }
                             if ((node.conn & 8) != 0) { states.push('<span title=\"' + "Mesh-agent is bereikbaar met een andere agent als relay." + '\">' + "Relay" + '</span>'); }
                             if ((node.conn & 16) != 0) { states.push('<span title=\"' + "MQTT verbinding met het apparaat is actief." + '\">' + "MQTT" + '</span>'); }
                         }
@@ -3000,7 +3001,7 @@
                         }
                     }
                 }
-                if (count > 8) { setDialogMode(2, "Alles verbinden", 3, function() { connectAllKvmFunction(true); }, format("Weet u zeker dat u verbinding wilt maken met {0} -apparaten?", count)); return; }
+                if (count > 8) { setDialogMode(2, "Alles verbinden", 3, function() { connectAllKvmFunction(true); }, format("Weet u zeker dat u verbinding wilt maken met {0} apparaten?", count)); return; }
             }
 
             // Perform connect all
@@ -3076,12 +3077,12 @@
             if ((meshrights & 4) == 0) return '';
             var r = '';
             if ((features & 1024) == 0) { // If CIRA is allowed
-                r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "Voeg een nieuwe Intel® AMT computer toe welke zich op het internet bevind." + '\" onclick=\'return addCiraDeviceToMesh(\"' + mesh._id + '\")\'>' + "Toevoegen CIRA" + '</a>';
+                r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "Voeg een nieuwe Intel&reg; AMT computer toe welke zich op het internet bevind." + '\" onclick=\'return addCiraDeviceToMesh(\"' + mesh._id + '\")\'>' + "Toevoegen CIRA" + '</a>';
             }
             if (mesh.mtype == 1) {
                 if ((features & 1) == 0) { // If not WAN-Only
-                    r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "Voeg een nieuwe Intel® AMT computer toe welke zich op het lokale netwerk bevind." + '\" onclick=\'return addDeviceToMesh(\"' + mesh._id + '\")\'>' + "Lokaal toevoegen" + '</a>';
-                    r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "Voeg een nieuwe Intel® AMT computer toe door het lokale netwerk te scannen." + '\" onclick=\'return addAmtScanToMesh(\"' + mesh._id + '\")\'>' + "Scan Netwerk" + '</a>';
+                    r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "Voeg een nieuwe Intel&reg; AMT computer toe welke zich op het lokale netwerk bevind." + '\" onclick=\'return addDeviceToMesh(\"' + mesh._id + '\")\'>' + "Lokaal toevoegen" + '</a>';
+                    r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "Voeg een nieuwe Intel&reg; AMT computer toe door het lokale netwerk te scannen." + '\" onclick=\'return addAmtScanToMesh(\"' + mesh._id + '\")\'>' + "Scan Netwerk" + '</a>';
                 }
                 if (mesh.amt && (mesh.amt.type == 2)) { // CCM activation
                     r += ' <a href=# style=cursor:pointer;font-size:10px title=\"' + "Voer Intel AMT client control mode (CCM) activering uit." + '\" onclick=\'return showCcmActivation(\"' + mesh._id + '\")\'>' + "Activatie" + '</a>';
@@ -3105,7 +3106,7 @@
             x += addHtmlValue("Gebruikersnaam", '<input id=dp1username style=width:230px maxlength=32 autocomplete=off placeholder=\"' + "Beheerder" + '\" onchange=validateDeviceToMesh() onkeyup=validateDeviceToMesh() />');
             x += addHtmlValue("wachtwoord", '<input id=dp1password type=password style=width:230px autocomplete=off maxlength=32 onchange=validateDeviceToMesh() onkeyup=validateDeviceToMesh() />');
             x += addHtmlValue("Veiligheid", '<select id=dp1tls style=width:236px><option value=0>' + "Geen TLS beveiliging" + '</option><option value=1>' + "TLS beveiliging vereist" + '</option></select>');
-            setDialogMode(2, "Add Intel&reg; AMT aaparaat", 3, addDeviceToMeshEx, x, meshid);
+            setDialogMode(2, "Add Intel&reg; AMT apparaat", 3, addDeviceToMeshEx, x, meshid);
             validateDeviceToMesh();
             Q('dp1devicename').focus();
             return false;
@@ -3160,7 +3161,7 @@
             var x = "Voer een reeks IP-adressen in om te scannen op Intel AMT-apparaten." + '<br /><br />';
             x += addHtmlValue("IP-bereik", '<input id=dp1range style=width:184px value="192.168.1.0/24" onkeyup=addAmtScanToMeshKeyUp(event) /><input id=dp1rangebutton type=button value=\"' + "Scan" + '\" onclick=addAmtScanToMeshButton()></input>');
             x += '<div id=dp1results style="width:100%;height:200px;background-color:white;border:1px gray solid;overflow-y:scroll"></div>';
-            setDialogMode(2, "Scannen naar Intel® AMT-apparaten", 3, addAmtScanToMeshEx, x, meshid);
+            setDialogMode(2, "Scannen naar Intel&reg;  AMT-apparaten", 3, addAmtScanToMeshEx, x, meshid);
             QE('idx_dlgOkButton', false);
             QH('dp1results', '<div style=width:100%;text-align:center;margin-top:12px;color:gray;line-height:1.5>Sample IP range values<br />192.168.0.100<br />192.168.1.0/24<br />192.167.0.1-192.168.0.100</div>');
             focusTextBox('dp1range');
@@ -3213,14 +3214,14 @@
             x += '<hr>';
 
             // Setup CIRA using a MeshCommander script (Pretty Simple)
-            x += '<div id=dlgAddCira0>' + format("Om een nieuw Intel® AMT-apparaat toe te voegen aan apparaatgroep \"{0}\" met CIRA, downloadt u de volgende scriptbestanden en gebruikt u <a href = 'http: //meshcommander.com' rel = 'noreferrer noopener' target = ' _blank '> MeshCommander </a> om het script uit te voeren om computers te configureren.", EscapeHtml(mesh.name)) + '<br /><br />';
+            x += '<div id=dlgAddCira0>' + format("Om een nieuw Intel&reg; AMT-apparaat toe te voegen aan apparaatgroep \"{0}\" met CIRA, downloadt u de volgende scriptbestanden en gebruikt u <a href='http://meshcommander.com' rel='noreferrer noopener' target='_blank'>MeshCommander</a> om het script uit te voeren om computers te configureren.", EscapeHtml(mesh.name)) + '<br /><br />';
             //x += addHtmlValue('Setup CIRA', '<a href="mescript.ashx?type=1&meshid=' + meshidx.substring(0, 16) + '" download>cira_setup.mescript</a>');
             x += addHtmlValue("CIRA instellen", '<a href="mescript.ashx?type=1&meshid=' + meshid + '" download>cira_setup.mescript</a>');
             x += addHtmlValue("Opruimen CIRA", '<a href="mescript.ashx?type=2" download>cira_clean.mescript</a>');
             x += '</div>';
 
             // Setup CIRA with user/pass authentication (Somewhat difficult)
-            x += '<div id=dlgAddCira1 style=display:none>' + format("v", EscapeHtml(mesh.name));
+            x += '<div id=dlgAddCira1 style=display:none>' + format("Om een nieuw Intel&reg; AMT-apparaat toe te voegen aan apparaatgroep \"{0}\" met CIRA, laadt u het volgende certificaat als vertrouwde root in Intel AMT", EscapeHtml(mesh.name));
             if (serverinfo.mpspass) { x += (" verifieer bij de server met deze gebruikersnaam en wachtwoord." + '<br /><br />'); } else { x += (" verifieer bij de server met deze gebruikersnaam en elk wachtwoord." + '<br /><br />'); }
             x += addHtmlValue("Hoofd certificaat", '<a href=\"' + "MeshServerRootCert.cer" + '\" download>' + "Hoofd certificaat bestand" + '</a>');
             x += addHtmlValue("Gebruikersnaam", '<input style=width:230px readonly value="' + meshidx.substring(0, 16) + '" />');
@@ -3230,14 +3231,14 @@
 
             // Setup CIRA with certificate authentication (Really difficult, only if TLS offload is not used)
             if ((features & 16) == 0) {
-                x += '<div id=dlgAddCira2 style=display:none>' + format("Om een nieuw Intel® AMT-apparaat toe te voegen aan apparaatgroep \"{0}\" met CIRA, laadt u het volgende certificaat als vertrouwde root in Intel AMT, verifieert u met een clientcertificaat met de volgende gemeenschappelijke naam en maakt u verbinding met de volgende server.", EscapeHtml(mesh.name)) + '<br /><br />';
+                x += '<div id=dlgAddCira2 style=display:none>' + format("Om een nieuw Intel&reg; AMT-apparaat toe te voegen aan apparaatgroep \"{0}\" met CIRA, laadt u het volgende certificaat als vertrouwde root in Intel AMT, verifieert u met een clientcertificaat met de volgende gemeenschappelijke naam en maakt u verbinding met de volgende server.", EscapeHtml(mesh.name)) + '<br /><br />';
                 x += addHtmlValue("Hoofd certificaat", '<a href="MeshServerRootCert.cer" download>' + "Hoofd certificaat bestand" + '</a>');
                 x += addHtmlValue("Organisatie", '<input style=width:230px readonly value="' + meshidx + '" />');
                 if (serverinfo != null) { x += addHtmlValue("MPS Server", '<input style=width:230px readonly value="' + EscapeHtml(serverinfo.mpsname) + ':' + serverinfo.mpsport + '" />'); }
                 x += '</div>';
             }
 
-            setDialogMode(2, "Toevoegen Intel® AMT CIRA apparaat", 2, null, x, 'fileDownload');
+            setDialogMode(2, "Toevoegen Intel&reg; AMT CIRA apparaat", 2, null, x, 'fileDownload');
             Q('dlgAddCiraSel').focus();
             return false;
         }
@@ -3440,16 +3441,16 @@
             deviceHeaderTotal = 0;
         }
 
-        var powerStateStrings = ['', '<span title=\"' + "Apparaat is ingeschakeld." + '\">' + "ingeschakeld" + '</span>', '<span title=\"' + "Apparaat bevindt zich in slaapstand (S1)." + '\">' + "Slapen" + '</span>', '<span title=\"' + "Apparaat bevindt zich in slaapstand (S2)." + '\">' + "Slapen" + '</span>', '<span title=\"' + "Apparaat bevindt zich in diepe slaapstand (S3)." + '\">' + "Slaapstand" + '</span>', '<span title=\"' + "Apparaat bevindt zich in de slaapstand (S4)." + '\">' + "Slaapstand" + '</span>', '<span title=\"' + "Apparaat is uitgeschakeld (S5)." + '\">' + "softwarematig uit" + '</span>', '<span title=\"' + "Apparaat is gedetecteerd, maar de stroomstatus kon niet worden verkregen." + '\">' + "Aanwezig" + '</span>'];
-        var powerStateStrings2 = ['', "Apparaat is ingeschakeld", "Apparaat bevindt zich in slaapstand (S1)", "Apparaat bevindt zich in slaapstand (S2)", "Apparaat bevindt zich in diepe slaapstand (S3)", "Apparaat is in slaapstand (S4)", "Apparaat is uitgeschakeld (S5)", "Apparaat is aanwezig, maar de stroomstatus kan niet worden bepaald"];
+        var powerStateStrings = ['', '<span title=\"' + "Apparaat is ingeschakeld." + '\">' + "ingeschakeld" + '</span>', '<span title=\"' + "Apparaat bevindt zich in slaapstand (S1)." + '\">' + "Slapen" + '</span>', '<span title=\"' + "Apparaat bevindt zich in slaapstand (S2)." + '\">' + "Slapen" + '</span>', '<span title=\"' + "Apparaat bevindt zich in diepe slaapstand (S3)." + '\">' + "Slaapstand" + '</span>', '<span title=\"' + "Apparaat bevindt zich in de slaapstand (S4)." + '\">' + "Slaapstand" + '</span>', '<span title=\"' + "Apparaat is uitgeschakeld (S5)." + '\">' + "softwarematig uit" + '</span>', '<span title=\"' + "Apparaat is gedetecteerd, maar de status kon niet worden verkregen." + '\">' + "Aanwezig" + '</span>'];
+        var powerStateStrings2 = ['', "Apparaat is ingeschakeld", "Apparaat bevindt zich in slaapstand (S1)", "Apparaat bevindt zich in slaapstand (S2)", "Apparaat bevindt zich in diepe slaapstand (S3)", "Apparaat is in slaapstand (S4)", "Apparaat is uitgeschakeld (S5)", "Apparaat is aanwezig, maar de status kan niet worden bepaald"];
         var powerColorTable = ['pwsTransparent', 'pwsBlack', 'pwsBlue', 'pwsBlue2', 'pwsLightblue', 'pwsBlueviolet', 'pwsDarkgreen', 'pwsLightseagreen', 'pwsLightseagreen2'];
         function NodeStateStr(node) {
             var states = [];
             if (node.state > 0 && node.state < powerStatetable.length) state.push(powerStatetable[node.state]);
             if (node.conn) {
                 if ((node.conn & 1) != 0) { states.push('<span title=\"' + "Mesh-agent is verbonden en klaar voor gebruik." + '\">' + "Agent" + '</span>'); }
-                if ((node.conn & 2) != 0) { states.push('<span title=\"' + "Intel® AMT CIRA is verbonden en klaar voor gebruik." + '\">' + "CIRA" + '</span>'); }
-                else if ((node.conn & 4) != 0) { states.push('<span title=\"' + "Intel® AMT is routeerbaar." + '\">' + "AMT" + '</span>'); }
+                if ((node.conn & 2) != 0) { states.push('<span title=\"' + "Intel&reg; AMT CIRA is verbonden en klaar voor gebruik." + '\">' + "CIRA" + '</span>'); }
+                else if ((node.conn & 4) != 0) { states.push('<span title=\"' + "Intel&reg; AMT is routeerbaar." + '\">' + "AMT" + '</span>'); }
                 if ((node.conn & 8) != 0) { states.push('<span title=\"' + "Mesh-agent is bereikbaar met een andere agent als relay." + '\">' + "Relay" + '</span>'); }
                 if ((node.conn & 16) != 0) { states.push('<span title=\"' + "MQTT verbinding met het apparaat is actief." + '\">' + "MQTT" + '</span>'); }
             }
@@ -4439,21 +4440,21 @@
                     if (node.intelamt.state == 2) {
                         if (node.intelamt.user == null || node.intelamt.user == '') {
                             if ((meshrights & 4) != 0) {
-                                str += ', <i style=color:#FF0000;cursor:pointer title=\"' + "Bewerk Intel® AMT-gegevens" + '\" onclick=editDeviceAmtSettings("' + node._id + '")>' + "Geen referenties" + '</i>';
+                                str += ', <i style=color:#FF0000;cursor:pointer title=\"' + "Bewerk Intel&reg; AMT-gegevens" + '\" onclick=editDeviceAmtSettings("' + node._id + '")>' + "Geen referenties" + '</i>';
                             } else {
                                 str += ', <i style=color:#FF0000>' + "Geen referenties" + '</i>';
                             }
                         }
                         str += ' ';
                         if ((meshrights & 4) != 0) {
-                            str += '<img src=images/link4.png height=10 width=10 title=\"' + "Bewerk Intel® AMT-gegevens" + '\" style=cursor:pointer onclick=editDeviceAmtSettings("' + node._id + '")>';
+                            str += '<img src=images/link4.png height=10 width=10 title=\"' + "Bewerk Intel&reg; AMT-gegevens" + '\" style=cursor:pointer onclick=editDeviceAmtSettings("' + node._id + '")>';
                         }
                     }
 
                     var meName = '<span title=\"Intel&reg; Manageability Engine\">' + "Intel&reg; ME" + '<span>';
                     if (typeof node.intelamt.sku == 'number') {
                         if ((node.intelamt.sku & 8) != 0) { meName = '<span title=\"' + "Intel&reg; Active Management Technology" + '\">' + "Intel&reg; AMT" + '<span>'; }
-                        else if ((node.intelamt.sku & 16) != 0) { meName = '<span title=\"' + "Standaard beheerbaarheid van Intel®" + '\">' + "Intel&reg; SM" + '<span>'; }
+                        else if ((node.intelamt.sku & 16) != 0) { meName = '<span title=\"' + "Standaard beheerbaarheid van Intel&reg;" + '\">' + "Intel&reg; SM" + '<span>'; }
                     }
                     x += addDeviceAttribute(meName, str);
                 }
@@ -4496,15 +4497,15 @@
                 }
 
                 // Active Users
-                if (node.users && node.conn && (node.users.length > 0) && (node.conn & 1)) { x += addDeviceAttribute(format("Actieve gebruiker(s){0}", ((node.users.length > 1)?'s':'')), node.users.join(', ')); }
+                if (node.users && node.conn && (node.users.length > 0) && (node.conn & 1)) { x += addDeviceAttribute(format("Actieve gebruikers{0}", ((node.users.length > 1)?'s':'')), node.users.join(', ')); }
 
                 // Attribute: Connectivity (Only show this if more than just the agent is connected).
                 var connectivity = node.conn;
                 if (connectivity && connectivity > 1) {
                     var cstate = [];
                     if ((node.conn & 1) != 0) cstate.push('<span title=\"' + "Mesh-agent is verbonden en klaar voor gebruik." + '\">' + "Mesh Agent" + '</span>');
-                    if ((node.conn & 2) != 0) cstate.push('<span title=\"' + "Intel® AMT CIRA is verbonden en klaar voor gebruik." + '\">' + "Intel&reg; AMT CIRA" + '</span>');
-                    else if ((node.conn & 4) != 0) cstate.push('<span title=\"' + "Intel® AMT is routeerbaar en klaar voor gebruik." + '\">' + "Intel&reg; AMT" + '</span>');
+                    if ((node.conn & 2) != 0) cstate.push('<span title=\"' + "Intel&reg; AMT CIRA is verbonden en klaar voor gebruik." + '\">' + "Intel&reg; AMT CIRA" + '</span>');
+                    else if ((node.conn & 4) != 0) cstate.push('<span title=\"' + "Intel&reg; AMT is routeerbaar en klaar voor gebruik." + '\">' + "Intel&reg; AMT" + '</span>');
                     if ((node.conn & 8) != 0) cstate.push('<span title=\"' + "Mesh-agent is bereikbaar met een andere agent als relay." + '\">' + "Mesh Relay" + '</span>');
                     if ((node.conn & 16) != 0) { cstate.push('<span title=\"' + "MQTT verbinding met het apparaat is actief." + '\">' + "MQTT" + '</span>'); }
                     x += addDeviceAttribute("connectiviteit", cstate.join(', '));
@@ -4521,7 +4522,7 @@
 
                 x += '</table><br />';
                 // Show action button, only show if we have permissions 4, 8, 64
-                if ((meshrights & 76) != 0) { x += '<input type=button value=\"' + "Akties" + '\" title=\"' + "Voer krachtacties uit op het apparaat" + '\" onclick=deviceActionFunction() />'; }
+                if ((meshrights & 76) != 0) { x += '<input type=button value=\"' + "Acties" + '\" title=\"' + "Voer krachtacties uit op het apparaat" + '\" onclick=deviceActionFunction() />'; }
                 x += '<input type=button value=\"' + "Notities" + '\" title=\"' + "Bekijk opmerkingen over dit apparaat" + '\" onclick=showNotes(' + ((meshrights & 128) == 0) + ',"' + encodeURIComponent(node._id) + '") />';
                 x += '<input type=button value=\"' + "Gebeurtenissenlog" + '\" title=\"' + "Schrijf een gebeurtenis voor dit apparaat" + '\" onclick=writeDeviceEvent("' + encodeURIComponent(node._id) + '") />';
                 //if ((connectivity & 1) && (meshrights & 8) && (node.agent.id < 5)) { x += '<input type=button value=Toast title="Display a text message of the remote device" onclick=deviceToastFunction() />';  }
@@ -4561,7 +4562,7 @@
                 var powerstate = PowerStateStr(node.state);
                 //if (node.state == 0) { powerstate = 'Unknown State'; }
                 if ((connectivity & 1) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title=\"' + "Agent verbonden" + '\">' + "Agent verbonden" + '</span>'; }
-                if ((connectivity & 2) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title=\"' + "Intel® AMT verbonden" + '\">' + "Intel® AMT verbonden" + '</span>'; }
+                if ((connectivity & 2) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title=\"' + "Intel&reg; AMT verbonden" + '\">' + "Intel&reg; AMT verbonden" + '</span>'; }
                 else if ((connectivity & 4) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title=\"' + "Intel&reg; AMT gedetecteerd" + '\">' + "Intel&reg; AMT gedetecteerd" + '</span>'; }
                 if ((connectivity & 16) != 0) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title=\"' + "MQTT verbonden" + '\">' + "MQTT-kanaal verbonden" + '</span>'; }
                 if ((powerstate == '') && node.lastconnect) { powerstate = '<span style=font-size:12px>' + "Laatst gezien" + '<br />' + printDateTime(new Date(node.lastconnect)) + '</span>'; }
@@ -4830,7 +4831,7 @@
             x += addHtmlValue("wachtwoord", '<input id=dp10password type=password style=width:230px autocomplete=nope maxlength=32 onchange=validateDeviceAmtSettings() onkeyup=validateDeviceAmtSettings() />');
             x += addHtmlValue("Veiligheid", '<select id=dp10tls style=width:236px><option value=0>' + "Geen TLS beveiliging" + '</option><option value=1>' + "TLS beveiliging vereist" + '</option></select>');
             if ((node.intelamt.user != null) && (node.intelamt.user != '')) { buttons = 7; }
-            setDialogMode(2, "Bewerk Intel® AMT-gegevens", buttons, editDeviceAmtSettingsEx, x, { node: node, func: func, arg: arg });
+            setDialogMode(2, "Bewerk Intel&reg; AMT-gegevens", buttons, editDeviceAmtSettingsEx, x, { node: node, func: func, arg: arg });
             if ((node.intelamt.user != null) && (node.intelamt.user != '')) { Q('dp10username').value = node.intelamt.user; } else { Q('dp10username').value = 'admin'; }
             Q('dp10tls').value = node.intelamt.tls;
             validateDeviceAmtSettings();
@@ -6914,7 +6915,7 @@
             if (e.shiftKey == true) { meshserver.send({ action: 'uploadagentcore', nodeid: consoleNode._id, type: 'default' }); } // Upload default core
             else if (e.altKey == true) { meshserver.send({ action: 'uploadagentcore', nodeid: consoleNode._id, type: 'clear' }); } // Clear the core
             else if (e.ctrlKey == true) { p15uploadCore2(); } // Upload the core from a file
-            else { setDialogMode(2, "Agentactie uitvoeren", 3, p15uploadCoreEx, addHtmlValue("Aktie", '<select id=d3coreMode style=width:230px><option value=1>' + "Upload standaard serverkern" + '</option><option value=2>' + "Maak de kern leeg" + '</option><option value=6>' + "Upload herstelkern" + '</option><option value=3>' + "Upload een kernbestand" + '</option><option value=4>' + "Softwarematig verbreken agent" + '</option><option value=5>' + "Harde ontkoppeling agent" + '</option></select>')); }
+            else { setDialogMode(2, "Agentactie uitvoeren", 3, p15uploadCoreEx, addHtmlValue("Actie", '<select id=d3coreMode style=width:230px><option value=1>' + "Upload standaard serverkern" + '</option><option value=2>' + "Maak de kern leeg" + '</option><option value=6>' + "Upload herstelkern" + '</option><option value=3>' + "Upload een kernbestand" + '</option><option value=4>' + "Softwarematig verbreken agent" + '</option><option value=5>' + "Harde ontkoppeling agent" + '</option></select>')); }
         }
 
         function p15uploadCoreEx() {
@@ -7009,7 +7010,7 @@
             } else if (type == 2) {
                 var x = "Typ een sleutelnaam, selecteer het vak OTP en druk op de knop op de YubiKey™." + '<br /><br />';
                 x += addHtmlValue("Sleutelnaam", '<input id=dp1keyname style=width:230px maxlength=20 autocomplete=off placeholder="' + "Mijn sleutel" + '" onkeyup=account_addhkeyValidate(event,1) />');
-                x += addHtmlValue("YubiKey™ OTP", '<input id=dp1key style=width:230px autocomplete=off onkeyup=account_addhkeyValidate(event,2) />');
+                x += addHtmlValue("YubiKey&trade; OTP", '<input id=dp1key style=width:230px autocomplete=off onkeyup=account_addhkeyValidate(event,2) />');
             }
             setDialogMode(2, "Beveiligingssleutel toevoegen", 3, account_addhkeyEx, x, type);
             Q('dp1keyname').focus();
@@ -7035,7 +7036,7 @@
             meshserver.send({ action: 'otp-hkey-get' });
         }
 
-        var loclist = { 'af': "Afrikaans", 'sq': "Albanees", 'ar': "Arabisch (Standaard)", 'ar-dz': "Arabisch (Algerije)", 'ar-bh': "Arabisch (Bahrein)", 'ar-eg': "Arabisch (Egypte)", 'ar-iq': "Arabisch (Irak)", 'ar-jo': "Arabisch (Jordanië)", 'ar-kw': "Arabisch (Koeweit)", 'ar-lb': "Arabisch (Libanon)", 'ar-ly': "Arabisch (Libië)", 'ar-ma': "Arabisch (Marokko)", 'ar-om': "Arabisch (Oman)", 'ar-qa': "Arabisch (Qatar)", 'ar-sa': "Arabisch (Saoedi-Arabië)", 'ar-sy': "Arabisch (Syrië)", 'ar-tn': "Arabisch (Tunesië)", 'ar-ae': "Arabisch (Verenigde Arabische Emiraten.)", 'ar-ye': "Arabisch (Jemen)", 'an': "Aragonese", 'hy': "Armeens", 'as': "Assamees", 'ast': "Asturische", 'az': "Azerbeidzjaanse", 'eu': "baskisch", 'bg': "Bulgaars", 'be': "Wit-Rusland", 'bn': "Bengalees", 'bs': "Bosnisch", 'br': "Breton", 'my': "Birmaans", 'ca': "Catalaans", 'ch': "Chamorro", 'ce': "Tsjetsjeense", 'zh': "Chinees", 'zh-hk': "Chinees (Hong Kong)", 'zh-cn': "Chinees (PRC)", 'zh-sg': "Chinees (Singapore)", 'zh-tw': "Chinees (Taiwan)", 'cv': "Chuvash", 'co': "Corsicaans", 'cr': "Cree", 'hr': "Kroatisch", 'cs': "Tsjechisch", 'da': "Deens", 'nl': "Nederlands (Standaard)", 'nl-be': "Nederlands (Belgisch)", 'en': "Engels", 'en-au': "Engels (Australië)", 'en-bz': "Engels (Belize)", 'en-ca': "Engels (Canada)", 'en-ie': "Engels (Ierland)", 'en-jm': "Engels (Jamaica)", 'en-nz': "Engels (Nieuw Zeeland)", 'en-ph': "Engels (Filippijnen)", 'en-za': "Engels (Zuid Africa)", 'en-tt': "Engels (Trinidad & Tobago)", 'en-gb': "Engels (Verenigd Koninkrijk)", 'en-us': "Engels (Verenigde staten van America)", 'en-zw': "Engels (Zimbabwe)", 'eo': "Esperanto", 'et': "Estlands", 'fo': "Faeroese", 'fa': "Perzisch (Perzisch)", 'fj': "Fijian", 'fi': "Fins", 'fr': "Frans (standaard)", 'fr-be': "Frans (België)", 'fr-ca': "Frans (Canada)", 'fr-fr': "Frans (Frankrijk)", 'fr-lu': "Frans (Luxemburg)", 'fr-mc': "Frans (Monaco)", 'fr-ch': "Frans (Zwitserland)", 'fy': "Fries", 'fur': " ", 'gd': "Gaelic (Schots)", 'gd-ie': "Gaelic (Iers)", 'gl': "Galacian", 'ka': "Georgisch", 'de': "Duits (standaard)", 'de-at': "Duits (Oostenrijk)", 'de-de': "Duits (duitsland)", 'de-li': "Duits (Liechtenstein)", 'de-lu': "Duits (Luxemburg)", 'de-ch': "Duits (Zwitserland)", 'el': "Grieks", 'gu': "Gujurati", 'ht': "Haïtiaanse", 'he': "Hebreeuws", 'hi': "Hindi", 'hu': "Hongaars", 'is': "IJslands", 'id': "Indonesisch", 'iu': "Inuktitut", 'ga': "Iers", 'it': "Italiaans (standaard)", 'it-ch': "Italiaans (Zwitserland)", 'ja': "Japans", 'kn': "Kannada", 'ks': "kasjmier", 'kk': "Kazachse", 'km': "Khmer", 'ky': "Kirgizisch", 'tlh': "Klingon", 'ko': "Koreaans", 'ko-kp': "Koreaans (Noord-Korea)", 'ko-kr': "Koreaans (Zuid-Korea)", 'la': "latijns", 'lv': "Lets", 'lt': "Litouws", 'lb': "Luxemburgs", 'mk': "FYRO Macedonisch", 'ms': "Maleis", 'ml': "Malayalam", 'mt': "Maltese", 'mi': "Maori", 'mr': "Marathi", 'mo': "Moldavisch ", 'nv': "Navajo", 'ng': "Ndonga", 'ne': "Nepalees", 'no': "Noors", 'nb': "Noors (Bokmal)", 'nn': "Noors (Nynorsk)", 'oc': "Occitaans", 'or': "Oriya", 'om': "Oromo", 'fa-ir': "Perzisch / Iran", 'pl': "Pools", 'pt': "Portugees", 'pt-br': "Portugees (Brazilië)", 'pa': "Punjabi", 'pa-in': "Punjabi (India)", 'pa-pk': "Punjabi (Pakistan)", 'qu': "Quechua", 'rm': "Rhetoromaans", 'ro': "Roemeense", 'ro-mo': "Roemeens (Moldavië)", 'ru': "Russisch", 'ru-mo': "Russisch (Moldavië)", 'sz': "Sami (Lapse)", 'sg': "Sango", 'sa': "Sanskriet", 'sc': "Sardijns", 'sd': "Sindhi", 'si': "Sinhalees", 'sr': "Servisch", 'sk': "Slowaaks", 'sl': "Sloveens", 'so': "Somani", 'sb': "Sorbisch", 'es': "Spaans", 'es-ar': "Spaans (Argentinië)", 'es-bo': "Spaans (Bolivia)", 'es-cl': "Spaans (Chili)", 'es-co': "Spaans (Colombia)", 'es-cr': "Spaans (Costa Rica)", 'es-do': "Spaans (Dominicaanse Republiek)", 'es-ec': "Spaans (Ecuador)", 'es-sv': "Spaans (El Salvador)", 'es-gt': "Spaans (Guatemala)", 'es-hn': "Spaans (Honduras)", 'es-mx': "Spaans (Mexico)", 'es-ni': "Spaans (Nicaragua)", 'es-pa': "Spaans (Panama)", 'es-py': "Spaans (Paraguay)", 'es-pe': "Spaans (Peru)", 'es-pr': "Spaans (Puerto Rico)", 'es-es': "Spaans (Spanje)", 'es-uy': "Spaans (Uruguay)", 'es-ve': "Spaans (Venezuela)", 'sx': "Sutu", 'sw': "Swahili", 'sv': "Zweeds", 'sv-fi': "Zweeds (Finland)", 'sv-sv': "Zweeds (Zweden)", 'ta': "Tamil", 'tt': "Tartaar", 'te': "Teluga", 'th': "Thais", 'tig': "Tigre", 'ts': "Tsonga", 'tn': "Tswana", 'tr': "Turks", 'tk': "Turkmeens", 'uk': "Oekraïens", 'hsb': "Sorbisch", 'ur': "Urdu", 've': "Venda", 'vi': "Vietnamees", 'vo': "Volapuk", 'wa': "Waals", 'cy': "Wels", 'xh': "Xhosa", 'ji': "Jiddisch", 'zu': "Zoeloe" };
+        var loclist = { 'af': "Afrikaans", 'sq': "Albanees", 'ar': "Arabisch (Standaard)", 'ar-dz': "Arabisch (Algerije)", 'ar-bh': "Arabisch (Bahrein)", 'ar-eg': "Arabisch (Egypte)", 'ar-iq': "Arabisch (Irak)", 'ar-jo': "Arabisch (Jordanië)", 'ar-kw': "Arabisch (Koeweit)", 'ar-lb': "Arabisch (Libanon)", 'ar-ly': "Arabisch (Libië)", 'ar-ma': "Arabisch (Marokko)", 'ar-om': "Arabisch (Oman)", 'ar-qa': "Arabisch (Qatar)", 'ar-sa': "Arabisch (Saoedi-Arabië)", 'ar-sy': "Arabisch (Syrië)", 'ar-tn': "Arabisch (Tunesië)", 'ar-ae': "Arabisch (Verenigde Arabische Emiraten.)", 'ar-ye': "Arabisch (Jemen)", 'an': "Aragonese", 'hy': "Armeens", 'as': "Assamees", 'ast': "Asturische", 'az': "Azerbeidzjaanse", 'eu': "baskisch", 'bg': "Bulgaars", 'be': "Wit-Rusland", 'bn': "Bengalees", 'bs': "Bosnisch", 'br': "Breton", 'my': "Birmaans", 'ca': "Catalaans", 'ch': "Chamorro", 'ce': "Tsjetsjeense", 'zh': "Chinees", 'zh-hk': "Chinees (Hong Kong)", 'zh-cn': "Chinees (PRC)", 'zh-sg': "Chinees (Singapore)", 'zh-tw': "Chinees (Taiwan)", 'cv': "Chuvash", 'co': "Corsicaans", 'cr': "Cree", 'hr': "Kroatisch", 'cs': "Tsjechisch", 'da': "Deens", 'nl': "Nederlands (Standaard)", 'nl-be': "Nederlands (Belgisch)", 'en': "Engels", 'en-au': "Engels (Australië)", 'en-bz': "Engels (Belize)", 'en-ca': "Engels (Canada)", 'en-ie': "Engels (Ierland)", 'en-jm': "Engels (Jamaica)", 'en-nz': "Engels (Nieuw Zeeland)", 'en-ph': "Engels (Filippijnen)", 'en-za': "Engels (Zuid Africa)", 'en-tt': "Engels (Trinidad & Tobago)", 'en-gb': "Engels (Verenigd Koninkrijk)", 'en-us': "Engels (Verenigde staten van America)", 'en-zw': "Engels (Zimbabwe)", 'eo': "Esperanto", 'et': "Estlands", 'fo': "Faeroese", 'fa': "Perzisch (Perzisch)", 'fj': "Fijian", 'fi': "Fins", 'fr': "Frans (standaard)", 'fr-be': "Frans (België)", 'fr-ca': "Frans (Canada)", 'fr-fr': "Frans (Frankrijk)", 'fr-lu': "Frans (Luxemburg)", 'fr-mc': "Frans (Monaco)", 'fr-ch': "Frans (Zwitserland)", 'fy': "Fries", 'fur': "Friulian", 'gd': "Gaelic (Schots)", 'gd-ie': "Gaelic (Iers)", 'gl': "Galacian", 'ka': "Georgisch", 'de': "Duits (standaard)", 'de-at': "Duits (Oostenrijk)", 'de-de': "Duits (duitsland)", 'de-li': "Duits (Liechtenstein)", 'de-lu': "Duits (Luxemburg)", 'de-ch': "Duits (Zwitserland)", 'el': "Grieks", 'gu': "Gujurati", 'ht': "Haïtiaanse", 'he': "Hebreeuws", 'hi': "Hindi", 'hu': "Hongaars", 'is': "IJslands", 'id': "Indonesisch", 'iu': "Inuktitut", 'ga': "Iers", 'it': "Italiaans (standaard)", 'it-ch': "Italiaans (Zwitserland)", 'ja': "Japans", 'kn': "Kannada", 'ks': "kasjmier", 'kk': "Kazachse", 'km': "Khmer", 'ky': "Kirgizisch", 'tlh': "Klingon", 'ko': "Koreaans", 'ko-kp': "Koreaans (Noord-Korea)", 'ko-kr': "Koreaans (Zuid-Korea)", 'la': "latijns", 'lv': "Lets", 'lt': "Litouws", 'lb': "Luxemburgs", 'mk': "FYRO Macedonisch", 'ms': "Maleis", 'ml': "Malayalam", 'mt': "Maltese", 'mi': "Maori", 'mr': "Marathi", 'mo': "Moldavisch ", 'nv': "Navajo", 'ng': "Ndonga", 'ne': "Nepalees", 'no': "Noors", 'nb': "Noors (Bokmal)", 'nn': "Noors (Nynorsk)", 'oc': "Occitaans", 'or': "Oriya", 'om': "Oromo", 'fa-ir': "Perzisch / Iran", 'pl': "Pools", 'pt': "Portugees", 'pt-br': "Portugees (Brazilië)", 'pa': "Punjabi", 'pa-in': "Punjabi (India)", 'pa-pk': "Punjabi (Pakistan)", 'qu': "Quechua", 'rm': "Rhetoromaans", 'ro': "Roemeense", 'ro-mo': "Roemeens (Moldavië)", 'ru': "Russisch", 'ru-mo': "Russisch (Moldavië)", 'sz': "Sami (Lapse)", 'sg': "Sango", 'sa': "Sanskriet", 'sc': "Sardijns", 'sd': "Sindhi", 'si': "Sinhalees", 'sr': "Servisch", 'sk': "Slowaaks", 'sl': "Sloveens", 'so': "Somani", 'sb': "Sorbisch", 'es': "Spaans", 'es-ar': "Spaans (Argentinië)", 'es-bo': "Spaans (Bolivia)", 'es-cl': "Spaans (Chili)", 'es-co': "Spaans (Colombia)", 'es-cr': "Spaans (Costa Rica)", 'es-do': "Spaans (Dominicaanse Republiek)", 'es-ec': "Spaans (Ecuador)", 'es-sv': "Spaans (El Salvador)", 'es-gt': "Spaans (Guatemala)", 'es-hn': "Spaans (Honduras)", 'es-mx': "Spaans (Mexico)", 'es-ni': "Spaans (Nicaragua)", 'es-pa': "Spaans (Panama)", 'es-py': "Spaans (Paraguay)", 'es-pe': "Spaans (Peru)", 'es-pr': "Spaans (Puerto Rico)", 'es-es': "Spaans (Spanje)", 'es-uy': "Spaans (Uruguay)", 'es-ve': "Spaans (Venezuela)", 'sx': "Sutu", 'sw': "Swahili", 'sv': "Zweeds", 'sv-fi': "Zweeds (Finland)", 'sv-sv': "Zweeds (Zweden)", 'ta': "Tamil", 'tt': "Tartaar", 'te': "Teluga", 'th': "Thais", 'tig': "Tigre", 'ts': "Tsonga", 'tn': "Tswana", 'tr': "Turks", 'tk': "Turkmeens", 'uk': "Oekraïens", 'hsb': "Sorbisch", 'ur': "Urdu", 've': "Venda", 'vi': "Vietnamees", 'vo': "Volapuk", 'wa': "Waals", 'cy': "Wels", 'xh': "Xhosa", 'ji': "Jiddisch", 'zu': "Zoeloe" };
         function account_showLocalizationSettings() {
             if (xxdialogMode) return false;
             var n = getstore('loctag', 0), y = '';
@@ -7090,7 +7091,7 @@
             x += '<div><label><input id=p2notifyGroupName type=checkbox />' + "Display Device Group Name" + '</label></div>';
             x += '<div><label><input id=p2notifyIntelDeviceConnect type=checkbox />' + "Apparaat verbindingen." + '</label></div>';
             x += '<div><label><input id=p2notifyIntelDeviceDisconnect type=checkbox />' + "Apparaat verbroken." + '</label></div>';
-            x += '<div><label><input id=p2notifyIntelAmtKvmActions type=checkbox />' + "Intel® AMT desktop- en seriële gebeurtenissen." + '</label></div>';
+            x += '<div><label><input id=p2notifyIntelAmtKvmActions type=checkbox />' + "Intel&reg; AMT desktop- en seriële gebeurtenissen." + '</label></div>';
             setDialogMode(2, "meldingsinstellingen", 3, account_showAccountNotifySettingsEx, x);
             var n = getstore('notifications', 0);
             Q('p2notifyPlayNotifySound').checked = (n & 1);
@@ -7430,8 +7431,8 @@
 
             if ((meshrights & 4) != 0) {
                 if (currentMesh.mtype == 1) {
-                    x += '<a href=# onclick=\'return addCiraDeviceToMesh(\"' + currentMesh._id + '\")\' style=cursor:pointer;margin-right:10px title=\"' + "Voeg een nieuwe Intel® AMT computer toe welke zich op het internet bevind." + '\"><img src=images/icon-installmesh.png border=0 height=12 width=12> ' + "Installeer CIRA" + '</a>';
-                    x += '<a href=# onclick=\'return addDeviceToMesh(\"' + currentMesh._id + '\")\' style=cursor:pointer;margin-right:10px title=\"' + "Voeg een nieuwe Intel® AMT computer toe welke zich op het lokale netwerk bevind." + '\"><img src=images/icon-installmesh.png border=0 height=12 width=12> ' + "Installeer lokaal" + '</a>';
+                    x += '<a href=# onclick=\'return addCiraDeviceToMesh(\"' + currentMesh._id + '\")\' style=cursor:pointer;margin-right:10px title=\"' + "Voeg een nieuwe Intel&reg; AMT computer toe welke zich op het internet bevind." + '\"><img src=images/icon-installmesh.png border=0 height=12 width=12> ' + "Installeer CIRA" + '</a>';
+                    x += '<a href=# onclick=\'return addDeviceToMesh(\"' + currentMesh._id + '\")\' style=cursor:pointer;margin-right:10px title=\"' + "Voeg een nieuwe Intel&reg; AMT computer toe welke zich op het lokale netwerk bevind." + '\"><img src=images/icon-installmesh.png border=0 height=12 width=12> ' + "Installeer lokaal" + '</a>';
                     if (currentMesh.amt && (currentMesh.amt.type == 2)) { // CCM activation
                         x += '<a href=# onclick=\'return showCcmActivation(\"' + currentMesh._id + '\")\' style=cursor:pointer;margin-right:10px title=\"' + "Voer Intel AMT client control mode (CCM) activering uit." + '\"><img src=images/icon-installmesh.png border=0 height=12 width=12> ' + "Activatie" + '</a>';
                     } else if (currentMesh.amt && (currentMesh.amt.type == 3) && ((features & 0x00100000) != 0)) { // ACM activation
@@ -7483,7 +7484,7 @@
                 x += addHtmlValue("Typen", '<select id=dp20amtpolicy style=width:230px onchange=p20editMeshAmtChange()><option value=0>' + "Geen beleid" + '</option><option value=1>' + "Deactiveer Client Control Mode (CCM)" + '</option><option value=2>' + "Simple Client Control Mode (CCM)" + '</option>' + acmoption + '</select>');
             }
             x += '<div id=dp20amtpolicydiv></div>';
-            setDialogMode(2, "Intel® AMT beleid", 3, p20editMeshAmtEx, x);
+            setDialogMode(2, "Intel&reg; AMT beleid", 3, p20editMeshAmtEx, x);
             if (currentMesh.amt) { Q('dp20amtpolicy').value = currentMesh.amt.type; }
             p20editMeshAmtChange();
 
@@ -7502,12 +7503,12 @@
             if (ptype >= 2) {
                 x = addHtmlValue("Wachtwoord*", '<input id=dp20amtpolicypass type=password style=width:230px maxlength=32 onchange=dp20amtValidatePolicy() onkeyup=dp20amtValidatePolicy() autocomplete=off />')
                 x += addHtmlValue("Wachtwoord*", '<input id=dp20amtpolicypass2 type=password style=width:230px maxlength=32 onchange=dp20amtValidatePolicy() onkeyup=dp20amtValidatePolicy() autocomplete=off />')
-                if ((ptype == 2) && (currentMesh.mtype == 2)) { x += addHtmlValue("Wachtwoord komt niet overeen", '<select id=dp20amtbadpass style=width:230px><option value=0>' + "Doe niets" + '</option><option value=1>' + "Heractiveer Intel® AMT" + '</option></select>'); }
+                if ((ptype == 2) && (currentMesh.mtype == 2)) { x += addHtmlValue("Wachtwoord komt niet overeen", '<select id=dp20amtbadpass style=width:230px><option value=0>' + "Doe niets" + '</option><option value=1>' + "Heractiveer Intel&reg; AMT" + '</option></select>'); }
                 if ((features & 0x400) == 0) {
                     if (ptype == 2) {
-                        x += addHtmlValue('<span title="' + "Gebruiker geïnitieerde externe toegang" + '">' + "CIRA" + '</span>', '<select id=dp20amtcira style=width:230px><option value=0>' + "Configureer niet" + '</option><option value=1>' + "Maak geen verbinding met de server" + '</option><option value=2>' + "Verbinden met de server" + '</option></select>');
+                        x += addHtmlValue('<span title="' + "Gebruiker geïnitieerde externe toegang" + '">' + "CIRA" + '</span>', '<select id=dp20amtcira style=width:230px><option value=0>' + "Niet configureren" + '</option><option value=1>' + "Maak geen verbinding met de server" + '</option><option value=2>' + "Verbinden met de server" + '</option></select>');
                     } else {
-                        x += addHtmlValue('<span title="' + "Gebruiker geïnitieerde externe toegang" + '">' + "CIRA" + '</span>', '<select id=dp20amtcira style=width:230px><option value=0>' + "Configureer niet" + '</option><option value=2>' + "Verbinden met de server" + '</option></select>');
+                        x += addHtmlValue('<span title="' + "Gebruiker geïnitieerde externe toegang" + '">' + "CIRA" + '</span>', '<select id=dp20amtcira style=width:230px><option value=0>' + "Niet configureren" + '</option><option value=2>' + "Verbinden met de server" + '</option></select>');
                     }
                 }
                 x += '<br/><span style="font-size:10px">' + "* Laat leeg om een willekeurig wachtwoord toe te wijzen aan elk apparaat." + '</span><br/>';
@@ -7588,14 +7589,14 @@
             var x = '', consent = (currentMesh.consent) ? currentMesh.consent : 0;
             x += '<div style="width:100%;border-bottom:1px solid gray;margin-bottom:5px"><b>' + "Bureaublad" + '</b></div>';
             x += '<div><label><input type=checkbox id=d20flag1 ' + ((consent & 0x0001) ? 'checked' : '') + '>' + "Gebruiker informeren" + '</label></div>';
-            x += '<div><label><input type=checkbox id=d20flag2 ' + ((consent & 0x0008) ? 'checked' : '') + '>' + "Vragen gebruikerstoestemming" + '</label></div>';
+            x += '<div><label><input type=checkbox id=d20flag2 ' + ((consent & 0x0008) ? 'checked' : '') + '>' + "Vraag gebruikerstoestemming" + '</label></div>';
             x += '<div><label><input type=checkbox id=d20flag7 ' + ((consent & 0x0040) ? 'checked' : '') + '>' + "Toon verbindingswerkbalk" + '</label></div>';
             x += '<div style="width:100%;border-bottom:1px solid gray;margin-bottom:5px;margin-top:8px"><b>' + "Terminal" + '</b></div>';
             x += '<div><label><input type=checkbox id=d20flag3 ' + ((consent & 0x0002) ? 'checked' : '') + '>' + "Gebruiker informeren" + '</label></div>';
-            x += '<div><label><input type=checkbox id=d20flag4 ' + ((consent & 0x0010) ? 'checked' : '') + '>' + "Vragen gebruikerstoestemming" + '</label></div>';
+            x += '<div><label><input type=checkbox id=d20flag4 ' + ((consent & 0x0010) ? 'checked' : '') + '>' + "Vraag gebruikerstoestemming" + '</label></div>';
             x += '<div style="width:100%;border-bottom:1px solid gray;margin-bottom:5px;margin-top:8px"><b>' + "Bestanden" + '</b></div>';
             x += '<div><label><input type=checkbox id=d20flag5 ' + ((consent & 0x0004) ? 'checked' : '') + '>' + "Gebruiker informeren" + '</label></div>';
-            x += '<div><label><input type=checkbox id=d20flag6 ' + ((consent & 0x0020) ? 'checked' : '') + '>' + "Vragen gebruikerstoestemming" + '</label></div>';
+            x += '<div><label><input type=checkbox id=d20flag6 ' + ((consent & 0x0020) ? 'checked' : '') + '>' + "Vraag gebruikerstoestemming" + '</label></div>';
             setDialogMode(2, "Toestemming gebruikersgroep bewerken", 3, p20editmeshconsentEx, x);
             if (serverinfo.consent) {
                 if (serverinfo.consent & 0x0001) { Q('d20flag1').checked = true; }
@@ -7647,7 +7648,7 @@
             var x = '';
             if (userid == null) {
                 x += "Gebruikers toestaan deze apparaatgroep en apparaten in deze groep te beheren.";
-                if (features & 0x00080000) { x += " Users need to login to this server once before they can be added to a device group." }
+                if (features & 0x00080000) { x += " Gebruikers moeten inloggen bij de server voordat ze kunnen worden toegevoegd aan een apparaatgroep." }
                 x += '<br /><br /><div style=\'position:relative\'>';
                 x += addHtmlValue("Gebruikersnamen", '<input id=dp20username style=width:230px maxlength=32 onchange=p20validateAddMeshUserDialog() onkeyup=p20validateAddMeshUserDialog() placeholder="user1, user2, user3" />');
                 x += '<div id=dp20usersuggest class=suggestionBox style=\'top:30px;left:130px;display:none\'></div>';
@@ -7837,7 +7838,7 @@
                 if (users && users[xuserid]) { uname = users[xuserid].name; }
                 if (userinfo._id == xuserid) { uname = userinfo.name; }
                 var buttons = 1, x = addHtmlValue("Gebruikersnaam", EscapeHtml(decodeURIComponent(uname)));
-                if (xuserid.split('/')[2] != uname) { x += addHtmlValue("gebruikers-ID", EscapeHtml(xuserid.split('/')[2])); }
+                if (xuserid.split('/')[2] != uname) { x += addHtmlValue("gebruikersID", EscapeHtml(xuserid.split('/')[2])); }
 
                 x += addHtmlValue("machtigingen", r.join(", "));
                 if (((userinfo._id) != xuserid) && (cmeshrights == 0xFFFFFFFF || (((cmeshrights & 2) != 0) && (meshrights != 0xFFFFFFFF)))) buttons += 4;
@@ -8385,7 +8386,7 @@
             if (mode == 1) { eventList = currentDeviceEvents; }
             if (mode == 2) { eventList = events; }
             if (mode == 3) { eventList = currentUserEvents; }
-            csv = "time, type, action, user, message" + '\r\n';
+            csv = "tijd, type, actie, gebruiker, bericht" + '\r\n';
             for (var i in eventList) { csv += '\"' + eventList[i].time + '\",\"' + eventList[i].etype + '\",\"' + ((eventList[i].action != null) ? eventList[i].action : '') + '\",\"' + ((eventList[i].username != null) ? eventList[i].username : '') + '\",\"' + ((eventList[i].msg != null) ? eventList[i].msg : '') + '\"\r\n'; }
             saveAs(new Blob([csv], { type: 'application/octet-stream' }), "eventslist.csv");
             return false;
@@ -8464,7 +8465,7 @@
                 }
             }
             x += '</table>';
-            if (hiddenUsers == 1) { x += '<br />' + "1 gebruiker niet getoond, gebruik de zoekfunctie om gebruikers te vinden" + '<br />'; }
+            if (hiddenUsers == 1) { x += '<br />' + "1 gebruiker niet getoond, gebruik de zoekfunctie om gebruikers te vinden..." + '<br />'; }
             else if (hiddenUsers > 1) { x += '<br />' + format("{0} meer gebruikers niet getoond, gebruik zoekvak om gebruikers te zoeken ...", hiddenUsers) + '<br />'; }
             if (maxUsers == 100) { x += '<br />' + "Geen gebruikers gevonden" + '<br />'; }
             QH('p3users', x);
@@ -8826,7 +8827,7 @@
             var x = '<div style=min-height:80px><table style=width:100%>';
             var email = user.email?EscapeHtml(user.email):'<i>' + "Niet ingesteld" + '</i>', everify = '';
             if (serverinfo.emailcheck) { everify = ((user.emailVerified == true) ? '<b style=color:green;cursor:pointer title=\"' + "Email is geverifieerd" + '\">&#x2713</b> ' : '<b style=color:red;cursor:pointer title=\"' + "Email is niet geverifieerd" + '\">&#x2717;</b> '); }
-            if (user.name.toLowerCase() != user._id.split('/')[2]) { x += addDeviceAttribute("gebruikers-ID", user._id.split('/')[2]); }
+            if (user.name.toLowerCase() != user._id.split('/')[2]) { x += addDeviceAttribute("gebruikersID", user._id.split('/')[2]); }
             if (((features & 0x200000) == 0) && ((user.siteadmin != 0xFFFFFFFF) || (userinfo.siteadmin == 0xFFFFFFFF))) { // If we are not site admin, we can't change a admin email.
                 x += addDeviceAttribute("Email", everify + '<a href=# style=cursor:pointer onclick=p30showUserEmailChangeDialog(event,\"' + userid + '\")>' + email + '</a> <a href=# style=cursor:pointer onclick=\'return doemail(event,\"' + user.email + '\")\'><img class=hoverButton src="images/link1.png" /></a>');
             } else {
@@ -9482,7 +9483,7 @@
         }
 
         function p40downloadEvents() {
-            var csv = "time, conn.agent, conn.users, conn.usersessions, conn.relaysession, conn.intelamt, mem.external, mem.heapused, mem.heaptotal, mem.rss" + '\r\n';
+            var csv = "tijd, conn.agent, conn.gebruikers, conn.gebruikerssessies, conn.relaysessie, conn.intelamt, mem.extern, mem.heapused, mem.heaptotaal, mem.rss" + '\r\n';
             for (var i = 0; i < serverTimelineStats.length; i++) {
                 if (serverTimelineStats[i].conn && serverTimelineStats[i].mem) {
                     csv += new Date(serverTimelineStats[i].time) + ', ' + serverTimelineStats[i].conn.ca + ', ' + serverTimelineStats[i].conn.cu + ', ' + serverTimelineStats[i].conn.us + ', ' + serverTimelineStats[i].conn.rs + ', ' + (serverTimelineStats[i].conn.am ? serverTimelineStats[i].conn.am : '') + ', ' + serverTimelineStats[i].mem.external + ', ' + serverTimelineStats[i].mem.heapUsed + ', ' + serverTimelineStats[i].mem.heapTotal + ', ' + serverTimelineStats[i].mem.rss + '\r\n';
@@ -9539,7 +9540,7 @@
         }
 
         function p41downloadServerTrace() {
-            var csv = "time, source, message" + '\r\n';
+            var csv = "tijd, bron, bericht" + '\r\n';
             for (var i in serverTrace) { csv += '\"' + new Date(serverTrace[i].time).toLocaleTimeString() + '\",\"' + serverTrace[i].source + '\",\"' + serverTrace[i].args.join(', ') + '\"\r\n'; }
             saveAs(new Blob([csv], { type: 'application/octet-stream' }), "servertrace.csv");
             return false;
@@ -9599,11 +9600,10 @@
 
         function goBack() {
             setSessionActivity();
-            if (xxdialogMode) return;
+            if (xxdialogMode || (goBackStack.length == 0)) return;
             if (fullscreen) { deskToggleFull(); }
-            if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
-            if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
-            if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
+            go(goBackStack.pop());
+            goBackStack.pop();
         }
 
         function go(x, event) {
@@ -9622,8 +9622,15 @@
                 return;
             }
 
+            // If we are going to the same place, do nothing.
             if (xxcurrentView == x) return;
 
+            // Set the goback stack, if going to top-level view, clear the stack.
+            if ((xxcurrentView < 0) || (x < 10)) { goBackStack = []; } else {
+                // Do not push into the back stack if we are changing tabs at the same level.
+                if (Math.floor(xxcurrentView / 10) != Math.floor(x / 10)) { goBackStack.push(xxcurrentView); }
+            }
+
             // Edit this line when adding a new screen
             for (var i = 0; i < 44; i++) { QV('p' + i, i == x); }
             xxcurrentView = x;
@@ -9646,29 +9653,34 @@
             var mainMenuActiveClass = (x < 9 ? 'fullselect' : 'semiselect');
             var leftMenuActiveClass = (((x < 9) || (x == 115) || (x == 40) || (x == 41) || (x == 42)) ? 'lbbuttonsel2' : 'lbbuttonsel');
 
+            var backView = 0;
+            if (goBackStack.length > 0) { backView = goBackStack[goBackStack.length - 1]; }
+
             // My Devices
-            if (x == 1 || (x >= 10 && x < 20)) QC('MainMenuMyDevices').add(mainMenuActiveClass);
-            if (x == 1 || (x >= 10 && x < 20)) QC('LeftMenuMyDevices').add(leftMenuActiveClass);
-
+            if (x == 1 || (backView == 1) || ((backView == 0) && (x >= 10 && x < 20))) {
+                QC('MainMenuMyDevices').add(mainMenuActiveClass);
+                QC('LeftMenuMyDevices').add(leftMenuActiveClass);
+            } else if (x == 2 || (backView == 2) || ((backView == 0) && (x >= 20 && x < 30))) {
                 // My Account
-            if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
-            if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
+                QC('MainMenuMyAccount').add(mainMenuActiveClass);
+                QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+            } else if (x == 3) {
                 // My Events
-            if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
-            if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
+                QC('MainMenuMyEvents').add(mainMenuActiveClass);
+                QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+            } else if (x == 4 || (x >= 30 && x < 40)) {
                 // My Users
-            if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
-            if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
+                QC('MainMenuMyUsers').add(mainMenuActiveClass);
+                QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+            } else if (x == 5) {
                 // My Files
-            if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
-            if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
+                QC('MainMenuMyFiles').add(mainMenuActiveClass);
+                QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+            } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
                 // My Server
-            if ((x == 6) || (x == 115)) QC('MainMenuMyServer').add(mainMenuActiveClass);
-            if ((x == 6) || (x == 115) || (x == 40) || (x == 41) || (x == 42) || (x == 43)) QC('LeftMenuMyServer').add(leftMenuActiveClass);
+                QC('MainMenuMyServer').add(mainMenuActiveClass);
+                QC('LeftMenuMyServer').add(leftMenuActiveClass);
+            }
             QV('ServerPlugins', pluginHandler != null);
 
             // column_l max-height

views/translations/default_pt.handlebars

@@ -1101,6 +1101,7 @@
         var pluginHandler = null;
         if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
         var installedPluginList = null;
+        var goBackStack = [];
 
         // Console Message Display Timers
         var p11DeskConsoleMsgTimer = null;
@@ -2718,7 +2719,7 @@
                             deviceHeaderSet();
                             var extra = '';
                             if (view == 2) { r += '<tr><td colspan=5>'; }
-                            if (meshes[node.meshid].mtype == 1) { extra = '<span class=devHeaderx>' + "Intelreg; " + '</span>'; }
+                            if (meshes[node.meshid].mtype == 1) { extra = '<span class=devHeaderx>' + ", Intel&reg; AMT only" + '</span>'; }
                             if ((view == 1) && (current != null)) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } if (r != '') { r += '</tr></table>'; } }
                             if (view == 2) { r += '<div>'; }
                             r += '<div class=DevSt style=width:100%;padding-top:4px><span style=float:right>';
@@ -3237,7 +3238,7 @@
                 x += '</div>';
             }
 
-            setDialogMode(2, "Adicione Intelreg; ", 2, null, x, 'fileDownload');
+            setDialogMode(2, "Adicione Intelreg; AMT", 2, null, x, 'fileDownload');
             Q('dlgAddCiraSel').focus();
             return false;
         }
@@ -9599,11 +9600,10 @@
 
         function goBack() {
             setSessionActivity();
-            if (xxdialogMode) return;
+            if (xxdialogMode || (goBackStack.length == 0)) return;
             if (fullscreen) { deskToggleFull(); }
-            if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
-            if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
-            if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
+            go(goBackStack.pop());
+            goBackStack.pop();
         }
 
         function go(x, event) {
@@ -9622,8 +9622,15 @@
                 return;
             }
 
+            // If we are going to the same place, do nothing.
             if (xxcurrentView == x) return;
 
+            // Set the goback stack, if going to top-level view, clear the stack.
+            if ((xxcurrentView < 0) || (x < 10)) { goBackStack = []; } else {
+                // Do not push into the back stack if we are changing tabs at the same level.
+                if (Math.floor(xxcurrentView / 10) != Math.floor(x / 10)) { goBackStack.push(xxcurrentView); }
+            }
+
             // Edit this line when adding a new screen
             for (var i = 0; i < 44; i++) { QV('p' + i, i == x); }
             xxcurrentView = x;
@@ -9646,29 +9653,34 @@
             var mainMenuActiveClass = (x < 9 ? 'fullselect' : 'semiselect');
             var leftMenuActiveClass = (((x < 9) || (x == 115) || (x == 40) || (x == 41) || (x == 42)) ? 'lbbuttonsel2' : 'lbbuttonsel');
 
+            var backView = 0;
+            if (goBackStack.length > 0) { backView = goBackStack[goBackStack.length - 1]; }
+
             // My Devices
-            if (x == 1 || (x >= 10 && x < 20)) QC('MainMenuMyDevices').add(mainMenuActiveClass);
-            if (x == 1 || (x >= 10 && x < 20)) QC('LeftMenuMyDevices').add(leftMenuActiveClass);
-
+            if (x == 1 || (backView == 1) || ((backView == 0) && (x >= 10 && x < 20))) {
+                QC('MainMenuMyDevices').add(mainMenuActiveClass);
+                QC('LeftMenuMyDevices').add(leftMenuActiveClass);
+            } else if (x == 2 || (backView == 2) || ((backView == 0) && (x >= 20 && x < 30))) {
                 // My Account
-            if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
-            if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
+                QC('MainMenuMyAccount').add(mainMenuActiveClass);
+                QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+            } else if (x == 3) {
                 // My Events
-            if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
-            if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
+                QC('MainMenuMyEvents').add(mainMenuActiveClass);
+                QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+            } else if (x == 4 || (x >= 30 && x < 40)) {
                 // My Users
-            if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
-            if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
+                QC('MainMenuMyUsers').add(mainMenuActiveClass);
+                QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+            } else if (x == 5) {
                 // My Files
-            if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
-            if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
+                QC('MainMenuMyFiles').add(mainMenuActiveClass);
+                QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+            } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
                 // My Server
-            if ((x == 6) || (x == 115)) QC('MainMenuMyServer').add(mainMenuActiveClass);
-            if ((x == 6) || (x == 115) || (x == 40) || (x == 41) || (x == 42) || (x == 43)) QC('LeftMenuMyServer').add(leftMenuActiveClass);
+                QC('MainMenuMyServer').add(mainMenuActiveClass);
+                QC('LeftMenuMyServer').add(leftMenuActiveClass);
+            }
             QV('ServerPlugins', pluginHandler != null);
 
             // column_l max-height

views/translations/login-mobile_nl.handlebars

@@ -274,8 +274,8 @@
 
         // Display the right server message
         var messageid = parseInt('{{{messageid}}}');
-        var okmessages = ['', "Wacht even, reset e-mail verzonden."];
-        var failmessages = ["Kan geen account maken.", "Gebruikersaccount limiet bereikt.", "Bestaand account met dit e-mailadres.", "Ongeldig token voor het maken van een account.", "Gebruikersnaam bestaal al.", "Wachtwoord geweigerd, gebruik een ander.", "Ongeldige e-mail.", "Gebruikersaccount niet gevonden", "Ongeldig token, probeer het opnieuw.", "Kan geen e-mail verzenden.", "Gebruikersaccount vergrendeld", "Toegang geweigerd.", "Inloggen mislukt, controleer gebruikersnaam en wachtwoord.", "Wachtwoordwijziging aangevraagd.", "IP-adres geblokkeerd, probeer het later opnieuw."];
+        var okmessages = ['', "even wachten, reset e-mail verzonden."];
+        var failmessages = ["Kan geen account maken.", "Gebruikersaccount limiet bereikt.", "Bestaand account met dit e-mailadres.", "Ongeldig token voor het maken van een account.", "Gebruikersnaam bestaat al.", "Wachtwoord geweigerd, gebruik een ander.", "Ongeldige e-mail.", "Gebruikersaccount niet gevonden", "Ongeldig token, probeer het opnieuw.", "Kan geen e-mail verzenden.", "Gebruikersaccount vergrendeld", "Toegang geweigerd.", "Inloggen mislukt, controleer gebruikersnaam en wachtwoord.", "Wachtwoordwijziging aangevraagd.", "IP-adres geblokkeerd, probeer het later opnieuw."];
         if (messageid > 0) {
             var msg = '';
             if ((messageid < 100) && (messageid < okmessages.length)) { msg = okmessages[messageid]; }

views/translations/login_nl.handlebars

@@ -271,8 +271,8 @@
 
         // Display the right server message
         var messageid = parseInt('{{{messageid}}}');
-        var okmessages = ['', "Wacht even, reset e-mail verzonden."];
-        var failmessages = ["Kan geen account maken.", "Gebruikersaccount limiet bereikt.", "Bestaand account met dit e-mailadres.", "Ongeldig token voor het maken van een account.", "Gebruikersnaam bestaal al.", "Wachtwoord geweigerd, gebruik een ander.", "Ongeldige e-mail.", "Gebruikersaccount niet gevonden", "Ongeldig token, probeer het opnieuw.", "Kan geen e-mail verzenden.", "Gebruikersaccount vergrendeld", "Toegang geweigerd.", "Inloggen mislukt, controleer gebruikersnaam en wachtwoord.", "Wachtwoordwijziging aangevraagd.", "IP-adres geblokkeerd, probeer het later opnieuw."];
+        var okmessages = ['', "even wachten, reset e-mail verzonden."];
+        var failmessages = ["Kan geen account maken.", "Gebruikersaccount limiet bereikt.", "Bestaand account met dit e-mailadres.", "Ongeldig token voor het maken van een account.", "Gebruikersnaam bestaat al.", "Wachtwoord geweigerd, gebruik een ander.", "Ongeldige e-mail.", "Gebruikersaccount niet gevonden", "Ongeldig token, probeer het opnieuw.", "Kan geen e-mail verzenden.", "Gebruikersaccount vergrendeld", "Toegang geweigerd.", "Inloggen mislukt, controleer gebruikersnaam en wachtwoord.", "Wachtwoordwijziging aangevraagd.", "IP-adres geblokkeerd, probeer het later opnieuw."];
         if (messageid > 0) {
             var msg = '';
             if ((messageid < 100) && (messageid < okmessages.length)) { msg = okmessages[messageid]; }

views/translations/messenger_nl.handlebars

@@ -607,7 +607,7 @@
                     var url = window.location.protocol.replace('http', 'ws') + '//' + window.location.host + window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/')) + '/meshrelay.ashx?id=' + args.id;
                     if ((args.auth != null) && (args.auth != '')) { url += '&auth=' + args.auth; }
                     socket = new WebSocket(url);
-                    socket.onopen = function () { state = 1; displayControl("Wachten op andere gebruiker ..."); }
+                    socket.onopen = function () { state = 1; displayControl("Wachten op de gebruiker ..."); }
                     socket.onerror = function (e) { /*console.error(e);*/ }
                     socket.onclose = function () { disconnect(); }
                     socket.onmessage = function (msg) {