From fc5949c7d392e905732ca66de95d4ccbdc0dca0c Mon Sep 17 00:00:00 2001 From: Distopico Vegan Date: Tue, 6 Nov 2018 11:38:32 -0500 Subject: [PATCH] feat: change 'enable' advanced option to 'enable sync' to be clear --- .../main/java/org/dystopia/email/FragmentOptions.java | 11 ++++++----- app/src/main/res/layout/fragment_options.xml | 6 +++--- app/src/main/res/values-af/strings.xml | 2 +- app/src/main/res/values-ar-rBH/strings.xml | 2 +- app/src/main/res/values-ar-rEG/strings.xml | 2 +- app/src/main/res/values-ar-rSA/strings.xml | 2 +- app/src/main/res/values-ar-rYE/strings.xml | 2 +- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-az/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-en/strings.xml | 2 +- app/src/main/res/values-es-rES/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-he/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-nb/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-no/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-sv-rSE/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 41 files changed, 48 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/org/dystopia/email/FragmentOptions.java b/app/src/main/java/org/dystopia/email/FragmentOptions.java index 5007cc37..7a36de22 100644 --- a/app/src/main/java/org/dystopia/email/FragmentOptions.java +++ b/app/src/main/java/org/dystopia/email/FragmentOptions.java @@ -33,7 +33,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; public class FragmentOptions extends FragmentEx { - private Switch optEnabled; + private Switch optSyncEnabled; private Switch optAvatars; private Switch optLight; private Switch optBrowse; @@ -50,7 +50,7 @@ public class FragmentOptions extends FragmentEx { View view = inflater.inflate(R.layout.fragment_options, container, false); // Get controls - optEnabled = view.findViewById(R.id.optEnabled); + optSyncEnabled = view.findViewById(R.id.optSyncEnabled); optAvatars = view.findViewById(R.id.optAvatars); optLight = view.findViewById(R.id.optLight); optBrowse = view.findViewById(R.id.optBrowse); @@ -63,15 +63,16 @@ public class FragmentOptions extends FragmentEx { final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); - optEnabled.setChecked(prefs.getBoolean("enabled", true)); - optEnabled.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + optSyncEnabled.setChecked(prefs.getBoolean("enabled", true)); + optSyncEnabled.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { prefs.edit().putBoolean("enabled", checked).apply(); if (checked) ServiceSynchronize.start(getContext()); - else + else { ServiceSynchronize.stop(getContext()); + } } }); diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml index 0ef461fc..9c5347d4 100644 --- a/app/src/main/res/layout/fragment_options.xml +++ b/app/src/main/res/layout/fragment_options.xml @@ -13,12 +13,12 @@ android:layout_margin="12dp"> @@ -30,7 +30,7 @@ android:layout_marginTop="12dp" android:text="@string/title_advanced_avatars" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/optEnabled" /> + app:layout_constraintTop_toBottomOf="@id/optSyncEnabled" /> Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml index 5a904f52..9ac9bb74 100644 --- a/app/src/main/res/values-ar-rBH/strings.xml +++ b/app/src/main/res/values-ar-rBH/strings.xml @@ -80,7 +80,7 @@ سمة فاتحة سمة داكنة خيارات متقدمة - Enabled + Enable sync إظهار صور جهات الاتصال ضوء الإشعارات Browse messages on the server diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml index b7fe4bbc..f5252139 100644 --- a/app/src/main/res/values-ar-rEG/strings.xml +++ b/app/src/main/res/values-ar-rEG/strings.xml @@ -80,7 +80,7 @@ سمة فاتحة سمة داكنة خيارات متقدمة - Enabled + Enable sync إظهار صور جهات الاتصال ضوء الإشعارات Browse messages on the server diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index 5a904f52..9ac9bb74 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -80,7 +80,7 @@ سمة فاتحة سمة داكنة خيارات متقدمة - Enabled + Enable sync إظهار صور جهات الاتصال ضوء الإشعارات Browse messages on the server diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml index 5a904f52..9ac9bb74 100644 --- a/app/src/main/res/values-ar-rYE/strings.xml +++ b/app/src/main/res/values-ar-rYE/strings.xml @@ -80,7 +80,7 @@ سمة فاتحة سمة داكنة خيارات متقدمة - Enabled + Enable sync إظهار صور جهات الاتصال ضوء الإشعارات Browse messages on the server diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5a904f52..9ac9bb74 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -80,7 +80,7 @@ سمة فاتحة سمة داكنة خيارات متقدمة - Enabled + Enable sync إظهار صور جهات الاتصال ضوء الإشعارات Browse messages on the server diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index cb5018b8..a917c12e 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -64,7 +64,7 @@ Açıq tema Tünd tema Qabaqcıl variantlar - Fəallaşdırıldı + Fəallaşdırıldı Şəxs fotolarını göstər Bildiriş işığından istifadə et Serverdəki mesajlara nəzər yetir diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 320a59e3..47908ba0 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -64,7 +64,7 @@ Tema clar Tema fosc Opcions avançades - Activat + Activat Mostra les fotos dels contactes Utilitza el led de notificacions Busca missatges en el servidor remot diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 3c524e90..e593c8e8 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -72,7 +72,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 665bb005..4545a631 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -64,7 +64,7 @@ Light theme Mørkt tema Avancerede indstillinger - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 64a54e39..7e42ea2a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -64,7 +64,7 @@ Helles Thema Dunkles Thema Erweiterte Optionen - Aktiviert + Aktiviert Kontaktfotos anzeigen Benachrichtigungslicht verwenden Nachrichten auf dem Server durchsuchen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index fa59f639..0c09542f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -64,7 +64,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index d80e9a47..8b3907ad 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -64,7 +64,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 36a218a8..2133bdb7 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -64,7 +64,7 @@ Tema claro Tema oscuro Opciones avanzadas - Servicio activado + Servicio activado Mostrar fotos de contactos Usar luz de notificación Explorar mensajes en el servidor diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index c0357c9d..430ee842 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -64,7 +64,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 40014deb..52f4f7e6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -64,7 +64,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 87fef9f8..98495f48 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -64,7 +64,7 @@ Thème clair Thème sombre Options avancées - Activé + Activé Afficher les photos des contacts Utiliser le voyant de notification Lire directement les messages sur le serveur diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index c197c0a4..2036ff14 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -72,7 +72,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f70c3052..fa922027 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -64,7 +64,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 85704084..402fb5a0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -64,7 +64,7 @@ Tema chiaro Tema scuro Opzioni avanzate - Attivo + Attivo Mostra foto del contatto Usa il led di notifica Sfoglia i messaggi sul server diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index c197c0a4..2036ff14 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -72,7 +72,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 83ed9612..9d13bffc 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -60,7 +60,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 83ed9612..9d13bffc 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -60,7 +60,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 40014deb..52f4f7e6 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -64,7 +64,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d3f0bd08..4502b5d8 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -64,7 +64,7 @@ Licht thema Donker thema Geavanceerde opties - Ingeschakeld + Ingeschakeld Toon foto\'s contacten Gebruik meldingslicht Blader door berichten op de server diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 40014deb..52f4f7e6 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -64,7 +64,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 33105fd9..be192616 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -72,7 +72,7 @@ Jasny motyw Ciemny motyw Opcje zaawansowane - Włączone + Włączone Pokaż zdjęcia kontaktu Użyj diody powiadomień Przeglądaj wiadomości na serwerze diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 49e2f1fe..07933050 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -64,7 +64,7 @@ Light theme Tema escuro Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 40014deb..52f4f7e6 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -64,7 +64,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 4be0d627..5f2fa0cd 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -68,7 +68,7 @@ Temă luminoasă Temă întunecată Opțiuni avansate - Activat + Activat Arată pozele contactelor Folosire LED de notificare Răsfoiește mesajele de pe server diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3c524e90..e593c8e8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -72,7 +72,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index f2d51640..f9a13a88 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -68,7 +68,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index df0d3f35..90b09cf5 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -64,7 +64,7 @@ Ljust tema Mörkt tema Avancerade inställningar - Aktiverad + Aktiverad Visa kontaktfoton Använda aviseringslampan Bläddra bland meddelanden på servern diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 89d809bb..9603c15b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -64,7 +64,7 @@ Aydınlık tema Koyu Tema Gelişmiş ayarlar - Etkin + Etkin Kişi fotoğraflarını göster Bildirim ışığını kullan Sunucudaki iletilere göz atın diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 3c524e90..e593c8e8 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -72,7 +72,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 83ed9612..9d13bffc 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -60,7 +60,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 26dc11aa..91e39fd9 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -60,7 +60,7 @@ 亮色主题 暗色主题 高级选项 - Enabled + Enable sync 显示联系人头像 使用指示灯 浏览服务器上的消息 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 83ed9612..9d13bffc 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -60,7 +60,7 @@ Light theme Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 133545f4..20b5ffae 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -84,7 +84,7 @@ Dark theme Advanced options - Enabled + Enable sync Show contact photos Use notification light Browse messages on the server