diff --git a/meshuser.js b/meshuser.js
index c91f85fc..b50120de 100644
--- a/meshuser.js
+++ b/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;
}
diff --git a/package.json b/package.json
index f70a098a..1b7d6c81 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "meshcentral",
- "version": "0.4.5-z",
+ "version": "0.4.6-a",
"keywords": [
"Remote Management",
"Intel AMT",
diff --git a/public/translations/player-min_ja.htm b/public/translations/player-min_ja.htm
index 632d2541..f8907bd5 100644
--- a/public/translations/player-min_ja.htm
+++ b/public/translations/player-min_ja.htm
@@ -1 +1 @@
-
⇲
✓
✗
00:00:00
✖
\ No newline at end of file
+
⇲
✓
✗
00:00:00
✖
\ No newline at end of file
diff --git a/public/translations/player-min_nl.htm b/public/translations/player-min_nl.htm
index e6f2f70d..666d0283 100644
--- a/public/translations/player-min_nl.htm
+++ b/public/translations/player-min_nl.htm
@@ -1 +1 @@
-
⇲
✓
✗
00:00:00
✖
\ No newline at end of file
+
⇲
✓
✗
00:00:00
✖
\ No newline at end of file
diff --git a/public/translations/player_ja.htm b/public/translations/player_ja.htm
index b6ddf97a..412f3df7 100644
--- a/public/translations/player_ja.htm
+++ b/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);
diff --git a/public/translations/player_nl.htm b/public/translations/player_nl.htm
index 28d6660c..7bfc3de4 100644
--- a/public/translations/player_nl.htm
+++ b/public/translations/player_nl.htm
@@ -51,12 +51,12 @@
@@ -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);
@@ -299,7 +299,7 @@
QS('progressbar').width = '0px';
QH('timespan', '00:00:00');
QV('metadatadiv', true);
- QH('metadatadiv', 'MeshCentral Session Player
' + "Sleep een .mcrec-bestand of klik op \"Bestand openen...\"" + '');
+ QH('metadatadiv', 'MeshCentral Session Player
' + "Sleep een .mcrec-bestand of klik op \"Bestand openen ...\"" + '');
QV('DeskParent', true);
QV('TermParent', false);
}
diff --git a/translate/translate.json b/translate/translate.json
index 23e590fb..126f79b1 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -41,7 +41,8 @@
],
"pt": " + CIRA",
"ja": " + CIRA",
- "cs": " + CIRA"
+ "cs": " + CIRA",
+ "nl": " + CIRA"
},
{
"en": " - Reset in {0} day{1}.",
@@ -52,7 +53,7 @@
"default-mobile.handlebars->9->13"
],
"pt": " - Redefinir em {0} dia {1}.",
- "ja": " -{0}日でリセット{1}。",
+ "ja": " - {0}日でリセット{1}。",
"nl": " - Reset in {0} dag(en){1}."
},
{
@@ -64,7 +65,7 @@
"default-mobile.handlebars->9->12"
],
"pt": " - Redefinir em {0} hora {1}.",
- "ja": " -{0}時間でリセット{1}。",
+ "ja": " - {0}時間でリセット{1}。",
"nl": " - Reset in {0} uur{1}."
},
{
@@ -76,7 +77,7 @@
"default-mobile.handlebars->9->11"
],
"pt": " - Redefinir em {0} minuto {1}.",
- "ja": " -{0}分でリセット{1}。",
+ "ja": " - {0}分でリセット{1}。",
"nl": " - Reset in {0} minuten{1}."
},
{
@@ -90,7 +91,7 @@
"default-mobile.handlebars->9->10"
],
"pt": " - Redefinir no próximo login.",
- "ja": " -次回ログイン時にリセット。",
+ "ja": " - 次回ログイン時にリセット。",
"nl": " - Reset bij volgende inlog."
},
{
@@ -99,7 +100,7 @@
"default-mobile.handlebars->9->91"
],
"pt": " / ",
- "ja": " /",
+ "ja": " / ",
"cs": " / ",
"nl": " / "
},
@@ -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.",
@@ -199,7 +201,7 @@
],
"pt": " sem TLS.",
"ja": " TLSなし。",
- "nl": "zonder TLS."
+ "nl": " zonder TLS."
},
{
"en": "(",
@@ -270,10 +272,10 @@
"default.handlebars->23->1080",
"default-mobile.handlebars->9->327"
],
- "pt": ",",
+ "pt": ", ",
"ja": "、",
"cs": ", ",
- "nl": ","
+ "nl": ", "
},
{
"en": ", click here to enable it.",
@@ -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",
@@ -544,7 +546,7 @@
],
"pt": "1.As redistribuições do código-fonte devem manter o aviso de direitos autorais acima, esta lista de condições e o aviso de isenção de responsabilidade a seguir.",
"ja": "1.ソースコードの再配布には、上記の著作権表示、この条件リスト、および以下の免責事項を保持する必要があります。",
- "nl": "1. Herdistributies van broncode moeten de bovenstaande copyright kennisgeving en deze lijst met voorwaarden en de volgende disclaimer bevatten."
+ "nl": "1.Herdistributies van broncode moeten de bovenstaande copyright kennisgeving en deze lijst met voorwaarden en de volgende disclaimer bevatten."
},
{
"en": "1/2 Speed",
@@ -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%",
@@ -653,7 +655,7 @@
],
"pt": "2.As redistribuições em formato binário devem reproduzir o aviso de direitos autorais acima, esta lista de condições e o aviso de isenção de responsabilidade a seguir na documentação e / ou outros materiais fornecidos com a distribuição.",
"ja": "2.バイナリ形式での再配布では、上記の著作権表示、この条件リスト、および以下の免責事項を、配布物とともに提供されるドキュメントおよび/またはその他の資料に複製する必要があります。",
- "nl": "2. Herdistributies in binaire vorm moeten de bovenstaande copyright kennisgeving, deze lijst met voorwaarden en de volgende disclaimer reproduceren in de documentatie en / of andere materialen die bij de distributie worden geleverd."
+ "nl": "2.Herdistributies in binaire vorm moeten de bovenstaande copyright kennisgeving, deze lijst met voorwaarden en de volgende disclaimer reproduceren in de documentatie en / of andere materialen die bij de distributie worden geleverd."
},
{
"en": "25%",
@@ -708,7 +710,7 @@
],
"pt": "3.Nem o nome da CodePlex Foundation nem os nomes de seus colaboradores podem ser usados \\u200b\\u200bpara endossar ou promover produtos derivados deste software sem permissão prévia por escrito específica.",
"ja": "3. CodePlex Foundationの名前もその貢献者の名前も、書面による事前の許可なしに、このソフトウェアから派生した製品を推奨または宣伝するために使用することはできません。",
- "nl": "3. Noch de naam van CodePlex Foundation, noch de namen van haar bijdragers mogen worden gebruikt om producten die zijn afgeleid van deze software te ondersteunen of promoten zonder specifieke voorafgaande schriftelijke toestemming."
+ "nl": "3.Noch de naam van CodePlex Foundation, noch de namen van haar bijdragers mogen worden gebruikt om producten die zijn afgeleid van deze software te ondersteunen of promoten zonder specifieke voorafgaande schriftelijke toestemming."
},
{
"en": "32bit version of the MeshAgent",
@@ -751,7 +753,7 @@
"terms-mobile.handlebars->container->page_content->column_l->37->1"
],
"ja": "4.「OpenSSL Toolkit」および「OpenSSL Project」という名前は、事前の書面による許可なしに、このソフトウェアから派生した製品を推奨または宣伝するために使用しないでください。書面による許可については、openssl-core @ openssl.orgにお問い合わせください。",
- "nl": "4. De namen \"OpenSSL Toolkit\" en \"OpenSSL Project\" mogen niet worden gebruikt om producten die zijn afgeleid van deze software te ondersteunen of promoten zonder voorafgaande schriftelijke toestemming. Neem voor schriftelijke toestemming contact op met openssl-core@openssl.org."
+ "nl": "4.De namen \"OpenSSL Toolkit\" en \"OpenSSL Project\" mogen niet worden gebruikt om producten die zijn afgeleid van deze software te ondersteunen of promoten zonder voorafgaande schriftelijke toestemming. Neem voor schriftelijke toestemming contact op met openssl-core@openssl.org."
},
{
"en": "4x Speed",
@@ -783,7 +785,7 @@
"terms-mobile.handlebars->container->page_content->column_l->39->1"
],
"ja": "5.このソフトウェアから派生した製品は、OpenSSL Projectの事前の書面による許可なしに、「OpenSSL」と呼ばれたり、名前に「OpenSSL」が表示されたりすることはありません。",
- "nl": "5. Producten die zijn afgeleid van deze software mogen niet \"OpenSSL\" worden genoemd, noch mag \"OpenSSL\" in hun naam worden weergegeven zonder voorafgaande schriftelijke toestemming van het OpenSSL-project."
+ "nl": "5.Producten die zijn afgeleid van deze software mogen niet \"OpenSSL\" worden genoemd, noch mag \"OpenSSL\" in hun naam worden weergegeven zonder voorafgaande schriftelijke toestemming van het OpenSSL-project."
},
{
"en": "50%",
@@ -805,7 +807,7 @@
],
"pt": "6.As redistribuições de qualquer forma devem manter o seguinte reconhecimento: \"Este produto inclui software desenvolvido pelo OpenSSL Project para uso no OpenSSL Toolkit (http://www.openssl.org/)\".",
"ja": "6.いかなる形式の再配布でも、「この製品には、OpenSSL Toolkit（http://www.openssl.org/）で使用するためにOpenSSL Projectによって開発されたソフトウェアが含まれます」という承認を保持する必要があります。",
- "nl": "6. Herdistributies in welke vorm dan ook moet de volgende tekst behouden: \"Dit product bevat software die is ontwikkeld door het OpenSSL-project voor gebruik in de OpenSSL Toolkit (http://www.openssl.org/)\"."
+ "nl": "6.Herdistributies in welke vorm dan ook moet de volgende tekst behouden: \"Dit product bevat software die is ontwikkeld door het OpenSSL-project voor gebruik in de OpenSSL Toolkit (http://www.openssl.org/)\"."
},
{
"en": "62.5%",
@@ -922,7 +924,7 @@
],
"pt": "Ativação de login em duas etapas removida. Você pode reativar esse recurso a qualquer momento.",
"ja": " 2段階のログインアクティベーションが削除されました。この機能はいつでも再アクティブ化できます。",
- "nl": " Tweestapsverificatie verwijderd. Je kan deze functie ten allen tijde weer inschakelen."
+ "nl": "Tweestapsverificatie verwijderd. Je kan deze functie ten allen tijde weer inschakelen."
},
{
"en": "2-step login activation successful. You will now need a valid token to login again.",
@@ -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",
@@ -1527,7 +1529,7 @@
],
"pt": "Console do agente",
"ja": "エージェントコンソール",
- "nl": "Agentconsole"
+ "nl": "Agent console"
},
{
"en": "Agent disconnected",
@@ -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.",
@@ -2338,7 +2340,7 @@
"pt": "Códigos de backup",
"ja": "バックアップコード",
"cs": "Záloha kódu",
- "nl": "Back-upcodes"
+ "nl": "Back-up codes"
},
{
"en": "Basque",
@@ -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",
@@ -4690,7 +4692,7 @@
"pt": "Arraste e solte um arquivo .mcrec ou clique em \\\"Abrir arquivo...\\\"",
"ja": ".mcrecファイルをドラッグアンドドロップするか、[ファイルを開く...]をクリックします",
"cs": "Drag & drop soubor .mcrec nebo klikni na \\\"Otevřít soubor...\\\"",
- "nl": "Sleep een .mcrec-bestand of klik op \\\"Bestand openen...\\\""
+ "nl": "Sleep een .mcrec-bestand of klik op \\\"Bestand openen ...\\\""
},
{
"en": "Duration",
@@ -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",
@@ -6449,7 +6452,7 @@
],
"ja": "インストール Google Authenticator または互換性のあるアプリケーションでバーコードをスキャンするには、このリンクを使用するか、秘密。次に、現在の6桁のトークンを入力して、2段階ログインを有効にします。",
"cs": "Nainstalujte si Google Authenticator nebo kompatibilní aplikaci a naskenujte kód, použijte tento odkaz nebo vložte secret. Pak vložte aktuální 6 číselný token pro aktivaci 2-faktorového přihlašování.",
- "nl": "Installeer Google Authenticator of een compatibele applicatie en scan de streepjescode, gebruik deze link of voer de link in geheim. Voer vervolgens het huidige 6-cijferige token hieronder in om 2-staps aanmelding te activeren."
+ "nl": "Installeer Google Authenticator of een compatibele applicatie en scan de streepjescode, gebruik deze link of voer de link in geheim. Voer vervolgens het huidige 6-cijferige token hieronder in om 2-staps aanmelding te activeren."
},
{
"en": "Install Google Authenticator or a compatible application, use this link or enter the secret below. Then, enter the current 6 digit token to activate 2-Step login.",
@@ -6458,7 +6461,7 @@
],
"ja": "インストール Google Authenticator または互換性のあるアプリケーションの場合、このリンクを使用するか、下に秘密を入力します。次に、現在の6桁のトークンを入力して、2段階ログインを有効にします。",
"cs": "Nainstalujte si Google Authenticator nebo kompatibilní aplikaci, použijte tento odkaz nebo vložte secret. Pak vložte aktuální 6 číselný token pro aktivaci 2-faktorového přihlašování.",
- "nl": "Installeer Google Authenticator of een compatibele toepassing, gebruik deze link of voer hieronder het geheim in. Voer vervolgens het huidige 6-cijferige token in om 2-staps aanmelding te activeren."
+ "nl": "Installeer Google Authenticator of een compatibele toepassing, gebruik deze link of voer hieronder het geheim in. Voer vervolgens het huidige 6-cijferige token in om 2-staps aanmelding te activeren."
},
{
"en": "Install CIRA",
@@ -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"
},
@@ -6865,7 +6868,7 @@
"default.handlebars->container->column_l->p12->p12warning->3"
],
"pt": "Intel® Porta de redirecionamento AMT ou recurso KVM desativado",
- "ja": "Intel®AMTリダイレクトポートまたはKVM機能が無効になっています",
+ "ja": "Intel® AMTリダイレクトポートまたはKVM機能が無効になっています",
"cs": "Intel® AMT přesměrování portu nebo KVM vlastnost je vypnuta",
"nl": "Intel® AMT omleidingspoort of KVM-functie is uitgeschakeld"
},
@@ -8276,7 +8279,7 @@
"pt": "Nome de usuário / senha manual",
"ja": "手動ユーザー名/パスワード",
"cs": "Vlastní přihlašovací jméno/heslo",
- "nl": "Handmatige gebruikersnaam / wachtwoord"
+ "nl": "Handmatige gebruikersnaam/wachtwoord"
},
{
"en": "Maori",
@@ -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",
@@ -11371,7 +11374,7 @@
"pt": "Valores de intervalo de IP de amostra 192.168.0.100 192.168.1.0/24 192.167.0.1-192.168.0.100",
"ja": "サンプルIP範囲値 192.168.0.100 192.168.1.0/24 192.167.0.1-192.168.0.100",
"cs": "Příklad rozsahu IP adres 192.168.0.100 192.168.1.0/24 192.167.0.1-192.168.0.100",
- "nl": "Voorbeeld van IP-bereikwaarden 192.168.0.100 192.168.1.0/24 192.167.0.1-192.168.0.100"
+ "nl": "Voorbeeld van IP-bereikwaarden 192.168.0.100 192.168.1.0/24 192.167.0.1-192.168.0.100"
},
{
"en": "Sango",
@@ -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® Dispositivo AMT para grupo de dispositivos \\\"{0}\\\" com CIRA, baixe os seguintes arquivos de script e use MeshCommander para executar o script para configurar computadores.",
- "ja": "新しいIntel＆reg;を追加するにはCIRAを使用してAMTデバイスからデバイスグループ\\\"{0}\\\"に移動し、次のスクリプトファイルをダウンロードして、 MeshCommander スクリプトを実行してコンピューターを構成します。",
+ "ja": "新しいIntel®を追加するにはCIRAを使用してAMTデバイスからデバイスグループ\\\"{0}\\\"に移動し、次のスクリプトファイルをダウンロードして、 MeshCommander スクリプトを実行してコンピューターを構成します。",
"cs": "Pro přidání nového Intel® AMT zařízení do skupiny \\\"{0}\\\" s CIRA, si musíte stáhnout následující skript MeshCommander 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 MeshCommander om het script uit te voeren om computers te configureren."
+ "nl": "Om een nieuw Intel® AMT-apparaat toe te voegen aan apparaatgroep \\\"{0}\\\" met CIRA, downloadt u de volgende scriptbestanden en gebruikt u MeshCommander om het script uit te voeren om computers te configureren."
},
{
"en": "To add a new Intel® 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® 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®を追加するにはAMTデバイスからCIRAを使用したデバイスグループ\\\"{0}\\\"に、Intel AMT内で信頼されたルートとして次の証明書をロード",
"cs": "Pro přidání nového Intel® 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® 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® 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® 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®を追加するにはCIRAを使用してデバイスグループ\\\"{0}\\\"へのAMTデバイス、Intel AMT内の信頼されたルートとして次の証明書を読み込み、次の共通名を持つクライアント証明書を使用して認証し、次のサーバーに接続します。",
"cs": "Pro přidání nového Intel® 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® 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.",
@@ -13390,7 +13403,7 @@
],
"pt": "Para remover um agente de malha, faça o download do arquivo abaixo, execute-o e clique em \\\"uninstall\\\".",
"ja": "メッシュエージェントを削除するには、以下のファイルをダウンロードして実行し、「アンインストール」をクリックします。",
- "nl": "Om een mesh-agent te verwijderen, download het onderstaande bestand, voer het uit en klik op \\\"deinstalleer\\\"."
+ "nl": "Om een mesh-agent te verwijderen, download het onderstaande bestand, voer het uit en klik op \\\"deinstalleer \\\"."
},
{
"en": "To remove a mesh agent, run the following command. Root credentials will be needed.",
@@ -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",
@@ -13671,7 +13684,7 @@
"pt": "Digite um nome de chave, selecione a caixa OTP e pressione o botão no YubiKeytrade;.",
"ja": "キー名を入力し、OTPボックスを選択して、YubiKey＆trade;のボタンを押します。",
"cs": "Zadejte název klíče, vyberte pole OTP a stiskněte tlačítko na YubiKey™.",
- "nl": "Typ een sleutelnaam, selecteer het vak OTP en druk op de knop op de YubiKey ™."
+ "nl": "Typ een sleutelnaam, selecteer het vak OTP en druk op de knop op de YubiKey™."
},
{
"en": "Type in the name of the key to add.",
@@ -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™ OTP",
"ja": "YubiKey＆trade; OTP",
"cs": "YubiKey™ OTP",
- "nl": "YubiKey™ OTP"
+ "nl": "YubiKey™ OTP"
},
{
"en": "Zoom to fit extent",
@@ -15471,7 +15484,7 @@
"xloc": [
"default.handlebars->23->1285"
],
- "ja": "\\\\ '",
+ "ja": "\\\\'",
"cs": "\\\\'",
"nl": "\\\\'"
},
diff --git a/views/default-min.handlebars b/views/default-min.handlebars
index 183eb03f..87cf1eff 100644
--- a/views/default-min.handlebars
+++ b/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);
-
- // My Account
- if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
- if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
- // My Events
- if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
- if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
- // My Users
- if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
- if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
- // My Files
- if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
- if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
- // 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);
+ 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
+ QC('MainMenuMyAccount').add(mainMenuActiveClass);
+ QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+ } else if (x == 3) {
+ // My Events
+ QC('MainMenuMyEvents').add(mainMenuActiveClass);
+ QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+ } else if (x == 4 || (x >= 30 && x < 40)) {
+ // My Users
+ QC('MainMenuMyUsers').add(mainMenuActiveClass);
+ QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+ } else if (x == 5) {
+ // My Files
+ QC('MainMenuMyFiles').add(mainMenuActiveClass);
+ QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+ } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
+ // My Server
+ QC('MainMenuMyServer').add(mainMenuActiveClass);
+ QC('LeftMenuMyServer').add(leftMenuActiveClass);
+ }
QV('ServerPlugins', pluginHandler != null);
// column_l max-height
diff --git a/views/default.handlebars b/views/default.handlebars
index f0229dc5..36bfe005 100644
--- a/views/default.handlebars
+++ b/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);
-
- // My Account
- if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
- if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
- // My Events
- if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
- if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
- // My Users
- if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
- if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
- // My Files
- if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
- if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
- // 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);
+ 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
+ QC('MainMenuMyAccount').add(mainMenuActiveClass);
+ QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+ } else if (x == 3) {
+ // My Events
+ QC('MainMenuMyEvents').add(mainMenuActiveClass);
+ QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+ } else if (x == 4 || (x >= 30 && x < 40)) {
+ // My Users
+ QC('MainMenuMyUsers').add(mainMenuActiveClass);
+ QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+ } else if (x == 5) {
+ // My Files
+ QC('MainMenuMyFiles').add(mainMenuActiveClass);
+ QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+ } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
+ // My Server
+ QC('MainMenuMyServer').add(mainMenuActiveClass);
+ QC('LeftMenuMyServer').add(leftMenuActiveClass);
+ }
QV('ServerPlugins', pluginHandler != null);
// column_l max-height
diff --git a/views/translations/agentinvite-min_nl.handlebars b/views/translations/agentinvite-min_nl.handlebars
index eb83365f..c96a9b55 100644
--- a/views/translations/agentinvite-min_nl.handlebars
+++ b/views/translations/agentinvite-min_nl.handlebars
@@ -1 +1 @@
-{{{title}}} - Agent Installation
{{{titlehtml}}}
{{{title1}}}
{{{title2}}}
{{{logoutControl}}}
♦
Remote Agent installatie
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.
Om de volgende opdracht te installeren, knippen en plakken in een root-terminal.
Om de installatie ongedaan te maken, knip en plak je de volgende opdracht als root.
Apple™ MacOS
Download het installatieprogramma hier, klik er met de rechtermuisknop op of druk op "beheer" en klik op het bestand. Daarna op "open" en volg de instructies.
\ No newline at end of file
+{{{title}}} - Agent Installation
{{{titlehtml}}}
{{{title1}}}
{{{title2}}}
{{{logoutControl}}}
♦
Remote Agent installatie
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.
Om de volgende opdracht te installeren, knippen en plakken in een root-terminal.
Om de installatie ongedaan te maken, knip en plak je de volgende opdracht als root.
Apple™ MacOS
Download het installatieprogramma hier, klik er met de rechtermuisknop op of druk op "beheer" en klik op het bestand. Daarna op "open" en volg de instructies.
\ No newline at end of file
diff --git a/views/translations/agentinvite_nl.handlebars b/views/translations/agentinvite_nl.handlebars
index dc517e71..36f3bc19 100644
--- a/views/translations/agentinvite_nl.handlebars
+++ b/views/translations/agentinvite_nl.handlebars
@@ -71,9 +71,7 @@
Remote Agent installatie
- 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.
+ 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.
diff --git a/views/translations/default-min_cs.handlebars b/views/translations/default-min_cs.handlebars
index 689947b8..ddaf346c 100644
--- a/views/translations/default-min_cs.handlebars
+++ b/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);
-
- // My Account
- if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
- if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
- // My Events
- if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
- if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
- // My Users
- if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
- if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
- // My Files
- if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
- if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
- // 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);
+ 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
+ QC('MainMenuMyAccount').add(mainMenuActiveClass);
+ QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+ } else if (x == 3) {
+ // My Events
+ QC('MainMenuMyEvents').add(mainMenuActiveClass);
+ QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+ } else if (x == 4 || (x >= 30 && x < 40)) {
+ // My Users
+ QC('MainMenuMyUsers').add(mainMenuActiveClass);
+ QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+ } else if (x == 5) {
+ // My Files
+ QC('MainMenuMyFiles').add(mainMenuActiveClass);
+ QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+ } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
+ // My Server
+ QC('MainMenuMyServer').add(mainMenuActiveClass);
+ QC('LeftMenuMyServer').add(leftMenuActiveClass);
+ }
QV('ServerPlugins', pluginHandler != null);
// column_l max-height
diff --git a/views/translations/default-min_fr.handlebars b/views/translations/default-min_fr.handlebars
index 33677d48..b65528be 100644
--- a/views/translations/default-min_fr.handlebars
+++ b/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);
-
- // My Account
- if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
- if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
-
- // My Events
- if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
- if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
-
- // My Users
- if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
- if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
-
- // My Files
- if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
- if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
-
- // 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);
+ 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
+ QC('MainMenuMyAccount').add(mainMenuActiveClass);
+ QC('LeftMenuMyAccount').add(leftMenuActiveClass);
+ } else if (x == 3) {
+ // My Events
+ QC('MainMenuMyEvents').add(mainMenuActiveClass);
+ QC('LeftMenuMyEvents').add(leftMenuActiveClass);
+ } else if (x == 4 || (x >= 30 && x < 40)) {
+ // My Users
+ QC('MainMenuMyUsers').add(mainMenuActiveClass);
+ QC('LeftMenuMyUsers').add(leftMenuActiveClass);
+ } else if (x == 5) {
+ // My Files
+ QC('MainMenuMyFiles').add(mainMenuActiveClass);
+ QC('LeftMenuMyFiles').add(leftMenuActiveClass);
+ } else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
+ // My Server
+ QC('MainMenuMyServer').add(mainMenuActiveClass);
+ QC('LeftMenuMyServer').add(leftMenuActiveClass);
+ }
QV('ServerPlugins', pluginHandler != null);
// column_l max-height
diff --git a/views/translations/default-min_ja.handlebars b/views/translations/default-min_ja.handlebars
index 8f3f5c28..19ff4a65 100644
--- a/views/translations/default-min_ja.handlebars
+++ b/views/translations/default-min_ja.handlebars
@@ -1,4 +1,4 @@
-{{{StartGeoLocation}}}{{{EndGeoLocation}}}{{{title}}}
\ No newline at end of file
diff --git a/views/translations/default-mobile-min_nl.handlebars b/views/translations/default-mobile-min_nl.handlebars
index ece1e875..0665dd80 100644
--- a/views/translations/default-mobile-min_nl.handlebars
+++ b/views/translations/default-mobile-min_nl.handlebars
@@ -1 +1 @@
-{{{title}}}
{{{title}}}
{{{title2}}}
Server verbroken,klik om opnieuw verbinding te maken.
\ No newline at end of file
diff --git a/views/translations/default-mobile-min_pt.handlebars b/views/translations/default-mobile-min_pt.handlebars
index f123a346..49c74730 100644
--- a/views/translations/default-mobile-min_pt.handlebars
+++ b/views/translations/default-mobile-min_pt.handlebars
@@ -1 +1 @@
-{{{title}}}
\ No newline at end of file
diff --git a/views/translations/default-mobile_ja.handlebars b/views/translations/default-mobile_ja.handlebars
index 2b2ce5f9..97642543 100644
--- a/views/translations/default-mobile_ja.handlebars
+++ b/views/translations/default-mobile_ja.handlebars
@@ -554,7 +554,7 @@
新しい