From 50449158bcb91391d17219dd2d06ef846c2da94f Mon Sep 17 00:00:00 2001 From: "Tom Dewey tom.dewey@raspberrypi.com" Date: Mon, 16 Oct 2023 13:09:34 +0100 Subject: [PATCH] i18n: Advanced settings -> OS customization Per a request from the Raspberry Pi Communications team, change 'Advanced Settings' and 'Image customization' to read 'OS customization'. This is to avoid amibuguity in the English, where Image_r_ and Image may be conflated when reading at speed. Regrettably, this breaks the existing translations. To prevent confusion, explicitly delete the existing translations - as they're almost certainly not valid with the reworded meaning. --- README.md | 4 ++-- src/OptionsPopup.qml | 6 +++--- src/UseSavedSettingsPopup.qml | 12 ++++++------ src/i18n/rpi-imager_ca.ts | 8 ++++---- src/i18n/rpi-imager_de.ts | 8 ++++---- src/i18n/rpi-imager_en.ts | 4 ++-- src/i18n/rpi-imager_es.ts | 8 ++++---- src/i18n/rpi-imager_fr.ts | 8 ++++---- src/i18n/rpi-imager_it.ts | 8 ++++---- src/i18n/rpi-imager_ja.ts | 8 ++++---- src/i18n/rpi-imager_ko.ts | 8 ++++---- src/i18n/rpi-imager_nl.ts | 8 ++++---- src/i18n/rpi-imager_ru.ts | 8 ++++---- src/i18n/rpi-imager_sk.ts | 8 ++++---- src/i18n/rpi-imager_sl.ts | 8 ++++---- src/i18n/rpi-imager_tr.ts | 4 ++-- src/i18n/rpi-imager_uk.ts | 8 ++++---- src/i18n/rpi-imager_zh.ts | 8 ++++---- 18 files changed, 67 insertions(+), 67 deletions(-) diff --git a/README.md b/README.md index cf5d49f..f52184c 100644 --- a/README.md +++ b/README.md @@ -197,8 +197,8 @@ On macOS, disable it by editing the property list for the application: defaults write org.raspberrypi.Imager.plist telemetry -bool NO ``` -### Advanced options +### OS Customization -When using the app, press CTRL + SHIFT + X to reveal the **Advanced options** dialog. +When using the app, press CTRL + SHIFT + X to reveal the **OS Customization** dialog. In here, you can specify several things you would otherwise set in the boot configuration files. For example, you can enable SSH, set the Wi-Fi login, and specify your locale settings for the system image. diff --git a/src/OptionsPopup.qml b/src/OptionsPopup.qml index 568d1cd..db43505 100644 --- a/src/OptionsPopup.qml +++ b/src/OptionsPopup.qml @@ -17,7 +17,7 @@ Window { maximumWidth: width minimumHeight: 125 height: Math.min(750, cl.implicitHeight) - title: qsTr("Advanced options") + title: qsTr("OS Customization") property bool initialized: false property bool hasSavedSettings: false @@ -49,7 +49,7 @@ Window { RowLayout { Label { - text: qsTr("Image customization options") + text: qsTr("OS customization options") } ComboBox { id: comboSaveSettings @@ -539,7 +539,7 @@ Window { /* Lacking an easy cross-platform to fetch keyboard layout from host system, just default to "gb" for people in UK time zone for now, and "us" for everyone else */ - if (tz == "Europe/London") { + if (tz === "Europe/London") { fieldKeyboardLayout.currentIndex = fieldKeyboardLayout.find("gb") } else { fieldKeyboardLayout.currentIndex = fieldKeyboardLayout.find("us") diff --git a/src/UseSavedSettingsPopup.qml b/src/UseSavedSettingsPopup.qml index f002763..d17790d 100644 --- a/src/UseSavedSettingsPopup.qml +++ b/src/UseSavedSettingsPopup.qml @@ -70,7 +70,7 @@ Popup { Layout.topMargin: 10 font.family: roboto.name font.bold: true - text: qsTr("Use image customisation?") + text: qsTr("Use OS customization?") } Text { @@ -85,7 +85,7 @@ Popup { Layout.topMargin: 25 Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Accessible.name: text.replace(/<\/?[^>]+(>|$)/g, "") - text: qsTr("Would you like to apply image customization settings?") + text: qsTr("Would you like to apply OS customization settings?") } RowLayout { @@ -95,10 +95,10 @@ Popup { id: buttons ImButton { - text: qsTr("NO") + text: qsTr("EDIT SETTINGS") onClicked: { msgpopup.close() - msgpopup.no() + msgpopup.editSettings() } Material.foreground: activeFocus ? "#d1dcfb" : "#ffffff" Material.background: "#c51a4a" @@ -127,10 +127,10 @@ Popup { } ImButton { - text: qsTr("EDIT SETTINGS") + text: qsTr("NO") onClicked: { msgpopup.close() - msgpopup.editSettings() + msgpopup.no() } Material.foreground: activeFocus ? "#d1dcfb" : "#ffffff" Material.background: "#c51a4a" diff --git a/src/i18n/rpi-imager_ca.ts b/src/i18n/rpi-imager_ca.ts index 4239a25..123d79f 100644 --- a/src/i18n/rpi-imager_ca.ts +++ b/src/i18n/rpi-imager_ca.ts @@ -282,13 +282,13 @@ OptionsPopup - Advanced options - Opcions avançades + OS customization + - Image customization options - Opcions de personalització de les imatges + OS customization options + diff --git a/src/i18n/rpi-imager_de.ts b/src/i18n/rpi-imager_de.ts index e252d53..a5f15bd 100644 --- a/src/i18n/rpi-imager_de.ts +++ b/src/i18n/rpi-imager_de.ts @@ -319,13 +319,13 @@ OptionsPopup - Advanced options - Erweiterte Optionen + OS customization + - Image customization options - OS-Modifizierungen + OS customization options + diff --git a/src/i18n/rpi-imager_en.ts b/src/i18n/rpi-imager_en.ts index 0a302ee..16cb85c 100644 --- a/src/i18n/rpi-imager_en.ts +++ b/src/i18n/rpi-imager_en.ts @@ -278,12 +278,12 @@ OptionsPopup - Advanced options + OS customization - Image customization options + OS customization options diff --git a/src/i18n/rpi-imager_es.ts b/src/i18n/rpi-imager_es.ts index 8d35c96..d64b7c6 100644 --- a/src/i18n/rpi-imager_es.ts +++ b/src/i18n/rpi-imager_es.ts @@ -282,13 +282,13 @@ OptionsPopup - Advanced options - Opciones avanzadas + OS customization + - Image customization options - Opciones de personalización de imagen + OS customization options + diff --git a/src/i18n/rpi-imager_fr.ts b/src/i18n/rpi-imager_fr.ts index dabf454..e07417a 100644 --- a/src/i18n/rpi-imager_fr.ts +++ b/src/i18n/rpi-imager_fr.ts @@ -318,13 +318,13 @@ OptionsPopup - Advanced options - Réglages avancés + OS customization + - Image customization options - Options de personnalisation de l'image + OS customization options + diff --git a/src/i18n/rpi-imager_it.ts b/src/i18n/rpi-imager_it.ts index d328c52..67bb9e1 100644 --- a/src/i18n/rpi-imager_it.ts +++ b/src/i18n/rpi-imager_it.ts @@ -319,13 +319,13 @@ Aggiungi sia 'rpi-imager.exe' che 'fat32format.exe' all&apos OptionsPopup - Advanced options - Opzioni avanzate + OS customization + - Image customization options - Opzioni personalizzazione immagine + OS customization options + diff --git a/src/i18n/rpi-imager_ja.ts b/src/i18n/rpi-imager_ja.ts index 0268bda..f689f50 100644 --- a/src/i18n/rpi-imager_ja.ts +++ b/src/i18n/rpi-imager_ja.ts @@ -318,13 +318,13 @@ OptionsPopup - Advanced options - 詳細な設定 + OS customization + - Image customization options - イメージカスタマイズオプション + OS customization options + diff --git a/src/i18n/rpi-imager_ko.ts b/src/i18n/rpi-imager_ko.ts index e1a36f3..d2602e1 100644 --- a/src/i18n/rpi-imager_ko.ts +++ b/src/i18n/rpi-imager_ko.ts @@ -318,13 +318,13 @@ OptionsPopup - Advanced options - 고급 옵션 + OS customization + - Image customization options - 이미지 사용자 정의 옵션 + OS customization options + diff --git a/src/i18n/rpi-imager_nl.ts b/src/i18n/rpi-imager_nl.ts index 0786b63..d2ce1bc 100644 --- a/src/i18n/rpi-imager_nl.ts +++ b/src/i18n/rpi-imager_nl.ts @@ -318,13 +318,13 @@ OptionsPopup - Advanced options - Geavanceerde instellingen + OS customization + - Image customization options - Image instellingen + OS customization options + diff --git a/src/i18n/rpi-imager_ru.ts b/src/i18n/rpi-imager_ru.ts index 8b9062e..e97ac87 100644 --- a/src/i18n/rpi-imager_ru.ts +++ b/src/i18n/rpi-imager_ru.ts @@ -318,13 +318,13 @@ OptionsPopup - Advanced options - Дополнительные параметры + OS customization + - Image customization options - Параметры настройки образа + OS customization options + diff --git a/src/i18n/rpi-imager_sk.ts b/src/i18n/rpi-imager_sk.ts index be70d81..a3578ab 100644 --- a/src/i18n/rpi-imager_sk.ts +++ b/src/i18n/rpi-imager_sk.ts @@ -318,13 +318,13 @@ OptionsPopup - Advanced options - Pokročilé možnosti + OS customization + - Image customization options - Možnosti úprav obrazu + OS customization options + diff --git a/src/i18n/rpi-imager_sl.ts b/src/i18n/rpi-imager_sl.ts index 07965dc..4624545 100644 --- a/src/i18n/rpi-imager_sl.ts +++ b/src/i18n/rpi-imager_sl.ts @@ -318,13 +318,13 @@ OptionsPopup - Advanced options - Napredne možnosti + OS customization + - Image customization options - Uporabi opcije prilagoditve slike diska + OS customization options + diff --git a/src/i18n/rpi-imager_tr.ts b/src/i18n/rpi-imager_tr.ts index 42f9b86..53abf54 100644 --- a/src/i18n/rpi-imager_tr.ts +++ b/src/i18n/rpi-imager_tr.ts @@ -290,12 +290,12 @@ OptionsPopup - Advanced options + OS customization - Image customization options + OS customization options diff --git a/src/i18n/rpi-imager_uk.ts b/src/i18n/rpi-imager_uk.ts index cf8f099..3cdb6cf 100644 --- a/src/i18n/rpi-imager_uk.ts +++ b/src/i18n/rpi-imager_uk.ts @@ -282,13 +282,13 @@ OptionsPopup - Advanced options - Розширені налаштування + OS customization + - Image customization options - Налаштування образу + OS customization options + diff --git a/src/i18n/rpi-imager_zh.ts b/src/i18n/rpi-imager_zh.ts index 3ab8a83..cb83a6a 100644 --- a/src/i18n/rpi-imager_zh.ts +++ b/src/i18n/rpi-imager_zh.ts @@ -306,13 +306,13 @@ OptionsPopup - Advanced options - 高级设置 + OS customization + - Image customization options - 镜像自定义选项 + OS customization options +