~aleteoryx/muditaos

9d5374b2f949eba61a6f7897f000b7cdd884955f — Bartosz Cichocki 3 years ago ff77227 
[MOS-292] Update bluetooth translations

Updated bluetooth pairing popup translations
patch browse .tar.gz 
7 files changed, 51 insertions(+), 6 deletions(-)

M image/assets/lang/Deutsch.json
M image/assets/lang/English.json
M image/assets/lang/Espanol.json
M image/assets/lang/Francais.json
M image/assets/lang/Polski.json
M image/assets/lang/Svenska.json
M module-apps/apps-common/popups/BluetoothAuthenticatePopup.cpp

M image/assets/lang/Deutsch.json => image/assets/lang/Deutsch.json +10 -1
@@ 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": "<text weight='regular' size='27'>Bluetooth-Initialisierungsprozess fehlgeschlagen.</text>",
  "app_settings_bluetooth_pairing_error_message": "<text weight='regular' size='27'> Kopplungsvorgang fehlgeschlagen.<br></br>Überprüfen Sie das Gerät und </text> <text weight='bold' size='27'>versuchen Sie es erneut.</text>",
  "app_settings_bluetooth_unpairing_error_message": "<text weight='regular' size='27'> Entkopplungsvorgang fehlgeschlagen.<br></br>Überprüfen Sie das Gerät und </text> <text weight='bold' size='27'>versuchen Sie es erneut.</text>",
  "app_settings_bluetooth_connecting_error_message": "<text weight='regular' size='27'> Verbindungsvorgang fehlgeschlagen.<br></br>Überprüfen Sie das Gerät und </text> <text weight='bold' size='27'>versuchen Sie es erneut.</text>",
  "bluetooth_popup": "Bluetooth",
  "bluetooth_popup_pin": "PIN eingeben:",
  "bluetooth_popup_passkey": "Passwort eingeben:",
  "bluetooth_popup_pair_cancel_code": "<text>Gerät </text><text weight='bold'><token>$DEVICE</token></text><text> möchte sich<br /> mit Ihrem Pure verbinden. Bitte bestätigen Sie den Code: <text align='center' weight='bold'><token>$CODE</token></text></text>",
  "bluetooth_popup_pair_cancel_no_code": "<text>Gerät </text><text weight='bold'><token>$DEVICE</token></text><text> möchte sich<br /> mit Ihrem Pure verbinden.</text>",
  "bluetooth_popup_confirm": "Bestätigen",
  "bluetooth_popup_cancel": "Abbrechen",
  "bluetooth_info_popup_success": "<text>Ihr Handy ist mit <text weight='bold'><token>$DEVICE</token> gekoppelt.</text></text>",
  "bluetooth_info_popup_error": "<text>Der Kopplungsvorgang mit </text><text weight='bold'><token>$DEVICE</token></text><br></br><text> ist fehlgeschlagen. Fehlercode: <token>$ERROR</token></text>",
  "app_settings_net": "Netzwerk",
  "app_settings_disp_key": "Display und Tastenfeld",
  "app_settings_display_display_light": "Displaylicht",


M image/assets/lang/English.json => image/assets/lang/English.json +3 -3
@@ 597,9 597,9 @@
  "bluetooth_popup": "Bluetooth",
  "bluetooth_popup_pin": "Enter PIN:",
  "bluetooth_popup_passkey": "Enter passkey:",
  "bluetooth_popup_pair_cancel_code": "<text>Device </text><text weight='bold'><token>$DEVICE</token></text><text> would like to pair with your phone. Please confirm the code is the same on the device: <text align='center' weight='bold'><token>$CODE</token></text></text>",
  "bluetooth_popup_pair_cancel_no_code": "<text>Device </text><text weight='bold'><token>$DEVICE</token></text><text> would like to pair with your phone.</text>",
  "bluetooth_popup_pair": "Pair",
  "bluetooth_popup_pair_cancel_code": "<text>Device </text><text weight='bold'><token>$DEVICE</token></text><text> would like to pair<br /> with your Pure. Please confirm<br /> the code: <text align='center' weight='bold'><token>$CODE</token></text></text>",
  "bluetooth_popup_pair_cancel_no_code": "<text>Device </text><text weight='bold'><token>$DEVICE</token></text><text> would like to pair with your Pure.</text>",
  "bluetooth_popup_confirm": "Confirm",
  "bluetooth_popup_cancel": "Cancel",
  "bluetooth_info_popup_success": "<text>Your phone is paired with: <br></br></text><text weight='bold'><token>$DEVICE</token></text>",
  "bluetooth_info_popup_error": "<text>Pairing process with </text><text weight='bold'><token>$DEVICE</token></text><br></br><text> has failed. Error code: <token>$ERROR</token></text>",


M image/assets/lang/Espanol.json => image/assets/lang/Espanol.json +9 -0
@@ 361,6 361,15 @@
  "app_settings_bluetooth_pairing_error_message": "<text weight='regular' size='27'>Error en el proceso de emparejamiento.<br></br>Comprueba el dispositivo e </text> <text weight='bold' size='27'>INTÉNTALO DE NUEVO.</text>",
  "app_settings_bluetooth_unpairing_error_message": "<text weight='regular' size='27'>Error en el proceso de desemparejamiento.<br></br>Comprueba el dispositivo e </text> <text weight='bold' size='27'>INTÉNTALO DE NUEVO.</text>",
  "app_settings_bluetooth_connecting_error_message": "<text weight='regular' size='27'>Error en el proceso de conexión.<br></br>Comprueba el dispositivo e </text> <text weight='bold' size='27'>INTÉNTALO DE NUEVO.</text>",
  "bluetooth_popup": "Bluetooth",
  "bluetooth_popup_pin": "Introduzca en PIN:",
  "bluetooth_popup_passkey": "Introduzca la contraseña:",
  "bluetooth_popup_pair_cancel_code": "<text>El dispositivo </text><text weight='bold'><token>$DEVICE</token></text><text> quiere emparejarse con tu Pure.<br /> Debes confirmar el código: <text align='center' weight='bold'><token>$CODE</token></text></text>",
  "bluetooth_popup_pair_cancel_no_code": "<text>El dispositivo </text><text weight='bold'><token>$DEVICE</token></text><text> quiere emparejarse con tu Pure.</text>",
  "bluetooth_popup_confirm": "Confirmar",
  "bluetooth_popup_cancel": "Cancelar",
  "bluetooth_info_popup_success": "<text>Su teléfono está emparejado con: <br></br></text><text weight='bold'><token>$DEVICE</token></text>",
  "bluetooth_info_popup_error": "<text>Proceso de vinculación con </text><text weight='bold'><token>$DEVICE</token></text><br></br><text> ha fallado. Código de error: <token>$ERROR</token></text>",
  "app_settings_net": "Red",
  "app_settings_disp_key": "Pantalla y teclado numérico",
  "app_settings_display_display_light": "Luz de pantalla",


M image/assets/lang/Francais.json => image/assets/lang/Francais.json +9 -0
@@ 330,6 330,15 @@
  "app_settings_bluetooth_pairing_error_message": "<text weight='regular' size='27'>Pairing process has failed.<br></br>Check the device and </text> <text weight='bold' size='27'>TRY AGAIN.</text>",
  "app_settings_bluetooth_unpairing_error_message": "<text weight='regular' size='27'>Unpairing process has failed.<br></br>Check the device and </text> <text weight='bold' size='27'>TRY AGAIN.</text>",
  "app_settings_bluetooth_connecting_error_message": "<text weight='regular' size='27'>Connection process has failed.<br></br>Check the device and </text> <text weight='bold' size='27'>TRY AGAIN.</text>",
  "bluetooth_popup": "Bluetooth",
  "bluetooth_popup_pin": "Entrez le PIN:",
  "bluetooth_popup_passkey": "Entrer le mot de passe:",
  "bluetooth_popup_pair_cancel_code": "<text>Le dispositif </text><text weight='bold'><token>$DEVICE</token></text><text> souhaite être associé à votre Pure.<br /> Veuillez confirmer le code: <text align='center' weight='bold'><token>$CODE</token></text></text>",
  "bluetooth_popup_pair_cancel_no_code": "<text>Le dispositif </text><text weight='bold'><token>$DEVICE</token></text><text> souhaite être associé à votre Pure.</text>",
  "bluetooth_popup_confirm": "Confirmer",
  "bluetooth_popup_cancel": "Annuler",
  "bluetooth_info_popup_success": "<text>Votre téléphone est couplé avec: <br></br></text><text weight='bold'><token>$DEVICE</token></text>",
  "bluetooth_info_popup_error": "<text>Le processus de jumelage avec </text><text weight='bold'><token>$DEVICE</token></text><br></br><text> a échoué. Code d'erreur: <token>$ERROR</token></text>",
  "app_settings_net": "Réseau",
  "app_settings_disp_key": "Affichage et clavier",
  "app_settings_display_display_light": "Lumière d'affichage",


M image/assets/lang/Polski.json => image/assets/lang/Polski.json +9 -0
@@ 368,6 368,15 @@
  "app_settings_bluetooth_pairing_error_message": "<text weight='regular' size='27'>Proces parowania zakończony niepowodzeniem.<br></br>Sprawdź urządzenie i </text><text weight='bold' size='27'>SPRÓBUJ PONOWNIE.</text>",
  "app_settings_bluetooth_unpairing_error_message": "<text weight='regular' size='27'>Proces odłączania zakończony niepowodzeniem.<br></br>Sprawdź urządzenie i </text><text weight='bold' size='27'>SPRÓBUJ PONOWNIE.</text>",
  "app_settings_bluetooth_connecting_error_message": "<text weight='regular' size='27'>Proces łączenia zakończony niepowodzeniem.<br></br>Sprawdź urządzenie i </text><text weight='bold' size='27'>SPRÓBUJ PONOWNIE.</text>",
  "bluetooth_popup": "Bluetooth",
  "bluetooth_popup_pin": "Wpisz PIN:",
  "bluetooth_popup_passkey": "Wpisz klucz dostępu:",
  "bluetooth_popup_pair_cancel_code": "<text>Urządzenie </text><text weight='bold'><token>$DEVICE</token></text><text> chce sparować się z Twoim telefonem.<br /> Potwierdź klucz dostępu: <text align='center' weight='bold'><token>$CODE</token></text></text>",
  "bluetooth_popup_pair_cancel_no_code": "<text>Urządzenie </text><text weight='bold'><token>$DEVICE</token></text><text> chce sparować się z Twoim telefonem.</text>",
  "bluetooth_popup_confirm": "Potwierdź",
  "bluetooth_popup_cancel": "Anuluj",
  "bluetooth_info_popup_success": "<text>Twój telefon jest sparowany z: <br></br></text><text weight='bold'><token>$DEVICE</token></text>",
  "bluetooth_info_popup_error": "<text>Proces parowania z </text><text weight='bold'><token>$DEVICE</token></text><br></br><text> nie powiódł się. Kod błędu: <token>$ERROR</token></text>",
  "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",


M image/assets/lang/Svenska.json => image/assets/lang/Svenska.json +9 -0
@@ 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": "<text>Enheten </text><text weight='bold'><token>$DEVICE</token></text><text> skulle vilja para<br /> ihop med din Pure.<br /> Bekräfta koden: <text align='center' weight='bold'><token>$CODE</token></text></text>",
  "bluetooth_popup_pair_cancel_no_code": "<text>Enheten </text><text weight='bold'><token>$DEVICE</token></text><text> skulle vilja para<br /> ihop med din Pure.</text>",
  "bluetooth_popup_confirm": "Bekräfta",
  "bluetooth_popup_cancel": "Avbryt",
  "bluetooth_info_popup_success": "<text>Din telefon är ihopparad med: <br></br></text><text weight='bold'><token>$DEVICE</token></text>",
  "bluetooth_info_popup_error": "<text>Kopplingsprocess med </text><text weight='bold'><token>$DEVICE</token></text><br></br><text> misslyckades. Felkod: <token>$ERROR</token></text>",
  "app_settings_net": "Nätverk",
  "app_settings_disp_key": "Skärm och knappar",
  "app_settings_display_display_light": "Skärmbelysning",


M module-apps/apps-common/popups/BluetoothAuthenticatePopup.cpp => module-apps/apps-common/popups/BluetoothAuthenticatePopup.cpp +2 -2
@@ 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<message::bluetooth::ResponseAuthenticatePairCancel>(
                                                     true, authenticateParams->getDevice()),