Set preference summaries in xml

src/main/java/com/todoroo/astrid/activity/EditPreferences.java

@@ -256,51 +256,18 @@ public class EditPreferences extends TodorooPreferenceActivity {
     public void updatePreferences(final Preference preference, Object value) {
         final Resources r = getResources();
 
-        if (r.getString(R.string.p_fullTaskTitle).equals(preference.getKey())) {
-            if (value != null && (Boolean) value) {
-                preference.setSummary(R.string.EPr_fullTask_desc_enabled);
-            } else {
-                preference.setSummary(R.string.EPr_fullTask_desc_disabled);
-            }
-        }
-
-        // pp preferences
-        else if (r.getString(R.string.p_files_dir).equals(preference.getKey())) {
+        if (r.getString(R.string.p_files_dir).equals(preference.getKey())) {
             String dir = preferences.getStringValue(TaskAttachment.FILES_DIRECTORY_PREF);
 
             if (TextUtils.isEmpty(dir)) {
                 dir = r.getString(R.string.p_files_dir_desc_default);
             }
             preference.setSummary(r.getString(R.string.p_files_dir_desc, dir));
-        } else if (booleanPreference(preference, value, R.string.p_field_missed_calls,
-                R.string.MCA_missed_calls_pref_desc_disabled, R.string.MCA_missed_calls_pref_desc_enabled)) {
-        } else if (booleanPreference(preference, value, R.string.p_calendar_reminders,
-                R.string.CRA_calendar_reminders_pref_desc_disabled, R.string.CRA_calendar_reminders_pref_desc_enabled)) {
-        } else if (booleanPreference(preference, value, R.string.p_end_at_deadline,
-                R.string.EPr_cal_end_at_due_time, R.string.EPr_cal_start_at_due_time)) {
         } else if (r.getString(R.string.p_voiceRemindersEnabled).equals(preference.getKey())) {
-            if (value != null && !(Boolean) value) {
-                preference.setSummary(R.string.EPr_voiceRemindersEnabled_desc_disabled);
-            } else {
-                preference.setSummary(R.string.EPr_voiceRemindersEnabled_desc_enabled);
-            }
             onVoiceReminderStatusChanged(preference, (Boolean) value);
         }
     }
 
-    protected boolean booleanPreference(Preference preference, Object value,
-            int key, int disabledString, int enabledString) {
-        if(getString(key).equals(preference.getKey())) {
-            if (value != null && !(Boolean)value) {
-                preference.setSummary(disabledString);
-            } else {
-                preference.setSummary(enabledString);
-            }
-            return true;
-        }
-        return false;
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();

src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java

@@ -22,12 +22,6 @@ import java.text.DateFormat;
 
 import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
 
-/**
- * Displays the preference screen for users to edit their preferences
- *
- * @author Tim Su <tim@todoroo.com>
- *
- */
 public class ReminderPreferences extends TodorooPreferenceActivity {
 
     @Override
@@ -52,13 +46,7 @@ public class ReminderPreferences extends TodorooPreferenceActivity {
     public void updatePreferences(Preference preference, Object value) {
         Resources r = getResources();
 
-        if(r.getString(R.string.p_rmd_enable_quiet).equals(preference.getKey())) {
-            if( !(Boolean) value) {
-                preference.setSummary(r.getString(R.string.rmd_EPr_quiet_hours_desc_none));
-            } else {
-                preference.setSummary("");
-            }
-        } else if(r.getString(R.string.p_rmd_quietStart).equals(preference.getKey())) {
+        if(r.getString(R.string.p_rmd_quietStart).equals(preference.getKey())) {
             int millisOfDay = (int) value;
             String setting = DateFormat.getTimeInstance(DateFormat.SHORT).format(new DateTime().withMillisOfDay(millisOfDay).toDate());
             preference.setSummary(r.getString(R.string.rmd_EPr_quiet_hours_start_desc, setting));
@@ -78,18 +66,6 @@ public class ReminderPreferences extends TodorooPreferenceActivity {
                 String ringtoneTitle = ringtone.getTitle(this);
                 preference.setSummary(ringtoneTitle);
             }
-        } else if(r.getString(R.string.p_rmd_persistent).equals(preference.getKey())) {
-            if((Boolean)value) {
-                preference.setSummary(r.getString(R.string.rmd_EPr_persistent_desc_true));
-            } else {
-                preference.setSummary(r.getString(R.string.rmd_EPr_persistent_desc_false));
-            }
-        } else if(r.getString(R.string.p_rmd_maxvolume).equals(preference.getKey())) {
-            if((Boolean)value) {
-                preference.setSummary(r.getString(R.string.rmd_EPr_multiple_maxvolume_desc_true));
-            } else {
-                preference.setSummary(r.getString(R.string.rmd_EPr_multiple_maxvolume_desc_false));
-            }
         }
     }
 }

src/main/res/values-bg-rBG/strings.xml

@@ -379,10 +379,8 @@
 	<string name="rmd_NoA_done">Завършен</string>
 	<string name="rmd_NoA_snooze">Отложи</string>
 	<string name="rmd_NoA_dlg_title">Напомняне:</string>
-	<string name="rmd_EPr_enable_quiet_title">Активиране на тихи часове</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Тихи часове начало</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Уведомленията ще бъдат тихи след %s.\nЗабележка: вибрациите се контролират от настройките по-долу</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Тихи часове е деактивирано</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Тихи часове край</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Уведомления ще престанат да бъдат тихи на %s</string>
 	<string name="rmd_EPr_rmd_time_title">Напомняне по подразбиране</string>

src/main/res/values-ca/strings.xml

@@ -223,7 +223,6 @@
 	<string name="rmd_NoA_snooze">Adorm</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Inici de Silenci</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Cap notificació apareixerà després %s</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Silenci desactivat</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Final de Silenci</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Les notificacions sortirant començant a %s</string>
 	<string name="rmd_EPr_persistent_title">Persistència de Notificació</string>

src/main/res/values-cs/strings.xml

@@ -365,9 +365,7 @@
 	<string name="rmd_NoA_done">Dokončeno!</string>
 	<string name="rmd_NoA_snooze">Později...</string>
 	<string name="rmd_NoA_dlg_title">Připomenutí:</string>
-	<string name="rmd_EPr_enable_quiet_title">Zapnout klidový režim</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Nerušit od</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Tichý režim zakázán</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Nerušit do</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Upozorňování začne upomínat od %s</string>
 	<string name="rmd_EPr_rmd_time_title">Výchozí upomínka</string>

src/main/res/values-da/strings.xml

@@ -193,7 +193,6 @@
 	<string name="rmd_NoA_snooze">Slumrefunktion...</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Stille timer start</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Ingen påmindelser vil blive vist efter %s</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Stille timer er deaktiveret</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Stille timer slut</string>
 	<string name="rmd_EPr_persistent_desc_true">Påmindelser skal vises individuelt for at blive ryddet</string>
 	<string name="rmd_EPr_defaultRemind_title">Tilfældige påmindelser</string>

src/main/res/values-de/strings.xml

@@ -371,10 +371,8 @@
 	<string name="rmd_NoA_done">Abgeschlossen</string>
 	<string name="rmd_NoA_snooze">Schlummern</string>
 	<string name="rmd_NoA_dlg_title">Erinnerung:</string>
-	<string name="rmd_EPr_enable_quiet_title">Stille Stunden aktivieren</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Stille Stunden beginnen.</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Benachrichtigungen sind lautlos nach %s.\nHinweis: Vibrieren wird durch Einstellungen weiter unten gesteuert!</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Ruhezeiten sind deaktiviert</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Ruhezeiten enden</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Benachrichtigungen werden nicht mehr lautlos sein ab %s</string>
 	<string name="rmd_EPr_rmd_time_title">Standard-Erinnerung</string>

src/main/res/values-el/strings.xml

@@ -373,10 +373,8 @@
 	<string name="rmd_NoA_done">Ολοκληρωμένο</string>
 	<string name="rmd_NoA_snooze">Αναβολή</string>
 	<string name="rmd_NoA_dlg_title">Υπενθύμιση:</string>
-	<string name="rmd_EPr_enable_quiet_title">Ενεργοποίηση ωρών ησυχίας</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Ξεκίνησε η ώρα ησυχίας </string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Σίγαση υπενθυμίσεων μετά τις %s.\nΣημείωση: η δόνηση ελέγχεται από τη ρύθμιση   \"Δόνηση ειδοποιήσεων\"</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Η ώρα κοινής ησυχίας είναι απενεργοποιημένη</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Τέλος ώρας κοινής ησυχίας</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Οι ειδοποιήσεις θα σταματήσουν να είναι σε σίγαση στις %s</string>
 	<string name="rmd_EPr_rmd_time_title">Προκαθορισμένη υπενθύμιση</string>

src/main/res/values-es/strings.xml

@@ -373,10 +373,8 @@
 	<string name="rmd_NoA_done">¡Terminada!</string>
 	<string name="rmd_NoA_snooze">Dilación</string>
 	<string name="rmd_NoA_dlg_title">Recordatorio:</string>
-	<string name="rmd_EPr_enable_quiet_title">Habilitar horario en silencio</string>
 	<string name="rmd_EPr_quiet_hours_start_title">El horario en silencio empieza</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Notificaciones serán silenciadas después de %s.\nNota: las vibraciones están controladas según la configuración \"Vibrar en alerta\"</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Horario en silencio deshabilitado</string>
 	<string name="rmd_EPr_quiet_hours_end_title">El horario en silencio termina</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Las notificaciones dejarán de estar en silencio desde las %s</string>
 	<string name="rmd_EPr_rmd_time_title">Aviso por defecto</string>

src/main/res/values-fr/strings.xml

@@ -372,10 +372,8 @@
 	<string name="rmd_NoA_done">Déjà fait !</string>
 	<string name="rmd_NoA_snooze">Rappeler ultérieurement...</string>
 	<string name="rmd_NoA_dlg_title">Rappel :</string>
-	<string name="rmd_EPr_enable_quiet_title">Activer le mode silencieux</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Début des heures de repos</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Les notifications seront silencieuses après %s.\nNote : les vibrations sont contrôlées par le paramètre Vibrations</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Les heures de repos sont désactivées</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Fin des heures de repos</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Les notifications ne seront plus silencieuses à partir de %s</string>
 	<string name="rmd_EPr_rmd_time_title">Rappel par défaut</string>

src/main/res/values-it/strings.xml

@@ -334,7 +334,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
 	<string name="rmd_NoA_dlg_title">Promemoria:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Ora inizio silenzio</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Nessuna notifica apparirà dopo le %s</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Ora inizio silenzio non abilitato</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Ora fine silenzio</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Le notifiche smetteranno di essere silenziose dopo le %s</string>
 	<string name="rmd_EPr_rmd_time_title">Promemoria predefiniti</string>

src/main/res/values-iw/strings.xml

@@ -373,7 +373,6 @@
 	<string name="rmd_NoA_dlg_title">תזכורת:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">תחילת שעות השקט</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">האתראות תוחרשנה אחרי %s.\nשים לב: הגדרות הן חתחת \"רטט  בזמן התראה\"!</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">תכונת «שעות שקט» אינה פעילה</string>
 	<string name="rmd_EPr_quiet_hours_end_title">סיום שעות השקט</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">החרשת האתראות תחדל החל מ %s</string>
 	<string name="rmd_EPr_rmd_time_title">תזכורת ברירת מחדל</string>

src/main/res/values-ja/strings.xml

@@ -377,10 +377,8 @@
 	<string name="rmd_NoA_done">既に完了しています!</string>
 	<string name="rmd_NoA_snooze">スヌーズ</string>
 	<string name="rmd_NoA_dlg_title">お知らせ.</string>
-	<string name="rmd_EPr_enable_quiet_title">消音時間帯を有効にする</string>
 	<string name="rmd_EPr_quiet_hours_start_title">消音時間の始まり</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">%s 以降、通知音は鳴りません</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">消音は無効です</string>
 	<string name="rmd_EPr_quiet_hours_end_title">消音時間の終わり</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">通知を行う時間帯の開始 %s</string>
 	<string name="rmd_EPr_rmd_time_title">標準リマインダー</string>

src/main/res/values-ko/strings.xml

@@ -381,7 +381,6 @@
 	<string name="rmd_NoA_dlg_title">알림:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">알림 꺼짐 시작 시간</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">%s 후에는 알림을 끕니다. (진동은 알람 설정의 진동 설정을 따릅니다)</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">알림 꺼짐을 사용하지 않습니다</string>
 	<string name="rmd_EPr_quiet_hours_end_title">알림 꺼짐 종료 시간</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">%s 부터 알림 기능이 켜집니다</string>
 	<string name="rmd_EPr_rmd_time_title">기본 알림 설정</string>

src/main/res/values-nb/strings.xml

@@ -177,7 +177,6 @@
 	<string name="rmd_NoA_done">Allerede utført!</string>
 	<string name="rmd_NoA_snooze">Slumre</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Stilletimer start</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Stilletimer er deaktivert</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Stilletimer slutt</string>
 	<string name="rmd_EPr_persistent_title">Påminnelse intensitet</string>
 	<string name="rmd_EPr_persistent_desc_true">Varsler må ses individuelt for å kunne fjernes</string>

src/main/res/values-nl/strings.xml

@@ -374,10 +374,8 @@
 	<string name="rmd_NoA_done">Reeds voltooid!</string>
 	<string name="rmd_NoA_snooze">Sluimeren...</string>
 	<string name="rmd_NoA_dlg_title">Herinnering:</string>
-	<string name="rmd_EPr_enable_quiet_title">Stel stille tijd in</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Rustperiode begint</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Waarschuwingen geluidloos na %s.\nOpmerking: trillen wordt via onderstaande instellingen ingesteld!</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Rustperiode is uitgeschakeld</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Rustperiode eindigt</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Waarschuwingsgeluid weer geactiveerd om %s</string>
 	<string name="rmd_EPr_rmd_time_title">Standaard herinnering</string>

src/main/res/values-pl/strings.xml

@@ -377,10 +377,8 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g
 	<string name="rmd_NoA_done">Już wykonano!</string>
 	<string name="rmd_NoA_snooze">Wstrzymaj...</string>
 	<string name="rmd_NoA_dlg_title">Przypomnienie:</string>
-	<string name="rmd_EPr_enable_quiet_title">Włącz ciche godziny</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Początek czasu wyciszenia</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Powiadomienia będą wyciszone po %s.\nUwaga: wibracje są kontrolowane przez ustawienia poniżej!</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Wyciszenie jest nieaktywne</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Koniec czasu wyciszenia</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Powiadomienia przestaną być wyciszonre, począwszy od %s</string>
 	<string name="rmd_EPr_rmd_time_title">Domyślne przypomnienie</string>

src/main/res/values-pt-rBR/strings.xml

@@ -371,10 +371,8 @@
 	<string name="rmd_NoA_done">Concluída</string>
 	<string name="rmd_NoA_snooze">Adiar</string>
 	<string name="rmd_NoA_dlg_title">Lembrete:</string>
-	<string name="rmd_EPr_enable_quiet_title">Ativar horas de silêncio</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Começam as horas calmas</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Notificações irão silenciar depois de %s.\nNota: vibrações são controladas pelo Vibrate na configuração de alarme.</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Horário de silêncio está desativado</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Fim das horas calmas</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">As notificações ficarão normais (sonoras) a partir de %s</string>
 	<string name="rmd_EPr_rmd_time_title">Lembrete padrão</string>

src/main/res/values-pt/strings.xml

@@ -377,10 +377,8 @@ das tarefas através de um backup em Definições->Sincronização e backup-&
 	<string name="rmd_NoA_filter">Lembrete!</string>
 	<string name="rmd_NoA_done">Terminada</string>
 	<string name="rmd_NoA_dlg_title">Lembrete:</string>
-	<string name="rmd_EPr_enable_quiet_title">Ativar horas de silêncio</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Início da hora de silêncio</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">As notificações serão silenciadas após %s.\nAs vibrações são controladas pela definição \"Vibrar no alerta\"</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Hora de silêncio desativada</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Fim das horas de silêncio</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">As notificações será restauradas em %s</string>
 	<string name="rmd_EPr_rmd_time_title">Lembrete predefinido</string>

src/main/res/values-ru/strings.xml

@@ -378,10 +378,8 @@
 	<string name="rmd_NoA_done">Уже готово!</string>
 	<string name="rmd_NoA_snooze">Повтор</string>
 	<string name="rmd_NoA_dlg_title">Напоминания:</string>
-	<string name="rmd_EPr_enable_quiet_title">Настроить тихие часы</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Начало тихих часов</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Уведомления будут беззвучными после %s.\nПримечание: вибрация управляется настройками ниже!</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Тихие часы отключены</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Конец тихих часов</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Уведомления перестануть быть беззвучными начиная с %s.</string>
 	<string name="rmd_EPr_rmd_time_title">Напоминание по умолчанию</string>

src/main/res/values-sl-rSI/strings.xml

@@ -378,7 +378,6 @@
 	<string name="rmd_NoA_dlg_title">Opomnik:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Tihe ure se začnejo ob</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Obvestila bodo utišana po %s.\n Obvestilo: vibriranje določajo nastavitve \"Vibriranje ob opozorilih\"</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Tihe ure onemogočene</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Tihe ure se končajo ob</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Obvestila ne bodo več utišana od %s</string>
 	<string name="rmd_EPr_rmd_time_title">Privzeti opomnik ob</string>

src/main/res/values-sv/strings.xml

@@ -368,7 +368,6 @@ och återställer dina aktuella uppgifter från en backup
 	<string name="rmd_NoA_dlg_title">Påminnelse:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Tyst period börjar</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Inga varsel visas efter %s</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Tyst period är inaktiverad</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Tyst period slutar</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Påminnelser är ljudlösa med början %s</string>
 	<string name="rmd_EPr_rmd_time_title">Standardpåminnelse</string>

src/main/res/values-tr/strings.xml

@@ -336,7 +336,6 @@
 	<string name="rmd_NoA_dlg_title">Hatırlatıcı:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Sessiz saatlerin başlangıcı</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">%s sonrasında bildirimler sessizleştirilecek.\n Not: titreşimler aşağıdaki ayarla belirlenecek.</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Sessiz saatler kapalı</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Sessiz saatlerin sonu</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Bildirim sesleri %s den itibaren sessiz olmayacak</string>
 	<string name="rmd_EPr_rmd_time_title">Öntanımlı Hatırlatma</string>

src/main/res/values-uk/strings.xml

@@ -381,7 +381,6 @@
 	<string name="rmd_NoA_dlg_title">Нагадування:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Тихі години стартують</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">Повідомлення будуть беззвучними після %s.\n Примітка:. Вібрація управляється налаштуваннями нижче!</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">Тихі години вимкнено</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Тихі години закінчуються</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">Сповіщення перестануть бути беззвучними починаючи з %s.</string>
 	<string name="rmd_EPr_rmd_time_title">Нагадування по замовчуванню</string>

src/main/res/values-zh-rCN/strings.xml

@@ -314,7 +314,6 @@
 	<string name="rmd_NoA_dlg_title">提醒：</string>
 	<string name="rmd_EPr_quiet_hours_start_title">静音开始时间</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">%s 后提示将静止。\n注意：震动在下面的选项中控制！</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">未设定无声时间</string>
 	<string name="rmd_EPr_quiet_hours_end_title">静音时间结束</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">静音时间将在%s后结束</string>
 	<string name="rmd_EPr_rmd_time_title">默认提示</string>

src/main/res/values-zh-rTW/strings.xml

@@ -354,7 +354,6 @@
 	<string name="rmd_NoA_dlg_title">提醒：</string>
 	<string name="rmd_EPr_quiet_hours_start_title">無聲開始時間</string>
 	<string name="rmd_EPr_quiet_hours_start_desc">%s 後提示將靜止。\n注意：震動在下面的選項中控制！</string>
-	<string name="rmd_EPr_quiet_hours_desc_none">未設定無聲功能</string>
 	<string name="rmd_EPr_quiet_hours_end_title">無聲結束時間</string>
 	<string name="rmd_EPr_quiet_hours_end_desc">通知將在 %s</string>
 	<string name="rmd_EPr_rmd_time_title">默認提示</string>

src/main/res/values/strings-ppack.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Advanced settings</string>
-  <string name="EPr_powerpack_summary">Missed call reminders, voice input and miscellaneous settings</string>
-  
-</resources>

src/main/res/values/strings-reminders.xml

@@ -70,15 +70,11 @@
   
   <!-- ============================================= reminder preferences == -->
   
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_enable_quiet_title">Enable quiet hours</string>
   <!-- Reminder Preference: Quiet Hours Start Title -->
   <string name="rmd_EPr_quiet_hours_start_title">Quiet hours start</string>
   <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
   <string name="rmd_EPr_quiet_hours_start_desc">Notifications will be silent after %s.\nNote: vibrations are controlled by the "Vibrate on alert" setting</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Quiet hours is disabled</string>
-  
+
   <!-- Reminder Preference: Quiet Hours End Title -->
   <string name="rmd_EPr_quiet_hours_end_title">Quiet hours end</string>
   <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->

src/main/res/values/strings.xml

@@ -121,6 +121,7 @@
     <string name="silent">Silent</string>
     <string name="sound">Sound</string>
     <string name="vibrate">Vibrate</string>
+    <string name="quiet_hours">Quiet hours</string>
 
     <string-array name="sync_SPr_interval_entries">
         <!-- sync_SPr_interval_entries: Synchronization Intervals -->

src/main/res/xml/preferences.xml

@@ -27,6 +27,8 @@
 	        
 	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
 	            android:key="@string/p_fullTaskTitle"
+                android:summaryOff="@string/EPr_fullTask_desc_disabled"
+                android:summaryOn="@string/EPr_fullTask_desc_enabled"
 	            android:title="@string/EPr_fullTask_title"
 	            android:defaultValue="false" />
 

src/main/res/xml/preferences_misc.xml

@@ -10,19 +10,27 @@
 	    
 	    <com.todoroo.astrid.ui.MultilineCheckboxPreference
 	        android:key="@string/p_voiceRemindersEnabled"
+            android:summaryOff="@string/EPr_voiceRemindersEnabled_desc_disabled"
+            android:summaryOn="@string/EPr_voiceRemindersEnabled_desc_enabled"
 	        android:title="@string/EPr_voiceRemindersEnabled_title"
 	        android:defaultValue="false" />
 	
 	    <CheckBoxPreference
 	        android:key="@string/p_field_missed_calls"
+            android:summaryOff="@string/MCA_missed_calls_pref_desc_disabled"
+            android:summaryOn="@string/MCA_missed_calls_pref_desc_enabled"
 	        android:title="@string/MCA_missed_calls_pref_title"/>
 	    
 	    <CheckBoxPreference
 	        android:key="@string/p_calendar_reminders"
+            android:summaryOff="@string/CRA_calendar_reminders_pref_desc_disabled"
+            android:summaryOn="@string/CRA_calendar_reminders_pref_desc_enabled"
 	        android:title="@string/CRA_calendar_reminders_pref_title" />
 	    
 	    <CheckBoxPreference
 	        android:title="@string/EPr_cal_end_or_start_at_due_time"
+            android:summaryOff="@string/EPr_cal_end_at_due_time"
+            android:summaryOn="@string/EPr_cal_start_at_due_time"
 	        android:key = "@string/p_end_at_deadline" />
 
         <CheckBoxPreference

src/main/res/xml/preferences_reminders.xml

@@ -25,6 +25,8 @@
     <com.todoroo.astrid.ui.MultilineCheckboxPreference
         android:dependency="@string/p_rmd_enabled"
         android:key="@string/p_rmd_persistent"
+        android:summaryOff="@string/rmd_EPr_persistent_desc_false"
+        android:summaryOn="@string/rmd_EPr_persistent_desc_true"
         android:title="@string/rmd_EPr_persistent_title" />
     <org.tasks.ui.TimePreference
         android:defaultValue="@integer/default_remind_time"
@@ -35,7 +37,7 @@
         android:defaultValue="false"
         android:dependency="@string/p_rmd_enabled"
         android:key="@string/p_rmd_enable_quiet"
-        android:title="@string/rmd_EPr_enable_quiet_title" />
+        android:title="@string/quiet_hours" />
     <org.tasks.ui.TimePreference
         android:defaultValue="@integer/default_quiet_hours_start"
         android:dependency="@string/p_rmd_enable_quiet"
@@ -50,6 +52,8 @@
         android:defaultValue="false"
         android:dependency="@string/p_rmd_enabled"
         android:key="@string/p_rmd_maxvolume"
+        android:summaryOff="@string/rmd_EPr_multiple_maxvolume_desc_false"
+        android:summaryOn="@string/rmd_EPr_multiple_maxvolume_desc_true"
         android:title="@string/rmd_EPr_multiple_maxvolume_title" />
 
 </PreferenceScreen>