From c130bdb7fcaa0b5c313ed55b1e843773ead4b10e Mon Sep 17 00:00:00 2001 From: Catfriend1 Date: Sat, 9 Feb 2019 18:47:59 +0100 Subject: [PATCH] Rename the misleading "Syncthing is disabled" (fixes #314) (#313) * SettingsActivity: Remove duplicate strings syncthing_disabled_title, syncthing_disabled * Remove string: syncthing_disabled_title * Remove string translations * Update string: syncthing_disabled * Updated all translations --- .../syncthingandroid/activities/SettingsActivity.java | 2 +- app/src/main/res/values-bg/strings.xml | 7 +------ app/src/main/res/values-ca-rES/strings.xml | 7 +------ app/src/main/res/values-cs/strings.xml | 7 +------ app/src/main/res/values-da/strings.xml | 7 +------ app/src/main/res/values-de/strings.xml | 7 ++----- app/src/main/res/values-el/strings.xml | 7 +------ app/src/main/res/values-es-rMX/strings.xml | 7 +------ app/src/main/res/values-es/strings.xml | 7 +------ app/src/main/res/values-fi/strings.xml | 7 +------ app/src/main/res/values-fr/strings.xml | 7 +------ app/src/main/res/values-hu/strings.xml | 7 +------ app/src/main/res/values-in/strings.xml | 7 +------ app/src/main/res/values-it/strings.xml | 7 +------ app/src/main/res/values-ja/strings.xml | 7 +------ app/src/main/res/values-ko/strings.xml | 7 +------ app/src/main/res/values-nb/strings.xml | 7 +------ app/src/main/res/values-nl/strings.xml | 7 +------ app/src/main/res/values-nn/strings.xml | 7 +------ app/src/main/res/values-pl/strings.xml | 7 +------ app/src/main/res/values-pt-rBR/strings.xml | 7 +------ app/src/main/res/values-pt/strings.xml | 7 +------ app/src/main/res/values-ro/strings.xml | 7 +------ app/src/main/res/values-ru/strings.xml | 7 +------ app/src/main/res/values-sk/strings.xml | 7 +------ app/src/main/res/values-sv/strings.xml | 7 +------ app/src/main/res/values-tr/strings.xml | 7 +------ app/src/main/res/values-uk/strings.xml | 7 +------ app/src/main/res/values-vi/strings.xml | 7 +------ app/src/main/res/values-zh-rCN/strings.xml | 7 +------ app/src/main/res/values-zh-rTW/strings.xml | 7 +------ app/src/main/res/values/strings.xml | 7 ++----- 32 files changed, 34 insertions(+), 185 deletions(-) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java index c1f2cc40..93aa3e6e 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java @@ -756,7 +756,7 @@ public class SettingsActivity extends SyncthingActivity { .setPositiveButton(android.R.string.yes, (dialog, which) -> { if (mRestApi == null) { Toast.makeText(getActivity(), - getString(R.string.generic_error) + getString(R.string.syncthing_disabled_title), + getString(R.string.generic_error) + getString(R.string.syncthing_disabled), Toast.LENGTH_SHORT).show(); return; } diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index cbc64c05..75444c0b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -307,17 +307,12 @@ - - - Syncthing не работи - + Изход Syncthing работи - Syncthing не работи - Камера diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 078cc948..625e52a6 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -605,17 +605,12 @@ El Syncthing pot funcionar amb connexions de dades mòbils però les dades mòbils no estan connectades. - - - El Syncthing està desactivat - + Surt El Syncthing s\'està executant - El Syncthing està desactivat - El Syncthing s\'ha aturat diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index bb29c448..7aacbb7e 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -407,17 +407,12 @@ - - - Syncthing je vypnutý - + Ukončit Syncthing běží - Syncthing je vypnutý - Vytváření konfiguračního souboru selhalo Kamera diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 88eb3ea6..c47c793e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -388,17 +388,12 @@ - - - Syncthing er slået fra - + Afslut Syncthing kører - Syncthing er slået fra - Kamera diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 838dcf48..9c5558c2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -720,16 +720,13 @@ Bitte melden Sie auftretende Probleme via GitHub. - - - Syncthing ist deaktiviert - + Beenden Syncthing läuft - Syncthing ist deaktiviert + Syncthing schläft. Syncthing wurde beendet diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 61ebf9a5..b55c3292 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -397,17 +397,12 @@ - - - Το Syncthing είναι απενεργοποιημένο - + Έξοδος Το Syncthing εκτελείται - Το Syncthing είναι απενεργοποιημένο - Αδυναμία δημιουργίας αρχείου ρυθμίσεων Φωτογραφική μηχανή diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index d66523fc..4b44e0d0 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -283,17 +283,12 @@ - - - Syncthing está deshabilitado - + Salir Syncthing está en ejecución - Syncthing está deshabilitado - %1$s-photos diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4caa991f..c10a6eac 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -363,17 +363,12 @@ - - - Syncthing está deshabilitado - + Salir Syncthing se está ejecutando - Syncthing está deshabilitado - Cámara diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 364dc7f4..3faa6ba2 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -368,17 +368,12 @@ - - - Syncthing on poistettu käytöstä - + Poistu Syncthing on käynnissä - Syncthing on poistettu käytöstä - Kamera diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fe2ece95..69924a77 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -459,17 +459,12 @@ - - - Syncthing est désactivé - + Quitter Syncthing fonctionne - Syncthing est désactivé - Syncthing va s\'arrêter Echec de création du fichier de configuration diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c2bda530..e6d99b27 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -451,17 +451,12 @@ VIGYÁZAT! Más alkalmazások kiolvashatják a backupból a titkos kulcsot, és - - - A Syncthing le van tiltva - + Kilépés A Syncthing fut - A Syncthing le van tiltva - Nem sikerült létrehozni a konfigurációs fájlt Kamera diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index f0ea41be..4c95542b 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -366,17 +366,12 @@ - - - Syncthing dimatikan - + Keluar Syncthing dinyalakan - Syncthing dimatikan - Sinkronisasi (%1$d%%) Kirim Saja diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6257793b..6b8b03b1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -456,17 +456,12 @@ - - - Syncthing è disabilitato - + Esci Syncthing è in esecuzione - Syncthing è disabilitato - Syncthing è stato terminato Impossibile creare il file di configurazione diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9f741a88..f2b3d3b2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -395,17 +395,12 @@ - - - Syncthing は無効になりました - + 終了 Syncthing は実行中です - Syncthing は無効になりました - 設定ファイルの作成に失敗しました カメラ diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 18d4b828..b1104ff1 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -393,17 +393,12 @@ - - - Syncthing이 비활성화되었습니다 - + 나가기 Syncthing이 작동 중입니다 - Syncthing이 비활성화되었습니다 - 구성 파일을 만드는데 실패 했습니다. 카메라 diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 9e5073ae..8331dd76 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -292,17 +292,12 @@ - - - Syncthing er deaktivert - + Avslutt Syncthing kjører - Syncthing er deaktivert - Kamera diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ec34f9e6..36fb3fb5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -478,17 +478,12 @@ - - - Syncthing is uitgeschakeld - + Afsluiten Syncthing draait - Syncthing is uitgeschakeld - Syncthing is beëindigd Aanmaken van configuratiebestand mislukt diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml index 17d8e30c..f7c0f233 100644 --- a/app/src/main/res/values-nn/strings.xml +++ b/app/src/main/res/values-nn/strings.xml @@ -292,17 +292,12 @@ - - - Syncthing er ikkje aktivert - + Avslutt Syncthing køyrer - Syncthing er ikkje aktivert - Kamera diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 51b23d0c..9b122e2d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -407,17 +407,12 @@ - - - Syncthing jest wyłączony - + Zakończ Syncthing jest uruchomiony - Syncthing jest wyłączony - Nie udało się stworzyć pliku konfiguracyjnego Kamera diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e2d6d470..7d31761c 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -438,17 +438,12 @@ - - - O Syncthing está desabilitado - + Sair O Syncthing está rodando - O Syncthing está desabilitado - Não foi possível criar o arquivo de configuração Câmera diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 5af74a43..8436b0e9 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -315,17 +315,12 @@ - - - O Syncthing está desactivado - + Sair O Syncthing está a correr - O Syncthing está desactivado - Câmera diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 67a17ad1..b02a8025 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -491,17 +491,12 @@ - - - Syncthing este dezactivat - + Ieșire Syncthing rulează - Syncthing este dezactivat - Syncthing a fost închis Creerea fișierului de configurare a eșuat diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 91589406..53fce09a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -515,17 +515,12 @@ - - - Syncthing выключен - + Выход Syncthing запущен - Syncthing выключен - Ошибка при создании файла конфигурации Камера diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 6136610a..5dd0d02c 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -261,17 +261,12 @@ - - - Syncthing je zakázaný - + Koniec Syncthing beží - Syncthing je zakázaný - %1$s-fotografie diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d04890c9..b47e0b67 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -590,17 +590,12 @@ - - - Syncthing är inaktiverad - + Avsluta Syncthing körs - Syncthing är inaktiverad - Syncthing avslutades Misslyckades med att skapa konfigurationsfil diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index bef230f4..1834b123 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -305,17 +305,12 @@ - - - Syncthing devre dışı - + Çık Syncthing çalışıyor - Syncthing devre dışı - Kamera diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 24dee998..4e44ad59 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -281,17 +281,12 @@ - - - Syncthing заборонено - + Вихід Syncthing працює - Syncthing заборонено - Камера diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 6089fba5..fdf6d998 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -283,17 +283,12 @@ - - - Đã tắt Syncthing - + Thoát Syncthing đang chạy - Đã tắt Syncthing - %1$s-ảnh diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 09fd9d37..f1e0f143 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -550,17 +550,12 @@ Syncthing 被允许在蜂窝网络环境下运行 , 但当前网络未连接至互联网 - - - Syncthing 已禁用 - + 退出 Syncthing 正在运行 - Syncthing 已禁用 - Syncthing 已停止工作 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index fdfca43c..2644dfcb 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -394,17 +394,12 @@ - - - Syncthing 已經停用 - + 離開 Syncthing 正在執行 - Syncthing 已經停用 - 無法建立設定檔 相機 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 42b6dc39..a058e2c7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -741,16 +741,13 @@ Please report any problems you encounter via Github. - - - Syncthing is disabled - + Exit Syncthing is running - Syncthing is disabled + Syncthing is sleeping Syncthing was terminated