From bf21d3f025d56a1bba90f73681be37a4289cff3b Mon Sep 17 00:00:00 2001 From: Marius Lindvall Date: Fri, 13 Dec 2019 17:40:54 +0100 Subject: [PATCH] Restructure I18N keys --- .../inspectionProfiles/Project_Default.xml | 1 + .../preferences/ui/SettingsActivity.java | 6 +- .../app/src/main/res/values-ca/strings.xml | 20 ++-- .../app/src/main/res/values-de/strings.xml | 24 ++-- .../app/src/main/res/values-eu/strings.xml | 6 +- .../app/src/main/res/values-fr/strings.xml | 6 +- .../src/main/res/values-nb-rNO/strings.xml | 34 +++--- .../app/src/main/res/values-nl/strings.xml | 6 +- .../app/src/main/res/values-nn/strings.xml | 34 +++--- .../app/src/main/res/values-pl/strings.xml | 6 +- .../app/src/main/res/values-ro/strings.xml | 34 +++--- .../app/src/main/res/values-ru/strings.xml | 6 +- .../app/src/main/res/values-uk/strings.xml | 6 +- android/app/src/main/res/values/strings.xml | 109 ++++++++---------- .../app/src/main/res/xml/root_preferences.xml | 30 ++--- 15 files changed, 161 insertions(+), 167 deletions(-) diff --git a/android/.idea/inspectionProfiles/Project_Default.xml b/android/.idea/inspectionProfiles/Project_Default.xml index 453d428..dc06504 100644 --- a/android/.idea/inspectionProfiles/Project_Default.xml +++ b/android/.idea/inspectionProfiles/Project_Default.xml @@ -20,6 +20,7 @@ + diff --git a/android/app/src/main/java/info/varden/hauk/system/preferences/ui/SettingsActivity.java b/android/app/src/main/java/info/varden/hauk/system/preferences/ui/SettingsActivity.java index a1b8375..e0ed466 100644 --- a/android/app/src/main/java/info/varden/hauk/system/preferences/ui/SettingsActivity.java +++ b/android/app/src/main/java/info/varden/hauk/system/preferences/ui/SettingsActivity.java @@ -64,11 +64,11 @@ public final class SettingsActivity extends AppCompatActivity { // Set InputType and other attributes for text edit boxes. ((EditTextPreference) manager.findPreference(Constants.PREF_SERVER_ENCRYPTED.getKey())).setOnBindEditTextListener(new CascadeBindListener(new EditTextPreference.OnBindEditTextListener[]{ new InputTypeBindListener(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI), - new HintBindListener(R.string.label_server_hint) + new HintBindListener(R.string.pref_cryptServer_hint) })); ((EditTextPreference) manager.findPreference(Constants.PREF_USERNAME_ENCRYPTED.getKey())).setOnBindEditTextListener(new CascadeBindListener(new EditTextPreference.OnBindEditTextListener[]{ new InputTypeBindListener(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PERSON_NAME), - new HintBindListener(R.string.label_username_hint) + new HintBindListener(R.string.pref_cryptUsername_hint) })); ((EditTextPreference) manager.findPreference(Constants.PREF_PASSWORD_ENCRYPTED.getKey())).setOnBindEditTextListener( new InputTypeBindListener(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD) @@ -81,7 +81,7 @@ public final class SettingsActivity extends AppCompatActivity { ); ((EditTextPreference) manager.findPreference(Constants.PREF_CUSTOM_ID.getKey())).setOnBindEditTextListener(new CascadeBindListener(new EditTextPreference.OnBindEditTextListener[]{ new InputTypeBindListener(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE), - new HintBindListener(R.string.label_custom_id_hint) + new HintBindListener(R.string.pref_requestLink_hint) })); ((EditTextPreference) manager.findPreference(Constants.PREF_PROXY_HOST.getKey())).setOnBindEditTextListener( new InputTypeBindListener(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI) diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml index 27098d7..5517c7b 100644 --- a/android/app/src/main/res/values-ca/strings.xml +++ b/android/app/src/main/res/values-ca/strings.xml @@ -1,17 +1,17 @@ - Nom d\'usuari - <opcional> - Password: + Nom d\'usuari + <opcional> + Password: Durada de la compartició: - Interval d\'actualització (s): - Activa el xifrat d\'extrem a extrem - Clau de xifrat + Interval d\'actualització (s): + Activa el xifrat d\'extrem a extrem + Clau de xifrat Sistema de compartició: Permetre l\'adopció: (Què és això\?) Nom d\'usuari: - Xifra la compartició + Xifra la compartició PIN del grup: Estat: Comparteix ID/URL: @@ -79,9 +79,9 @@ "Hauk ha rebut i blocat un intent de crear una nova sessió de localització des d\'una font de transmissió que s\'ha identificat a si mateixa com a" Voleu permetre que en el futur es crein sessions a partir d’emissions amb aquesta identificació\? Ús compartit de la ubicació de codi obert - URL del servidor - Identificador d\'enllaç preferit - <generat aleatòriament> + URL del servidor + Identificador d\'enllaç preferit + <generat aleatòriament> Permetre als altres d\'afegir la meva compartició en un grup compartit Atura la compartició [%s] Comparteix diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml index 24b97bf..1230b70 100644 --- a/android/app/src/main/res/values-de/strings.xml +++ b/android/app/src/main/res/values-de/strings.xml @@ -1,8 +1,8 @@ Teilen Ihrer Position mit Open Source Software - Server URL - Passwort + Server URL + Passwort Status: Freigabe starten Freigabe stoppen [%s] @@ -26,7 +26,7 @@ Gruppenfreigabe (Mitglied) Warte auf Präzisions-Fix… Freigabedauer: - Aktualisierungsintervall (Sekunden) + Aktualisierungsintervall (Sekunden) Freigabemodus: Adoption erlauben: (Was ist das\?) @@ -108,18 +108,18 @@ Sie können mehrere Links erstellen, um auf Ihren gemeinsamen Standort zuzugreifen. Jede Verbindung kann einzeln gestoppt werden, so dass Sie jederzeit genau steuern können, wer Ihren Standort sehen kann. \n \nAlle zusätzlichen Links, die Sie auf diese Weise erstellen, sind einzelne Standortfreigaben, die nur Ihren Standort anzeigen. - Benutzername - <zufällig generiert> - Bevorzugte Link ID - <optional> - End-to-End-Verschlüsselung deaktivieren - Ende-zu-Ende-Verschlüsselung aktivieren + Benutzername + <zufällig generiert> + Bevorzugte Link ID + <optional> + End-to-End-Verschlüsselung deaktivieren + Ende-zu-Ende-Verschlüsselung aktivieren Zum Bearbeiten tippen - Verbindung + Verbindung Einstellungen Der Server unterstützt keine End-to-End-Verschlüsselung. Die End-to-End-Verschlüsselung wird ab Version %s und höher unterstützt; auf dem Server läuft derzeit Version %s. Die Freigabe wird ohne End-to-End-Verschlüsselung erstellt, um Kompatibilität zu gewährleisten. Der Backend-Server kann nicht erreicht werden - Verschlüsselungspasswort - Passwortgeschützte Freigabe + Verschlüsselungspasswort + Passwortgeschützte Freigabe Einstellungen \ No newline at end of file diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml index 7e49168..038dfd2 100644 --- a/android/app/src/main/res/values-eu/strings.xml +++ b/android/app/src/main/res/values-eu/strings.xml @@ -5,10 +5,10 @@ Ados Sartu duzun zerbitzari URL-a baliogabea da. Aplikazio honek zure kokalekua atzitzeko baimena behar du funtzionatzeko, baina baimen hau ez da oraindik eman. Onartu hurrengo baimen eskaera eta gero sakatu hasi botoia berriro saiatzeko. - Zerbitzariaren URLa - Pasahitza + Zerbitzariaren URLa + Pasahitza Partekatzearen iraupena: - Eguneraketa tartea (s): + Eguneraketa tartea (s): Partekatze modua: Baimendu adopzioa: (Zer da hau\?) diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml index 8046d72..6f3ed57 100644 --- a/android/app/src/main/res/values-fr/strings.xml +++ b/android/app/src/main/res/values-fr/strings.xml @@ -1,8 +1,8 @@ - URL du serveur + URL du serveur Durée du partage : - Intervalle de mise à jour (s) : + Intervalle de mise à jour (s) : Mode de partage : (Qu\'est-ce que c\'est\?) Surnom : @@ -26,7 +26,7 @@ VOTRE PIN DE GROUPE : Partager l\'ajout Logiciel libre de partage de localisation - Mot de passe + Mot de passe Arrêter le partage [%s] Liens actuellement actifs Partage de localisation actif! diff --git a/android/app/src/main/res/values-nb-rNO/strings.xml b/android/app/src/main/res/values-nb-rNO/strings.xml index 1b89fc6..02c745b 100644 --- a/android/app/src/main/res/values-nb-rNO/strings.xml +++ b/android/app/src/main/res/values-nb-rNO/strings.xml @@ -1,6 +1,6 @@ - Passord + Passord Varighet: Åpen løsning for posisjonsdeling Tillat adopsjon: @@ -51,8 +51,8 @@ Tilgang til stedstjenester kreves for å bruke denne appen. Serveren returnerte en tom respons. Mottok HTTP %s fra serveren! - Serveradresse - Intervall (sekunder) + Serveradresse + Intervall (sekunder) Delingsmodus: La andre legge meg til i en delingsgruppe når jeg deler posisjonen min Lag en ny delingslink @@ -108,18 +108,18 @@ Xiaomi Åpne innstillinger Lukk - <tilfeldig generert> - Foretrukket link-ID - <valgfritt> - Brukernavn + <tilfeldig generert> + Foretrukket link-ID + <valgfritt> + Brukernavn Serveren støtter ikke ende-til-ende-kryptering. Ende-til-ende-kryptering støttes i versjon %s og høyere; serveren kjører nå versjon %s. Delingen din vil bli opprettet uten ende-til-ende-kryptering for å beholde kompatibilitet. - Krypteringspassord - Aktiver ende-til-ende-kryptering - Krev passord for deling + Krypteringspassord + Aktiver ende-til-ende-kryptering + Krev passord for deling Serveren kan ikke nås akkurat nå - Deaktiver ende-til-ende-kryptering + Deaktiver ende-til-ende-kryptering Trykk for å endre - Tilkobling + Tilkobling Innstillinger Innstillinger En feil oppstod under oppslag av vertsnavnet til den konfigurerte proxyen: %s @@ -129,12 +129,12 @@ HTTP Ikke bruk proxy Bruk standard for systemet - Proxy-port - Proxy-vertsnavn - Proxy + Proxy-port + Proxy-vertsnavn + Proxy Deaktiver sertifikatkjede- og vertsnavnvalidering for .onion-verter (ikke anbefalt) Deaktiver sertifikatkjedevalidering for .onion-verter (ikke anbefalt) Alltid valider sertifikater (anbefalt) - HTTPS-sertifikatvalidering - Tidsavbrudd for oppkobling (sekunder) + HTTPS-sertifikatvalidering + Tidsavbrudd for oppkobling (sekunder) \ No newline at end of file diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml index be25c1a..66af8e4 100644 --- a/android/app/src/main/res/values-nl/strings.xml +++ b/android/app/src/main/res/values-nl/strings.xml @@ -4,10 +4,10 @@ Deel deze PIN met anderen in uw groep zodat zij uw locatie kunnen volgen De server ondersteund geen groepsdelingen. Groepsdelingen zijn ondersteund vanaf versie %s; de server draait op dit moment versie %s. Uw locatiedeling is omgezet in een individuele deling. Open source locatie deling - Server URL - Wachtwoord + Server URL + Wachtwoord Deelduratie: - Updatefrequentie (s): + Updatefrequentie (s): Deelmodus: (Wat is dit\?) Bijnaam: diff --git a/android/app/src/main/res/values-nn/strings.xml b/android/app/src/main/res/values-nn/strings.xml index 2255f44..8212830 100644 --- a/android/app/src/main/res/values-nn/strings.xml +++ b/android/app/src/main/res/values-nn/strings.xml @@ -1,10 +1,10 @@ Open løysing for posisjonsdeling - Serveradresse - Passord + Serveradresse + Passord Varigheit: - Intervall (sekund) + Intervall (sekund) Delingsmodus: Tillat adopsjon: (Kva er dette\?) @@ -108,19 +108,19 @@ Huawei OnePlus Xiaomi - <tilfeldig generert> - Føretrekt link-ID - <valfritt> - Brukarnamn + <tilfeldig generert> + Føretrekt link-ID + <valfritt> + Brukarnamn Serveren støttar ikkje ende-til-ende-kryptering. Ende-til-ende-kryptering er støtta i versjon %s og høgare; serveren køyrer no versjon %s. Delingen din vil bli oppretta utan ende-til-ende-kryptering for å behalda kompatibilitet. - Krypteringspassord - Aktiver ende-til-ende-kryptering - Krev passord for delingar + Krypteringspassord + Aktiver ende-til-ende-kryptering + Krev passord for delingar Kan ikkje nå servaren akkurat no Innstillingar - Tilkopling + Tilkopling Trykk for å endra - Deaktiver ende-til-ende-kryptering + Deaktiver ende-til-ende-kryptering Innstillingar Ein feil oppstod under oppslag av vertsnamnet til den konfigurerte proxyen: %s IP-adressa til den konfigurerte proxyen (%s) kunne ikkje slåast opp! @@ -129,12 +129,12 @@ HTTP Ikkje bruk proxy Bruk standard for systemet - Proxy-port - Proxy-vertsnamn - Proxy + Proxy-port + Proxy-vertsnamn + Proxy Deaktiver sertifikatkjede- og vertsnamnvalidering for .onion-vertar (ikkje anbefalt) Deaktiver sertifikatkjedevalidering for .onion-vertar (ikkje anbefalt) Alltid valider sertifikat (anbefalt) - HTTPS-sertifikatvalidering - Tidsavbrot for oppkopling (sekund) + HTTPS-sertifikatvalidering + Tidsavbrot for oppkopling (sekund) \ No newline at end of file diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml index e3575fb..5d252e3 100644 --- a/android/app/src/main/res/values-pl/strings.xml +++ b/android/app/src/main/res/values-pl/strings.xml @@ -26,10 +26,10 @@ (Co to znaczy\?) Pozwalam innym na dołączenie mnie do swojej grupy Tryb udostępniania: - Okres aktualizacji pozycji (s): + Okres aktualizacji pozycji (s): Czas udostępniania: - Hasło - URL serwera + Hasło + URL serwera Otwarte oprogramowanie do udostępniania lokalizacji Link został utworzony Potrzebne pozwolenie diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml index fec056d..1efb712 100644 --- a/android/app/src/main/res/values-ro/strings.xml +++ b/android/app/src/main/res/values-ro/strings.xml @@ -1,13 +1,13 @@ Setări - Adresă server - Nume utilizator - <opțional> - Parolă - Interval actualizare (secunde) - ID preferat adresă - Parolă criptare + Adresă server + Nume utilizator + <opțional> + Parolă + Interval actualizare (secunde) + ID preferat adresă + Parolă criptare Mod partajare: Permite adopția: (Ce este aceasta\?) @@ -77,17 +77,17 @@ Partajează adresa Hauk prin Urmărește-mi locația prin Hauk! Setări - Conexiune + Conexiune Atingeți pentru a edita Permite altora să adauge partajarea mea la o partajare în grup Huawei Cerere de autorizare difuzare Hauk a primit și blocat o încercare de a crea o nouă sesiune de partajare a locației de la o sursa de difuzare care s-a identificat ca Doriți să permiteți crearea de sesiuni de la difuzări cu acest identificator și pe viitor\? - Activare criptare de la un capăt la altul - Dezactivare criptarea de la un capăt la altul + Activare criptare de la un capăt la altul + Dezactivare criptarea de la un capăt la altul Durată partajare: - <generat aleator> + <generat aleator> Stare: Creează o nouă adresă de urmărire Adrese active acum @@ -109,7 +109,7 @@ \nEste recomandat să vă asigurați că Hauk este în lista de excepții de la economisirea bateriei astfel încât aplicația să nu se oprească din funcționare în mod neașteptat. \n \nAcest mesaj nu se va mai afișa. - Protejează partajarea cu parolă + Protejează partajarea cu parolă Partajați acest PIN cu ceilalți din grup pentru a le permite și lor să participe la partajare Hauk permite să vă creați sesiuni de partajare a locației atât pentru dumneavoastră cât și pentru un grup de persoane. Dacă cineva creează o partajare în grup, va primii un cod al grupului pe care alte persoane îl pot folosi pentru a se alătura sesiunii de partajare. \n @@ -129,12 +129,12 @@ HTTP Fără proxy Implicit sistem - Port proxy - Gazdă proxy - Proxy + Port proxy + Gazdă proxy + Proxy Dezactivează validarea lanțului de încredere și a numelui de gazdă pentru adresele .onion (nu este recomandat) Dezactivează validarea lanțului de încredere pentru adresele .onion (nu este recomandat) Validează mereu certificatele (recomandat) - Validare certificat HTTPS - Expirare conexiune (secunde) + Validare certificat HTTPS + Expirare conexiune (secunde) \ No newline at end of file diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml index 6afb57b..ff0ff4d 100644 --- a/android/app/src/main/res/values-ru/strings.xml +++ b/android/app/src/main/res/values-ru/strings.xml @@ -10,10 +10,10 @@ Сервер вернул пустой ответ. Получили HTTP %s от сервера! Сервер устарел - URL Сервера - Пароль + URL Сервера + Пароль Время жизни шары: - Интервал обновления (сек): + Интервал обновления (сек): (Что это\?) Ник: Групповой PIN: diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml index e7653ff..584a867 100644 --- a/android/app/src/main/res/values-uk/strings.xml +++ b/android/app/src/main/res/values-uk/strings.xml @@ -28,10 +28,10 @@ (Що це\?) Шарінг місцеположення активний Ділимося місцеположенням за допомогою відкритого ПЗ - URL сервера - Пароль + URL сервера + Пароль Час життя шари: - Інтервал поновлення (сек): + Інтервал поновлення (сек): Режим шари: Додавання %s… Помилка підключення diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 5253536..49caff7 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -4,31 +4,26 @@ Settings Open source location sharing https://github.com/bilde2910/Hauk - Server URL - https://example.com/ - Username - <optional> - Password + Share duration: - Update interval (seconds) - Preferred link ID - <randomly generated> - Password protect share - Proxy - Proxy hostname - Proxy port - Connection timeout (seconds) - HTTPS certificate validation - - Encryption password + minute(s) + hour(s) + day(s) Sharing mode: + Share my own location only + Create a group share + Join a group share Allow adoption: - - (What\'s this?) + Allow others to add my share into a group share + (What\'s this?) Nickname: Group PIN: Status: - Share ID/URL: + Location sharing inactive + Waiting for initial GNSS fix… + Waiting for high accuracy fix… + Location sharing active! + Unable to reach backend server Start sharing Stop sharing [%s] @@ -43,29 +38,6 @@ Group share (host) Group share (member) - Share my own location only - Create a group share - Join a group share - - System default - Do not proxy - HTTP - SOCKS 4/5 - - Always validate certificates (recommended) - Disable trust anchor validation for .onion hosts (not recommended) - Disable trust anchor and hostname validation for .onion hosts (not recommended) - - minute(s) - hour(s) - day(s) - - Location sharing inactive - Waiting for initial GNSS fix… - Waiting for high accuracy fix… - Location sharing active! - Unable to reach backend server - YOUR GROUP PIN: Share this PIN with the others in your group to let them join your location sharing group @@ -73,6 +45,7 @@ Hauk allows you to create location sharing sessions for yourself as well as for a group of people. If someone creates a group share, they get a group code that others can use to join the sharing session.\n\nHowever, the person creating the group share also gets the option to add an already existing location share into their group. This process is called adoption.\n\nYou can decide whether or not you want to allow others to incorporate your location share into their group share by checking this checkbox.\n\nIf you enable this option and share your location to a group of friends, and someone else also wants to share their location, they can create a group share and add you to their map, so both of you appear on the same shared location map. This is useful if you are e.g. driving and cannot use your phone, as adoption of your share by others requires no interaction on your part. Adopt an existing share You can adopt an existing individual location share to incorporate it in this group share. Please paste the URL or share ID of the share you wish to adopt (e.g. %s?XXXX-XXXX) and assign a nickname to this share. + Share ID/URL: Create new sharing link You can create several links to access your shared location. Each link can be stopped individually, allowing fine-grained control over who can see your location at any time.\n\nAny additional links you create this way will be single-user shares that show your location only. @@ -100,19 +73,18 @@ Creating new sharing link… Invalid settings + The server URL you entered is invalid. + Location permission is required to use this app. + Location services are disabled. Please enable high-accuracy location services to share your location. Connection error + An error occurred when resolving the hostname of the configured proxy: %s + The IP address of the configured proxy (%s) could not be resolved! Server error - The server URL you entered is invalid. - Location permission is required to use this app. - Location services are disabled. Please enable high-accuracy location services to share your location. - The server returned an empty response. - Received HTTP %s from server! - The IP address of the configured proxy (%s) could not be resolved! - An error occurred when resolving the hostname of the configured proxy: %s - + The server returned an empty response. + Received HTTP %s from server! Server is out of date - The server does not support group shares. Group shares are supported in version %s and above; the server is currently running version %s. Your share has been converted to an individual share. - The server does not support end-to-end encryption. End-to-end encryption is supported in version %s and above; the server is currently running version %s. Your share will be created without end-to-end encryption to maintain compatibility. + The server does not support group shares. Group shares are supported in version %s and above; the server is currently running version %s. Your share has been converted to an individual share. + The server does not support end-to-end encryption. End-to-end encryption is supported in version %s and above; the server is currently running version %s. Your share will be created without end-to-end encryption to maintain compatibility. Connection established Location sharing is active! Click the share button to copy the publicly viewable URL for your share. @@ -141,13 +113,34 @@ Hauk received and blocked an attempt to create a new location sharing session from a broadcast source which identified itself as Do you wish to allow sessions to be created from broadcasts with this identification in the future? + Settings - - Connection + + Connection Tap to edit - - Enable end-to-end encryption - Disable end-to-end encryption - Allow others to add my share into a group share + Server URL + https://example.com/ + Username + <optional> + Password + Update interval (seconds) + Preferred link ID + <randomly generated> + Password protect share + Enable end-to-end encryption + Disable end-to-end encryption + Encryption password + Proxy + System default + Do not proxy + HTTP + SOCKS 4/5 + Proxy hostname + Proxy port + Connection timeout (seconds) + HTTPS certificate validation + Always validate certificates (recommended) + Disable trust anchor validation for .onion hosts (not recommended) + Disable trust anchor and hostname validation for .onion hosts (not recommended) diff --git a/android/app/src/main/res/xml/root_preferences.xml b/android/app/src/main/res/xml/root_preferences.xml index c16dd3e..07fa088 100644 --- a/android/app/src/main/res/xml/root_preferences.xml +++ b/android/app/src/main/res/xml/root_preferences.xml @@ -17,70 +17,70 @@ - + + app:title="@string/pref_enableE2E_title" + app:summaryOff="@string/pref_enableE2E_off" + app:summaryOn="@string/pref_enableE2E_on" />