From 187368b35459f4bfab91769c559acab192bee6be Mon Sep 17 00:00:00 2001 From: Robert Knight <95928279+microbit-robert@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:29:55 +0000 Subject: [PATCH] Align menu items across apps (#1144) * Translation round trip (includes some other minor changes). --- .github/workflows/build.yml | 2 +- lang/ui.ca.json | 6 +++++- lang/ui.de.json | 24 ++++++++++++++---------- lang/ui.en.json | 4 ++++ lang/ui.es-es.json | 10 +++++++--- lang/ui.fr.json | 4 ++++ lang/ui.ja.json | 6 +++++- lang/ui.ko.json | 4 ++++ lang/ui.nl.json | 4 ++++ lang/ui.zh-cn.json | 4 ++++ lang/ui.zh-tw.json | 4 ++++ src/deployment/index.ts | 1 + src/messages/ui.ca.json | 8 +++++++- src/messages/ui.de.json | 36 +++++++++++++++++++++++------------- src/messages/ui.en.json | 6 ++++++ src/messages/ui.es-es.json | 12 +++++++++--- src/messages/ui.fr.json | 6 ++++++ src/messages/ui.ja.json | 8 +++++++- src/messages/ui.ko.json | 6 ++++++ src/messages/ui.nl.json | 6 ++++++ src/messages/ui.zh-cn.json | 6 ++++++ src/messages/ui.zh-tw.json | 6 ++++++ src/workbench/HelpMenu.tsx | 11 +++++++++++ 23 files changed, 150 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 285827b47..c74d395cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: - run: npm ci env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: npm install --no-save @microbit-foundation/python-editor-v3-microbit@0.2.0-dev.18 @microbit-foundation/website-deploy-aws@0.3.0 @microbit-foundation/website-deploy-aws-config@0.7.1 @microbit-foundation/circleci-npm-package-versioner@1 + - run: npm install --no-save @microbit-foundation/python-editor-v3-microbit@0.2.0-dev.23 @microbit-foundation/website-deploy-aws@0.3.0 @microbit-foundation/website-deploy-aws-config@0.7.1 @microbit-foundation/circleci-npm-package-versioner@1 if: github.repository_owner == 'microbit-foundation' env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/lang/ui.ca.json b/lang/ui.ca.json index d53287236..f0079db42 100644 --- a/lang/ui.ca.json +++ b/lang/ui.ca.json @@ -196,7 +196,7 @@ "description": "Text displayed when content fails to load" }, "cookies-action": { - "defaultMessage": "Cookies", + "defaultMessage": "Galetes", "description": "Action to show dialog to choose website cookie preferences" }, "copied": { @@ -566,6 +566,10 @@ "defaultMessage": "Per executar aquest fitxer hexadecimal a la teva micro:bit segueix aquests passos.", "description": "Message in dialog shown after the user saves the project as a hex file." }, + "privacy-policy": { + "defaultMessage": "Política de privadesa", + "description": "Privacy policy menu option text" + }, "project-actions": { "defaultMessage": "Accions del projecte", "description": "Aria label for the bar with project actions" diff --git a/lang/ui.de.json b/lang/ui.de.json index d230cc4ac..540f14631 100644 --- a/lang/ui.de.json +++ b/lang/ui.de.json @@ -28,7 +28,7 @@ "description": "Change made to file" }, "api-description": { - "defaultMessage": "Für die Verwendung und Beispiele, siehe Referenz", + "defaultMessage": "Für die Verwendung und Beispiele, siehe Referenz.", "description": "Extended description at the top of the API tab" }, "api-tab": { @@ -72,7 +72,7 @@ "description": "Header for dialog of confirmation of files changed" }, "choose-main-add-file": { - "defaultMessage": "Datei {name} hinzufügen", + "defaultMessage": "Datei {name} hinzufügen?", "description": "Shown in load dialog to confirm actions" }, "choose-main-add-module": { @@ -136,7 +136,7 @@ "description": "Confirmation message for the reset action" }, "confirm-replace-title": { - "defaultMessage": "Projekt-Ersetzen bestätigen", + "defaultMessage": "Zurücksetzen bestätigen", "description": "Confirmation message title for replacing project dialog" }, "confirm-replace-with-idea": { @@ -212,7 +212,7 @@ "description": "Copy code to clipboard action text" }, "create-action": { - "defaultMessage": "Erstelle", + "defaultMessage": "Erstellen", "description": "Create action label (e.g. in create file dialog)" }, "create-file-action": { @@ -232,7 +232,7 @@ "description": "Button text for delete action" }, "delete-file-action": { - "defaultMessage": "Lösche {name}", + "defaultMessage": "{name} löschen", "description": "Menu option to delete file" }, "deleted-file": { @@ -360,7 +360,7 @@ "description": "Help translate menu option text" }, "highlight-code-structure": { - "defaultMessage": "Code-Struktur hervorheben", + "defaultMessage": "Codestruktur hervorheben", "description": "Code structure setting label" }, "highlight-code-structure-full": { @@ -368,7 +368,7 @@ "description": "Highlight code structure option" }, "highlight-code-structure-none": { - "defaultMessage": "Nichts", + "defaultMessage": "Aus", "description": "Highlight code structure option" }, "highlight-code-structure-simple": { @@ -523,7 +523,7 @@ "description": "Aria label for file drop target" }, "open-hover": { - "defaultMessage": "Eine hex- oder Python-Datei öffnen oder andere Dateien hinzufügen", + "defaultMessage": "Eine HEX- oder Python-Datei öffnen oder andere Dateien hinzufügen.", "description": "Hover text over load button" }, "options": { @@ -566,6 +566,10 @@ "defaultMessage": "Um diese hex-Datei auf deinem micro:bit auszuführen, solltest du folgende Schritte ausführen.", "description": "Message in dialog shown after the user saves the project as a hex file." }, + "privacy-policy": { + "defaultMessage": "Datenschutzerklärung", + "description": "Privacy policy menu option text" + }, "project-actions": { "defaultMessage": "Projekt-Aktionen", "description": "Aria label for the bar with project actions" @@ -655,7 +659,7 @@ "description": "Hover text over save button" }, "save-python-action": { - "defaultMessage": "Python-Script speichern", + "defaultMessage": "Python-Skript speichern", "description": "Save button menu option to save the Python script" }, "search": { @@ -691,7 +695,7 @@ "description": "Shown when your program is in sync with the micro:bit" }, "serial-help-ctrl-c": { - "defaultMessage": "Verwende das Tatstaturkürzel Strg + C um das Programm abzuhalten. Danach kannst du Python-Befehle eingeben, die MicroPython ausführen soll. Das ist eine großartige Möglichkeit, mit etwas Neuem zu experimentieren.", + "defaultMessage": "Verwende den Tastenkürzel Strg + C um das Programm anzuhalten. Danach kannst du Python-Befehle eingeben, die MicroPython ausführen soll. Das ist eine großartige Möglichkeit, mit etwas Neuem zu experimentieren.", "description": "Text from the serial hints and tips dialog. kbd tag shows a keyboard key style." }, "serial-help-ctrl-d": { diff --git a/lang/ui.en.json b/lang/ui.en.json index 248c9d3b6..88b44ba07 100644 --- a/lang/ui.en.json +++ b/lang/ui.en.json @@ -567,6 +567,10 @@ "defaultMessage": "To run this hex file on your micro:bit follow these steps.", "description": "Message in dialog shown after the user saves the project as a hex file." }, + "privacy-policy": { + "defaultMessage": "Privacy policy", + "description": "Privacy policy menu option text" + }, "project-actions": { "defaultMessage": "Project actions", "description": "Aria label for the bar with project actions" diff --git a/lang/ui.es-es.json b/lang/ui.es-es.json index 1786fa5ee..634e3a867 100644 --- a/lang/ui.es-es.json +++ b/lang/ui.es-es.json @@ -148,7 +148,7 @@ "description": "Confirm and save action label" }, "confirm-save-hint": { - "defaultMessage": "Cancela y pulsa Guardar para guardar una copia de tu proyecto.", + "defaultMessage": "Cancela y utiliza Guardar para conservar una copia de tu proyecto.", "description": "Hint shown when the user has unsaved changes that they might lose if they continue with an action" }, "connect-action": { @@ -566,6 +566,10 @@ "defaultMessage": "Para ejecutar este archivo HEX en tu micro:bit sigue estos pasos.", "description": "Message in dialog shown after the user saves the project as a hex file." }, + "privacy-policy": { + "defaultMessage": "Política de privacidad", + "description": "Privacy policy menu option text" + }, "project-actions": { "defaultMessage": "Acciones del proyecto", "description": "Aria label for the bar with project actions" @@ -863,7 +867,7 @@ "description": "Simulator gesture option" }, "simulator-gesture-down": { - "defaultMessage": "logo abajo", + "defaultMessage": "abajo", "description": "Simulator gesture option" }, "simulator-gesture-face-down": { @@ -899,7 +903,7 @@ "description": "Simulator gesture option" }, "simulator-gesture-up": { - "defaultMessage": "logo arriba", + "defaultMessage": "arriba", "description": "Simulator gesture option" }, "simulator-hide": { diff --git a/lang/ui.fr.json b/lang/ui.fr.json index 543c7abd9..d49bceda8 100644 --- a/lang/ui.fr.json +++ b/lang/ui.fr.json @@ -566,6 +566,10 @@ "defaultMessage": "Pour exécuter ce fichier hex sur votre micro:bit suivez ces étapes.", "description": "Message in dialog shown after the user saves the project as a hex file." }, + "privacy-policy": { + "defaultMessage": "Politique de confidentialité", + "description": "Privacy policy menu option text" + }, "project-actions": { "defaultMessage": "Actions du projet", "description": "Aria label for the bar with project actions" diff --git a/lang/ui.ja.json b/lang/ui.ja.json index 8f507037e..96df79548 100644 --- a/lang/ui.ja.json +++ b/lang/ui.ja.json @@ -196,7 +196,7 @@ "description": "Text displayed when content fails to load" }, "cookies-action": { - "defaultMessage": "Cookies", + "defaultMessage": "Cookieについて", "description": "Action to show dialog to choose website cookie preferences" }, "copied": { @@ -566,6 +566,10 @@ "defaultMessage": "micro:bit上のhex ファイルを実行するにはこの手順に従います。", "description": "Message in dialog shown after the user saves the project as a hex file." }, + "privacy-policy": { + "defaultMessage": "プライバシーポリシー", + "description": "Privacy policy menu option text" + }, "project-actions": { "defaultMessage": "プロジェクトアクション", "description": "Aria label for the bar with project actions" diff --git a/lang/ui.ko.json b/lang/ui.ko.json index 0f148421f..ef5629b1e 100644 --- a/lang/ui.ko.json +++ b/lang/ui.ko.json @@ -566,6 +566,10 @@ "defaultMessage": "micro:bit에서 이 hex 파일을 실행하려면 다음 단계를 따르세요.", "description": "Message in dialog shown after the user saves the project as a hex file." }, + "privacy-policy": { + "defaultMessage": "개인정보 보호 정책", + "description": "Privacy policy menu option text" + }, "project-actions": { "defaultMessage": "프로젝트 동작", "description": "Aria label for the bar with project actions" diff --git a/lang/ui.nl.json b/lang/ui.nl.json index 41f041b2d..73937fe57 100644 --- a/lang/ui.nl.json +++ b/lang/ui.nl.json @@ -566,6 +566,10 @@ "defaultMessage": "Om dit hexadecimale bestand uit te voeren op je micro:bit volg deze stappen.", "description": "Message in dialog shown after the user saves the project as a hex file." }, + "privacy-policy": { + "defaultMessage": "Privacybeleid", + "description": "Privacy policy menu option text" + }, "project-actions": { "defaultMessage": "Project acties", "description": "Aria label for the bar with project actions" diff --git a/lang/ui.zh-cn.json b/lang/ui.zh-cn.json index f4c568dc9..ca8058c6f 100644 --- a/lang/ui.zh-cn.json +++ b/lang/ui.zh-cn.json @@ -566,6 +566,10 @@ "defaultMessage": "要在您的 micro:bit 上运行此 hex 文件，follow these steps。", "description": "Message in dialog shown after the user saves the project as a hex file." }, + "privacy-policy": { + "defaultMessage": "隐私政策", + "description": "Privacy policy menu option text" + }, "project-actions": { "defaultMessage": "项目行动", "description": "Aria label for the bar with project actions" diff --git a/lang/ui.zh-tw.json b/lang/ui.zh-tw.json index 993a6bb9d..8b1461881 100644 --- a/lang/ui.zh-tw.json +++ b/lang/ui.zh-tw.json @@ -566,6 +566,10 @@ "defaultMessage": "若要在您的 micro:bit 執行這個 HEX 檔案，請遵循這些步驟。", "description": "Message in dialog shown after the user saves the project as a hex file." }, + "privacy-policy": { + "defaultMessage": "隱私權政策", + "description": "Privacy policy menu option text" + }, "project-actions": { "defaultMessage": "專案動作", "description": "Aria label for the bar with project actions" diff --git a/src/deployment/index.ts b/src/deployment/index.ts index 03f8c7c06..62ddfae3d 100644 --- a/src/deployment/index.ts +++ b/src/deployment/index.ts @@ -39,6 +39,7 @@ export interface DeploymentConfig { supportLink?: string; guideLink?: string; termsOfUseLink?: string; + privacyPolicyLink?: string; translationLink?: string; logging: Logging; diff --git a/src/messages/ui.ca.json b/src/messages/ui.ca.json index 6fcf67da5..0403d4130 100644 --- a/src/messages/ui.ca.json +++ b/src/messages/ui.ca.json @@ -414,7 +414,7 @@ "cookies-action": [ { "type": 0, - "value": "Cookies" + "value": "Galetes" } ], "copied": [ @@ -1283,6 +1283,12 @@ "value": "." } ], + "privacy-policy": [ + { + "type": 0, + "value": "Política de privadesa" + } + ], "project-actions": [ { "type": 0, diff --git a/src/messages/ui.de.json b/src/messages/ui.de.json index fa372fead..6121b4641 100644 --- a/src/messages/ui.de.json +++ b/src/messages/ui.de.json @@ -87,6 +87,10 @@ ], "type": 8, "value": "link" + }, + { + "type": 0, + "value": "." } ], "api-tab": [ @@ -180,7 +184,7 @@ }, { "type": 0, - "value": " hinzufügen" + "value": " hinzufügen?" } ], "choose-main-add-module": [ @@ -348,7 +352,7 @@ "confirm-replace-title": [ { "type": 0, - "value": "Projekt-Ersetzen bestätigen" + "value": "Zurücksetzen bestätigen" } ], "confirm-replace-with-idea": [ @@ -470,7 +474,7 @@ "create-action": [ { "type": 0, - "value": "Erstelle" + "value": "Erstellen" } ], "create-file-action": [ @@ -502,13 +506,13 @@ } ], "delete-file-action": [ - { - "type": 0, - "value": "Lösche " - }, { "type": 1, "value": "name" + }, + { + "type": 0, + "value": " löschen" } ], "deleted-file": [ @@ -740,7 +744,7 @@ "highlight-code-structure": [ { "type": 0, - "value": "Code-Struktur hervorheben" + "value": "Codestruktur hervorheben" } ], "highlight-code-structure-full": [ @@ -752,7 +756,7 @@ "highlight-code-structure-none": [ { "type": 0, - "value": "Nichts" + "value": "Aus" } ], "highlight-code-structure-simple": [ @@ -1222,7 +1226,7 @@ "open-hover": [ { "type": 0, - "value": "Eine hex- oder Python-Datei öffnen oder andere Dateien hinzufügen" + "value": "Eine HEX- oder Python-Datei öffnen oder andere Dateien hinzufügen." } ], "options": [ @@ -1353,6 +1357,12 @@ "value": "." } ], + "privacy-policy": [ + { + "type": 0, + "value": "Datenschutzerklärung" + } + ], "project-actions": [ { "type": 0, @@ -1526,7 +1536,7 @@ "save-python-action": [ { "type": 0, - "value": "Python-Script speichern" + "value": "Python-Skript speichern" } ], "search": [ @@ -1580,7 +1590,7 @@ "serial-help-ctrl-c": [ { "type": 0, - "value": "Verwende das Tatstaturkürzel " + "value": "Verwende den Tastenkürzel " }, { "children": [ @@ -1608,7 +1618,7 @@ }, { "type": 0, - "value": " um das Programm abzuhalten. Danach kannst du Python-Befehle eingeben, die MicroPython ausführen soll. Das ist eine großartige Möglichkeit, mit etwas Neuem zu experimentieren." + "value": " um das Programm anzuhalten. Danach kannst du Python-Befehle eingeben, die MicroPython ausführen soll. Das ist eine großartige Möglichkeit, mit etwas Neuem zu experimentieren." } ], "serial-help-ctrl-d": [ diff --git a/src/messages/ui.en.json b/src/messages/ui.en.json index 311634217..6ecd15c8f 100644 --- a/src/messages/ui.en.json +++ b/src/messages/ui.en.json @@ -1317,6 +1317,12 @@ "value": "." } ], + "privacy-policy": [ + { + "type": 0, + "value": "Privacy policy" + } + ], "project-actions": [ { "type": 0, diff --git a/src/messages/ui.es-es.json b/src/messages/ui.es-es.json index e7e2c17f5..1274a6302 100644 --- a/src/messages/ui.es-es.json +++ b/src/messages/ui.es-es.json @@ -342,7 +342,7 @@ "confirm-save-hint": [ { "type": 0, - "value": "Cancela y pulsa Guardar para guardar una copia de tu proyecto." + "value": "Cancela y utiliza Guardar para conservar una copia de tu proyecto." } ], "connect-action": [ @@ -1317,6 +1317,12 @@ "value": "." } ], + "privacy-policy": [ + { + "type": 0, + "value": "Política de privacidad" + } + ], "project-actions": [ { "type": 0, @@ -1944,7 +1950,7 @@ "simulator-gesture-down": [ { "type": 0, - "value": "logo abajo" + "value": "abajo" } ], "simulator-gesture-face-down": [ @@ -1998,7 +2004,7 @@ "simulator-gesture-up": [ { "type": 0, - "value": "logo arriba" + "value": "arriba" } ], "simulator-hide": [ diff --git a/src/messages/ui.fr.json b/src/messages/ui.fr.json index df5a2e339..22281fde2 100644 --- a/src/messages/ui.fr.json +++ b/src/messages/ui.fr.json @@ -1317,6 +1317,12 @@ "value": "." } ], + "privacy-policy": [ + { + "type": 0, + "value": "Politique de confidentialité" + } + ], "project-actions": [ { "type": 0, diff --git a/src/messages/ui.ja.json b/src/messages/ui.ja.json index ba56a706a..a0fb5e624 100644 --- a/src/messages/ui.ja.json +++ b/src/messages/ui.ja.json @@ -434,7 +434,7 @@ "cookies-action": [ { "type": 0, - "value": "Cookies" + "value": "Cookieについて" } ], "copied": [ @@ -1321,6 +1321,12 @@ "value": "。" } ], + "privacy-policy": [ + { + "type": 0, + "value": "プライバシーポリシー" + } + ], "project-actions": [ { "type": 0, diff --git a/src/messages/ui.ko.json b/src/messages/ui.ko.json index ade0f3fb2..dfc207ae4 100644 --- a/src/messages/ui.ko.json +++ b/src/messages/ui.ko.json @@ -1325,6 +1325,12 @@ "value": "." } ], + "privacy-policy": [ + { + "type": 0, + "value": "개인정보 보호 정책" + } + ], "project-actions": [ { "type": 0, diff --git a/src/messages/ui.nl.json b/src/messages/ui.nl.json index a5be7878e..a97c7e0dc 100644 --- a/src/messages/ui.nl.json +++ b/src/messages/ui.nl.json @@ -1337,6 +1337,12 @@ "value": "." } ], + "privacy-policy": [ + { + "type": 0, + "value": "Privacybeleid" + } + ], "project-actions": [ { "type": 0, diff --git a/src/messages/ui.zh-cn.json b/src/messages/ui.zh-cn.json index 1c3b73e02..2b831a38a 100644 --- a/src/messages/ui.zh-cn.json +++ b/src/messages/ui.zh-cn.json @@ -1321,6 +1321,12 @@ "value": "。" } ], + "privacy-policy": [ + { + "type": 0, + "value": "隐私政策" + } + ], "project-actions": [ { "type": 0, diff --git a/src/messages/ui.zh-tw.json b/src/messages/ui.zh-tw.json index 453b80650..396efd941 100644 --- a/src/messages/ui.zh-tw.json +++ b/src/messages/ui.zh-tw.json @@ -1317,6 +1317,12 @@ "value": "。" } ], + "privacy-policy": [ + { + "type": 0, + "value": "隱私權政策" + } + ], "project-actions": [ { "type": 0, diff --git a/src/workbench/HelpMenu.tsx b/src/workbench/HelpMenu.tsx index 521809c88..d8f188df2 100644 --- a/src/workbench/HelpMenu.tsx +++ b/src/workbench/HelpMenu.tsx @@ -112,6 +112,17 @@ const HelpMenu = ({ size, ...props }: HelpMenuProps) => { )} + {deployment.privacyPolicyLink && ( + } + > + + + )} {deployment.compliance.manageCookies && ( } onClick={handleCookies}>