From 9d5374b2f949eba61a6f7897f000b7cdd884955f Mon Sep 17 00:00:00 2001 From: Bartosz Cichocki Date: Mon, 28 Mar 2022 08:43:46 +0200 Subject: [PATCH] [MOS-292] Update bluetooth translations Updated bluetooth pairing popup translations --- image/assets/lang/Deutsch.json | 11 ++++++++++- image/assets/lang/English.json | 6 +++--- image/assets/lang/Espanol.json | 9 +++++++++ image/assets/lang/Francais.json | 9 +++++++++ image/assets/lang/Polski.json | 9 +++++++++ image/assets/lang/Svenska.json | 9 +++++++++ .../apps-common/popups/BluetoothAuthenticatePopup.cpp | 4 ++-- 7 files changed, 51 insertions(+), 6 deletions(-) diff --git a/image/assets/lang/Deutsch.json b/image/assets/lang/Deutsch.json index 16daddf1101632d33d13a04821d9a9928a525804..8d4304fcd6ff454ff3dbd502fe813bc7791abf86 100644 --- a/image/assets/lang/Deutsch.json +++ b/image/assets/lang/Deutsch.json @@ -356,11 +356,20 @@ "app_settings_bluetooth_main": "Bluetooth", "app_settings_bluetooth_phone_name": "Name des Telefons", "app_settings_bluetooth_phone_visibility": "Sichtbarkeit des Telefons", - "app_settings_bluetooth_enter_passkey": "Passkey eingeben:", + "app_settings_bluetooth_enter_passkey": "Passwort eingeben:", "app_settings_bluetooth_init_error_message": "Bluetooth-Initialisierungsprozess fehlgeschlagen.", "app_settings_bluetooth_pairing_error_message": " Kopplungsvorgang fehlgeschlagen.

Überprüfen Sie das Gerät und versuchen Sie es erneut.", "app_settings_bluetooth_unpairing_error_message": " Entkopplungsvorgang fehlgeschlagen.

Überprüfen Sie das Gerät und versuchen Sie es erneut.", "app_settings_bluetooth_connecting_error_message": " Verbindungsvorgang fehlgeschlagen.

Überprüfen Sie das Gerät und versuchen Sie es erneut.", + "bluetooth_popup": "Bluetooth", + "bluetooth_popup_pin": "PIN eingeben:", + "bluetooth_popup_passkey": "Passwort eingeben:", + "bluetooth_popup_pair_cancel_code": "Gerät $DEVICE möchte sich
mit Ihrem Pure verbinden. Bitte bestätigen Sie den Code: $CODE", + "bluetooth_popup_pair_cancel_no_code": "Gerät $DEVICE möchte sich
mit Ihrem Pure verbinden.", + "bluetooth_popup_confirm": "Bestätigen", + "bluetooth_popup_cancel": "Abbrechen", + "bluetooth_info_popup_success": "Ihr Handy ist mit $DEVICE gekoppelt.", + "bluetooth_info_popup_error": "Der Kopplungsvorgang mit $DEVICE

ist fehlgeschlagen. Fehlercode: $ERROR", "app_settings_net": "Netzwerk", "app_settings_disp_key": "Display und Tastenfeld", "app_settings_display_display_light": "Displaylicht", diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json index 105ce8b538321598c4094f41442caa6859941ee1..6fc12f5c74dea564cc3e5ba873854e0ab3d293f1 100644 --- a/image/assets/lang/English.json +++ b/image/assets/lang/English.json @@ -597,9 +597,9 @@ "bluetooth_popup": "Bluetooth", "bluetooth_popup_pin": "Enter PIN:", "bluetooth_popup_passkey": "Enter passkey:", - "bluetooth_popup_pair_cancel_code": "Device $DEVICE would like to pair with your phone. Please confirm the code is the same on the device: $CODE", - "bluetooth_popup_pair_cancel_no_code": "Device $DEVICE would like to pair with your phone.", - "bluetooth_popup_pair": "Pair", + "bluetooth_popup_pair_cancel_code": "Device $DEVICE would like to pair
with your Pure. Please confirm
the code: $CODE", + "bluetooth_popup_pair_cancel_no_code": "Device $DEVICE would like to pair with your Pure.", + "bluetooth_popup_confirm": "Confirm", "bluetooth_popup_cancel": "Cancel", "bluetooth_info_popup_success": "Your phone is paired with:

$DEVICE", "bluetooth_info_popup_error": "Pairing process with $DEVICE

has failed. Error code: $ERROR", diff --git a/image/assets/lang/Espanol.json b/image/assets/lang/Espanol.json index 606182713bcdbf189e8d4460d6630d3e610e75be..518120efd1ab3e63fa4d6396af270f42cbca22b9 100644 --- a/image/assets/lang/Espanol.json +++ b/image/assets/lang/Espanol.json @@ -361,6 +361,15 @@ "app_settings_bluetooth_pairing_error_message": "Error en el proceso de emparejamiento.

Comprueba el dispositivo e INTÉNTALO DE NUEVO.", "app_settings_bluetooth_unpairing_error_message": "Error en el proceso de desemparejamiento.

Comprueba el dispositivo e INTÉNTALO DE NUEVO.", "app_settings_bluetooth_connecting_error_message": "Error en el proceso de conexión.

Comprueba el dispositivo e INTÉNTALO DE NUEVO.", + "bluetooth_popup": "Bluetooth", + "bluetooth_popup_pin": "Introduzca en PIN:", + "bluetooth_popup_passkey": "Introduzca la contraseña:", + "bluetooth_popup_pair_cancel_code": "El dispositivo $DEVICE quiere emparejarse con tu Pure.
Debes confirmar el código: $CODE", + "bluetooth_popup_pair_cancel_no_code": "El dispositivo $DEVICE quiere emparejarse con tu Pure.", + "bluetooth_popup_confirm": "Confirmar", + "bluetooth_popup_cancel": "Cancelar", + "bluetooth_info_popup_success": "Su teléfono está emparejado con:

$DEVICE", + "bluetooth_info_popup_error": "Proceso de vinculación con $DEVICE

ha fallado. Código de error: $ERROR", "app_settings_net": "Red", "app_settings_disp_key": "Pantalla y teclado numérico", "app_settings_display_display_light": "Luz de pantalla", diff --git a/image/assets/lang/Francais.json b/image/assets/lang/Francais.json index 46ae27943f7360703b4794c79de4da6ed28253a1..62ac2363499dd49fc4e71135f6107f28fd439b0e 100644 --- a/image/assets/lang/Francais.json +++ b/image/assets/lang/Francais.json @@ -330,6 +330,15 @@ "app_settings_bluetooth_pairing_error_message": "Pairing process has failed.

Check the device and TRY AGAIN.", "app_settings_bluetooth_unpairing_error_message": "Unpairing process has failed.

Check the device and TRY AGAIN.", "app_settings_bluetooth_connecting_error_message": "Connection process has failed.

Check the device and TRY AGAIN.", + "bluetooth_popup": "Bluetooth", + "bluetooth_popup_pin": "Entrez le PIN:", + "bluetooth_popup_passkey": "Entrer le mot de passe:", + "bluetooth_popup_pair_cancel_code": "Le dispositif $DEVICE souhaite être associé à votre Pure.
Veuillez confirmer le code: $CODE", + "bluetooth_popup_pair_cancel_no_code": "Le dispositif $DEVICE souhaite être associé à votre Pure.", + "bluetooth_popup_confirm": "Confirmer", + "bluetooth_popup_cancel": "Annuler", + "bluetooth_info_popup_success": "Votre téléphone est couplé avec:

$DEVICE", + "bluetooth_info_popup_error": "Le processus de jumelage avec $DEVICE

a échoué. Code d'erreur: $ERROR", "app_settings_net": "Réseau", "app_settings_disp_key": "Affichage et clavier", "app_settings_display_display_light": "Lumière d'affichage", diff --git a/image/assets/lang/Polski.json b/image/assets/lang/Polski.json index fa5cd6b1ee85fdc1084f049bb18b60b882920c9e..faf839c112ecb2124e396f14f3bb547d6314f8ec 100644 --- a/image/assets/lang/Polski.json +++ b/image/assets/lang/Polski.json @@ -368,6 +368,15 @@ "app_settings_bluetooth_pairing_error_message": "Proces parowania zakończony niepowodzeniem.

Sprawdź urządzenie i SPRÓBUJ PONOWNIE.", "app_settings_bluetooth_unpairing_error_message": "Proces odłączania zakończony niepowodzeniem.

Sprawdź urządzenie i SPRÓBUJ PONOWNIE.", "app_settings_bluetooth_connecting_error_message": "Proces łączenia zakończony niepowodzeniem.

Sprawdź urządzenie i SPRÓBUJ PONOWNIE.", + "bluetooth_popup": "Bluetooth", + "bluetooth_popup_pin": "Wpisz PIN:", + "bluetooth_popup_passkey": "Wpisz klucz dostępu:", + "bluetooth_popup_pair_cancel_code": "Urządzenie $DEVICE chce sparować się z Twoim telefonem.
Potwierdź klucz dostępu: $CODE", + "bluetooth_popup_pair_cancel_no_code": "Urządzenie $DEVICE chce sparować się z Twoim telefonem.", + "bluetooth_popup_confirm": "Potwierdź", + "bluetooth_popup_cancel": "Anuluj", + "bluetooth_info_popup_success": "Twój telefon jest sparowany z:

$DEVICE", + "bluetooth_info_popup_error": "Proces parowania z $DEVICE

nie powiódł się. Kod błędu: $ERROR", "app_settings_net": "Sieć", "app_settings_apps_alarm_clock_manual_volume": "Ręczna zmiana głośności", "app_settings_disp_key": "Ekran i klawiatura", diff --git a/image/assets/lang/Svenska.json b/image/assets/lang/Svenska.json index 0ff13b617d8af41c8fac162eaa8ba6b711e470cb..eaa4e485aad8f04cd1ff098e8febf8cc4a139adb 100644 --- a/image/assets/lang/Svenska.json +++ b/image/assets/lang/Svenska.json @@ -291,6 +291,15 @@ "app_settings_bluetooth_main": "Bluetooth", "app_settings_bluetooth_phone_name": "Telefonens namn", "app_settings_bluetooth_phone_visibility": "Telefonens synlighetsläge", + "bluetooth_popup": "Bluetooth", + "bluetooth_popup_pin": "Ange PIN:", + "bluetooth_popup_passkey": "Ange nyckel:", + "bluetooth_popup_pair_cancel_code": "Enheten $DEVICE skulle vilja para
ihop med din Pure.
Bekräfta koden: $CODE", + "bluetooth_popup_pair_cancel_no_code": "Enheten $DEVICE skulle vilja para
ihop med din Pure.", + "bluetooth_popup_confirm": "Bekräfta", + "bluetooth_popup_cancel": "Avbryt", + "bluetooth_info_popup_success": "Din telefon är ihopparad med:

$DEVICE", + "bluetooth_info_popup_error": "Kopplingsprocess med $DEVICE

misslyckades. Felkod: $ERROR", "app_settings_net": "Nätverk", "app_settings_disp_key": "Skärm och knappar", "app_settings_display_display_light": "Skärmbelysning", diff --git a/module-apps/apps-common/popups/BluetoothAuthenticatePopup.cpp b/module-apps/apps-common/popups/BluetoothAuthenticatePopup.cpp index 14974eae1d4a84e29cafa66ff60b5ca36ed6fbbc..1829602da30f8b2c9c8ad8b5349d70c8204d4f24 100644 --- a/module-apps/apps-common/popups/BluetoothAuthenticatePopup.cpp +++ b/module-apps/apps-common/popups/BluetoothAuthenticatePopup.cpp @@ -156,7 +156,7 @@ namespace gui {{"$DEVICE", std::string(authenticateParams->getDevice().name.data())}}); } - navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::confirm)); + navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::select)); auto hBox = new HBox(infoIcon, 0, 0, 0, 0); hBox->setMinimumSize(style::window::default_body_width, bluetooth::authenticate::buttons_input_h); @@ -168,7 +168,7 @@ namespace gui Label *option = new Label(hBox, 0, 0, 0, 0, ""); if (optionName == gui::bluetooth::authenticate::ButtonsOptions::Pair) { - option->setText(utils::translate("bluetooth_popup_pair")); + option->setText(utils::translate("bluetooth_popup_confirm")); option->activatedCallback = [&](Item &) -> bool { application->bus.sendUnicast(std::make_shared( true, authenticateParams->getDevice()),