From 6718da061537abf2313e48dd8a60ef97a150f2f9 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Fri, 25 Sep 2020 10:04:27 +0300 Subject: [PATCH] strings: rename a string to make more sense. --- .../syncadapter/ui/ChangeEncryptionPasswordActivity.kt | 4 ++-- .../etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt | 4 ++-- .../com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt | 4 ++-- app/src/main/res/values-de/strings.xml | 4 ++-- app/src/main/res/values-nb-rNO/strings.xml | 4 ++-- app/src/main/res/values-pl/strings.xml | 4 ++-- app/src/main/res/values-tr-rTR/strings.xml | 4 ++-- app/src/main/res/values/strings.xml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/ChangeEncryptionPasswordActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/ChangeEncryptionPasswordActivity.kt index 55c702ba..983efee1 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/ChangeEncryptionPasswordActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/ChangeEncryptionPasswordActivity.kt @@ -175,8 +175,8 @@ open class ChangeEncryptionPasswordActivity : BaseActivity() { .setPositiveButton(android.R.string.yes) { _, _ -> changePasswordDo(old_password, new_password) progress = ProgressDialog(this) - progress.setTitle(R.string.login_encryption_setup_title) - progress.setMessage(getString(R.string.login_encryption_setup)) + progress.setTitle(R.string.setting_up_encryption) + progress.setMessage(getString(R.string.setting_up_encryption_content)) progress.isIndeterminate = true progress.setCanceledOnTouchOutside(false) progress.setCancelable(false) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt index a66eb4cb..3c88b0d8 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt @@ -36,8 +36,8 @@ class SetupEncryptionFragment : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val progress = ProgressDialog(activity) - progress.setTitle(R.string.login_encryption_setup_title) - progress.setMessage(getString(R.string.login_encryption_setup)) + progress.setTitle(R.string.setting_up_encryption) + progress.setMessage(getString(R.string.setting_up_encryption_content)) progress.isIndeterminate = true progress.setCanceledOnTouchOutside(false) isCancelable = false diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt index f1bd4bf2..7089801c 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt @@ -25,8 +25,8 @@ class SetupUserInfoFragment : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val progress = ProgressDialog(activity) - progress.setTitle(R.string.login_encryption_setup_title) - progress.setMessage(getString(R.string.login_encryption_setup)) + progress.setTitle(R.string.setting_up_encryption) + progress.setMessage(getString(R.string.setting_up_encryption_content)) progress.isIndeterminate = true progress.setCanceledOnTouchOutside(false) isCancelable = false diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7aa27cb4..7754e26a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -101,8 +101,8 @@ Serverinformationen werden abgerufen. Bitte warten … Authentifizierung fehlgeschlagen (vermutlich aufgrund eines falschen Nutzernamens oder Passworts). Logs anzeigen - Verschlüsselung einstellen - Bitte warten, Verschlüsselung wird eingestellt… + Verschlüsselung einstellen + Bitte warten, Verschlüsselung wird eingestellt… Einstellungen: %s Anmeldeinformationen diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index a4f9dadb..d87687e2 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -196,8 +196,8 @@ Vent, kontakter tjeneren … Kunne ikke logge inn (sannsynligvis feil brukernavn eller passord).\nHar du registrert deg? Vis logger - Setter opp kryptering - Vent, setter opp kryptering … + Setter opp kryptering + Vent, setter opp kryptering … Kunne ikke opprette konto Feil krypteringspassord Mottok en integritetsfeil ved tilgang til kontoen din, noe som mest sannsynlig skyldes at du skrev inn feil krypteringspassord. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 824db17d..5dfc831c 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -179,8 +179,8 @@ Nie można zweryfikować (prawdopodobnie zła nazwa użytkownika lub hasło). Zobacz logi - Ustawianie Szyfrowania - Proszę czekać, ustawianie szyfrowania… + Ustawianie Szyfrowania + Proszę czekać, ustawianie szyfrowania… Tworzenie konta nie powiodło się diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 6b20d845..ad5a528f 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -230,8 +230,8 @@ \nHata: %s Yanlış şifreleme parolası Hesap oluşturma başarısız oldu - Lütfen bekleyin, şifreleme ayarlanıyor… - Şifrelemeyi ayarlama + Lütfen bekleyin, şifreleme ayarlanıyor… + Şifrelemeyi ayarlama Parolanızı mı unuttunuz\? Bu sizin oturum açma parolanızdır, şifreleme parolanız *değil*! Hesap: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 418f4a2c..6ef2ac25 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -234,8 +234,8 @@ Couldn\'t authenticate (probably wrong username or password).\nHave you registered? View logs - Setting up encryption - Please wait, setting up encryption… + Setting up encryption + Please wait, setting up encryption… Account creation failed Wrong encryption password