From c2890b0fba906ae3f32ca753f3af68bc5422efba Mon Sep 17 00:00:00 2001 From: Ingo-FP-Angel Date: Tue, 2 Feb 2021 13:40:18 +0100 Subject: [PATCH 1/4] Add 'USB debugging' to instructional text as option name differs on some phones --- src/main/resources/lang/translation.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/lang/translation.properties b/src/main/resources/lang/translation.properties index 505d05c7..69821f4f 100644 --- a/src/main/resources/lang/translation.properties +++ b/src/main/resources/lang/translation.properties @@ -62,8 +62,8 @@ devMode_instr_tap7=Tap 7 times on 'Build number' debugADB_mTitle=Enable the Developer mode (Part 2) debugADB_instr_settings=Open the 'Settings' menu again debugADB_instr_search=Type 'Debug' in search bar -debugADB_instr_androidDebug=Tap on 'Android debugging' -debugADB_instr_debugOn=Switch on 'Android Debug' +debugADB_instr_androidDebug=Tap on 'Android debugging' / 'USB debugging' +debugADB_instr_debugOn=Switch on 'Android Debug' / 'USB Debug' debugADB_instr_tapeOK=Tap 'Ok' on pop up to confirm Allow USB debugging debugADB_instr_acceptCertificate=if asked, Tick the checkbox and validate the message @@ -249,4 +249,4 @@ stepTitle_formatDataTurnOff = Format data and turn off stepTitle_restartRecovery = Restart in Recovery mode stepTitle_installOS = /e/ Installation stepTitle_resizeDataPartition = Resize Data partition -stepTitle_StartInFastbootFP3 = Start device in Fastboot mode \ No newline at end of file +stepTitle_StartInFastbootFP3 = Start device in Fastboot mode -- GitLab From aedcbc3ce1261e591d60a25f78fa0be178241063 Mon Sep 17 00:00:00 2001 From: Ingo-FP-Angel Date: Tue, 2 Feb 2021 13:53:42 +0100 Subject: [PATCH 2/4] Add 'USB debugging' to instructional text as option name differs on some phones --- src/main/resources/lang/translation_en_EN.properties | 4 ++-- src/main/resources/lang/translation_eu.properties | 4 ++-- src/main/resources/lang/translation_fr_FR.properties | 4 ++-- src/main/resources/lang/translation_nl.properties | 4 ++-- src/main/resources/lang/translation_ru.properties | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/resources/lang/translation_en_EN.properties b/src/main/resources/lang/translation_en_EN.properties index fabdf27a..4f4dec33 100644 --- a/src/main/resources/lang/translation_en_EN.properties +++ b/src/main/resources/lang/translation_en_EN.properties @@ -54,8 +54,8 @@ devMode_instr_tap7=Tap 7 times on 'Build number' debugADB_mTitle=Enable the Developer mode (Part 2) debugADB_instr_settings=Open the 'Settings' menu again debugADB_instr_search=Type 'Debug' in search bar -debugADB_instr_androidDebug=Tap on 'Android debugging' -debugADB_instr_debugOn=Switch on 'Android Debug' +debugADB_instr_androidDebug=Tap on 'Android debugging' / 'USB debugging' +debugADB_instr_debugOn=Switch on 'Android Debug' / 'USB Debug' debugADB_instr_tapeOK=Tap 'Ok' on pop up to confirm Allow USB debugging #detect diff --git a/src/main/resources/lang/translation_eu.properties b/src/main/resources/lang/translation_eu.properties index 28e315eb..f58da905 100644 --- a/src/main/resources/lang/translation_eu.properties +++ b/src/main/resources/lang/translation_eu.properties @@ -28,8 +28,8 @@ enableMTP_instr_settings=Ireki 'Garatzaileen aukerak' 'Ezarpenak' atalean enableMTP_mTitle=Gaitu 'USB bidez fitxategiak transferitzea' debugADB_instr_acceptCertificate=galdetuko balizu, markatu kontrol-laukia eta baliozkotu mezua debugADB_instr_tapeOK=Ikutu 'Ados' laster-leihoan USB arazketa onartzeko -debugADB_instr_debugOn=Gaitu 'Android arazketa' -debugADB_instr_androidDebug=Ikutu 'Android arazketa' aukeran +debugADB_instr_debugOn=Gaitu 'Android arazketa' / 'USB arazketa' +debugADB_instr_androidDebug=Ikutu 'Android arazketa' / 'USB arazketa' aukeran debugADB_instr_search=Idatzi 'Arazketa' bilaketa barran debugADB_instr_settings=Ireki 'Ezarpenak' menua berriro ere debugADB_mTitle=Gaitu Garatzaile modua (2. zatia) diff --git a/src/main/resources/lang/translation_fr_FR.properties b/src/main/resources/lang/translation_fr_FR.properties index dce11dc1..3b53dc66 100644 --- a/src/main/resources/lang/translation_fr_FR.properties +++ b/src/main/resources/lang/translation_fr_FR.properties @@ -50,8 +50,8 @@ devMode_instr_tap7=Tapez 7 fois sur le « Numéro de version » (ou « Numéro d debugADB_mTitle=Activer le mode développeur (Partie 2) debugADB_instr_settings=Ouvrez les « Paramètres » à nouveau debugADB_instr_search=Tapez « Débogage » dans la barre de recherche -debugADB_instr_androidDebug=Tapez sur « Débogage Android » -debugADB_instr_debugOn=Activez l'option « Débogage Android » +debugADB_instr_androidDebug=Tapez sur « Débogage Android » / « Débogage USB » +debugADB_instr_debugOn=Activez l'option « Débogage Android » / « Débogage USB » debugADB_instr_tapeOK=Appuyez sur « OK » pour confirmer Autoriser le débogage USB #detect # @TODO diff --git a/src/main/resources/lang/translation_nl.properties b/src/main/resources/lang/translation_nl.properties index d8306518..f1e0c6f5 100644 --- a/src/main/resources/lang/translation_nl.properties +++ b/src/main/resources/lang/translation_nl.properties @@ -55,10 +55,10 @@ devMode_instr_tap7=Tik 7 keer op 'Build-nummer' devMode_instr_build=Tik 'Build' in het zoekveld debugADB_instr_settings=Open nogmaals het 'Instellingen' menu debugADB_mTitle=Activeer Ontwikkelaar modus (Deelt 2) -debugADB_instr_androidDebug=Tik op 'Android-foutopsporing' +debugADB_instr_androidDebug=Tik op 'Android-foutopsporing' / 'USB-foutopsporing' debugADB_instr_search=Tik 'Debug' in het zoekveld debugADB_instr_tapeOK=Tip 'Ok' in het pop-up scherm om "USB-foutopsporing toestaan" te bevestigen -debugADB_instr_debugOn=Zet 'Android-foutopsporing' aan +debugADB_instr_debugOn=Zet 'Android-foutopsporing' / 'USB-foutopsporing' aan enableMTP_instr_settings=Open 'ontwikkelaar opties' in 'Instellingen' enableMTP_mTitle=Activeer 'USB file transfer' debugADB_instr_acceptCertificate=Bevestig het bericht middels de checkbox, indien gevraagd diff --git a/src/main/resources/lang/translation_ru.properties b/src/main/resources/lang/translation_ru.properties index e0c75d12..ec463a3b 100644 --- a/src/main/resources/lang/translation_ru.properties +++ b/src/main/resources/lang/translation_ru.properties @@ -77,8 +77,8 @@ enableMTP_instr_settings=Откройте "Для разработчиков" в enableMTP_mTitle=Включите "Передача фалов по USB" debugADB_instr_acceptCertificate=Если попросят, то установите флажок и подтвердите сообщение debugADB_instr_tapeOK=Нажмите «ОК» во всплывающем окне, чтобы подтвердить "Разрешить отладку по USB" -debugADB_instr_debugOn=Включите "Отладка Android" -debugADB_instr_androidDebug=Нажми на "Отладка Android" +debugADB_instr_debugOn=Включите "Отладка Android" / "Отладка USB" +debugADB_instr_androidDebug=Нажми на "Отладка Android" / "Отладка USB" debugADB_instr_search=Введите "Для разработчиков" в панеле поиска debugADB_instr_settings=Откройте меню "Настройки" снова debugADB_mTitle=Включение режима разработчика (Часть 2) -- GitLab From 6a8f5daaf935259fc45d72815751782b82a87252 Mon Sep 17 00:00:00 2001 From: Ingo-FP-Angel Date: Thu, 11 Feb 2021 18:56:33 +0100 Subject: [PATCH 3/4] Revert "Add 'USB debugging' to instructional text as option name differs on some phones" This reverts commit aedcbc3c --- src/main/resources/lang/translation_en_EN.properties | 4 ++-- src/main/resources/lang/translation_eu.properties | 4 ++-- src/main/resources/lang/translation_fr_FR.properties | 4 ++-- src/main/resources/lang/translation_nl.properties | 4 ++-- src/main/resources/lang/translation_ru.properties | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/resources/lang/translation_en_EN.properties b/src/main/resources/lang/translation_en_EN.properties index 4f4dec33..fabdf27a 100644 --- a/src/main/resources/lang/translation_en_EN.properties +++ b/src/main/resources/lang/translation_en_EN.properties @@ -54,8 +54,8 @@ devMode_instr_tap7=Tap 7 times on 'Build number' debugADB_mTitle=Enable the Developer mode (Part 2) debugADB_instr_settings=Open the 'Settings' menu again debugADB_instr_search=Type 'Debug' in search bar -debugADB_instr_androidDebug=Tap on 'Android debugging' / 'USB debugging' -debugADB_instr_debugOn=Switch on 'Android Debug' / 'USB Debug' +debugADB_instr_androidDebug=Tap on 'Android debugging' +debugADB_instr_debugOn=Switch on 'Android Debug' debugADB_instr_tapeOK=Tap 'Ok' on pop up to confirm Allow USB debugging #detect diff --git a/src/main/resources/lang/translation_eu.properties b/src/main/resources/lang/translation_eu.properties index f58da905..28e315eb 100644 --- a/src/main/resources/lang/translation_eu.properties +++ b/src/main/resources/lang/translation_eu.properties @@ -28,8 +28,8 @@ enableMTP_instr_settings=Ireki 'Garatzaileen aukerak' 'Ezarpenak' atalean enableMTP_mTitle=Gaitu 'USB bidez fitxategiak transferitzea' debugADB_instr_acceptCertificate=galdetuko balizu, markatu kontrol-laukia eta baliozkotu mezua debugADB_instr_tapeOK=Ikutu 'Ados' laster-leihoan USB arazketa onartzeko -debugADB_instr_debugOn=Gaitu 'Android arazketa' / 'USB arazketa' -debugADB_instr_androidDebug=Ikutu 'Android arazketa' / 'USB arazketa' aukeran +debugADB_instr_debugOn=Gaitu 'Android arazketa' +debugADB_instr_androidDebug=Ikutu 'Android arazketa' aukeran debugADB_instr_search=Idatzi 'Arazketa' bilaketa barran debugADB_instr_settings=Ireki 'Ezarpenak' menua berriro ere debugADB_mTitle=Gaitu Garatzaile modua (2. zatia) diff --git a/src/main/resources/lang/translation_fr_FR.properties b/src/main/resources/lang/translation_fr_FR.properties index 3b53dc66..dce11dc1 100644 --- a/src/main/resources/lang/translation_fr_FR.properties +++ b/src/main/resources/lang/translation_fr_FR.properties @@ -50,8 +50,8 @@ devMode_instr_tap7=Tapez 7 fois sur le « Numéro de version » (ou « Numéro d debugADB_mTitle=Activer le mode développeur (Partie 2) debugADB_instr_settings=Ouvrez les « Paramètres » à nouveau debugADB_instr_search=Tapez « Débogage » dans la barre de recherche -debugADB_instr_androidDebug=Tapez sur « Débogage Android » / « Débogage USB » -debugADB_instr_debugOn=Activez l'option « Débogage Android » / « Débogage USB » +debugADB_instr_androidDebug=Tapez sur « Débogage Android » +debugADB_instr_debugOn=Activez l'option « Débogage Android » debugADB_instr_tapeOK=Appuyez sur « OK » pour confirmer Autoriser le débogage USB #detect # @TODO diff --git a/src/main/resources/lang/translation_nl.properties b/src/main/resources/lang/translation_nl.properties index f1e0c6f5..d8306518 100644 --- a/src/main/resources/lang/translation_nl.properties +++ b/src/main/resources/lang/translation_nl.properties @@ -55,10 +55,10 @@ devMode_instr_tap7=Tik 7 keer op 'Build-nummer' devMode_instr_build=Tik 'Build' in het zoekveld debugADB_instr_settings=Open nogmaals het 'Instellingen' menu debugADB_mTitle=Activeer Ontwikkelaar modus (Deelt 2) -debugADB_instr_androidDebug=Tik op 'Android-foutopsporing' / 'USB-foutopsporing' +debugADB_instr_androidDebug=Tik op 'Android-foutopsporing' debugADB_instr_search=Tik 'Debug' in het zoekveld debugADB_instr_tapeOK=Tip 'Ok' in het pop-up scherm om "USB-foutopsporing toestaan" te bevestigen -debugADB_instr_debugOn=Zet 'Android-foutopsporing' / 'USB-foutopsporing' aan +debugADB_instr_debugOn=Zet 'Android-foutopsporing' aan enableMTP_instr_settings=Open 'ontwikkelaar opties' in 'Instellingen' enableMTP_mTitle=Activeer 'USB file transfer' debugADB_instr_acceptCertificate=Bevestig het bericht middels de checkbox, indien gevraagd diff --git a/src/main/resources/lang/translation_ru.properties b/src/main/resources/lang/translation_ru.properties index ec463a3b..e0c75d12 100644 --- a/src/main/resources/lang/translation_ru.properties +++ b/src/main/resources/lang/translation_ru.properties @@ -77,8 +77,8 @@ enableMTP_instr_settings=Откройте "Для разработчиков" в enableMTP_mTitle=Включите "Передача фалов по USB" debugADB_instr_acceptCertificate=Если попросят, то установите флажок и подтвердите сообщение debugADB_instr_tapeOK=Нажмите «ОК» во всплывающем окне, чтобы подтвердить "Разрешить отладку по USB" -debugADB_instr_debugOn=Включите "Отладка Android" / "Отладка USB" -debugADB_instr_androidDebug=Нажми на "Отладка Android" / "Отладка USB" +debugADB_instr_debugOn=Включите "Отладка Android" +debugADB_instr_androidDebug=Нажми на "Отладка Android" debugADB_instr_search=Введите "Для разработчиков" в панеле поиска debugADB_instr_settings=Откройте меню "Настройки" снова debugADB_mTitle=Включение режима разработчика (Часть 2) -- GitLab From c5b87060bf04738cbf6ee3b7ee5b23bfae1e9f49 Mon Sep 17 00:00:00 2001 From: Ingo-FP-Angel Date: Thu, 11 Feb 2021 19:00:59 +0100 Subject: [PATCH 4/4] Change phrasing that USB debugging might also be called Android debugging --- src/main/resources/lang/translation.properties | 2 +- src/main/resources/lang/translation_en_EN.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/lang/translation.properties b/src/main/resources/lang/translation.properties index 69821f4f..f963da0b 100644 --- a/src/main/resources/lang/translation.properties +++ b/src/main/resources/lang/translation.properties @@ -62,7 +62,7 @@ devMode_instr_tap7=Tap 7 times on 'Build number' debugADB_mTitle=Enable the Developer mode (Part 2) debugADB_instr_settings=Open the 'Settings' menu again debugADB_instr_search=Type 'Debug' in search bar -debugADB_instr_androidDebug=Tap on 'Android debugging' / 'USB debugging' +debugADB_instr_androidDebug=Tap on 'USB debugging' (on some devices it is called 'Android Debugging') debugADB_instr_debugOn=Switch on 'Android Debug' / 'USB Debug' debugADB_instr_tapeOK=Tap 'Ok' on pop up to confirm Allow USB debugging debugADB_instr_acceptCertificate=if asked, Tick the checkbox and validate the message diff --git a/src/main/resources/lang/translation_en_EN.properties b/src/main/resources/lang/translation_en_EN.properties index fabdf27a..1ecb55a2 100644 --- a/src/main/resources/lang/translation_en_EN.properties +++ b/src/main/resources/lang/translation_en_EN.properties @@ -54,8 +54,8 @@ devMode_instr_tap7=Tap 7 times on 'Build number' debugADB_mTitle=Enable the Developer mode (Part 2) debugADB_instr_settings=Open the 'Settings' menu again debugADB_instr_search=Type 'Debug' in search bar -debugADB_instr_androidDebug=Tap on 'Android debugging' -debugADB_instr_debugOn=Switch on 'Android Debug' +debugADB_instr_androidDebug=Tap on 'USB debugging' (on some devices it is called 'Android Debugging') +debugADB_instr_debugOn=Switch on 'Android Debug' / 'USB Debug' debugADB_instr_tapeOK=Tap 'Ok' on pop up to confirm Allow USB debugging #detect -- GitLab