Separate options to clear preferences and data

Closes #292

src/main/AndroidManifest.xml

@@ -437,6 +437,9 @@
         <activity
             android:name=".activities.ClearAllDataActivity"
             android:theme="@style/TranslucentDialog" />
+        <activity
+            android:name=".activities.ResetPreferencesActivity"
+            android:theme="@style/TranslucentDialog" />
         <activity
             android:name=".activities.PurgeDeletedActivity"
             android:theme="@style/TranslucentDialog" />

src/main/java/org/tasks/activities/ClearAllDataActivity.java

@@ -15,19 +15,17 @@ import javax.inject.Inject;
 public class ClearAllDataActivity extends InjectingAppCompatActivity {
 
     @Inject Database database;
-    @Inject Preferences preferences;
     @Inject DialogBuilder dialogBuilder;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        dialogBuilder.newMessageDialog(R.string.EPr_manage_clear_all_message)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+        dialogBuilder.newMessageDialog(R.string.EPr_delete_task_data_warning)
+                .setPositiveButton(R.string.EPr_delete_task_data, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         deleteDatabase(database.getName());
-                        preferences.reset();
                         System.exit(0);
                     }
                 })

src/main/java/org/tasks/activities/ResetPreferencesActivity.java

@@ -0,0 +1,39 @@
+package org.tasks.activities;
+
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import org.tasks.R;
+import org.tasks.dialogs.DialogBuilder;
+import org.tasks.injection.InjectingAppCompatActivity;
+import org.tasks.preferences.Preferences;
+
+import javax.inject.Inject;
+
+public class ResetPreferencesActivity extends InjectingAppCompatActivity {
+
+    @Inject Preferences preferences;
+    @Inject DialogBuilder dialogBuilder;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        dialogBuilder.newMessageDialog(R.string.EPr_reset_preferences_warning)
+                .setPositiveButton(R.string.EPr_reset_preferences, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        preferences.reset();
+                        System.exit(0);
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel, null)
+                .setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        finish();
+                    }
+                })
+                .show();
+    }
+}

src/main/java/org/tasks/injection/ActivityModule.java

@@ -36,6 +36,7 @@ import org.tasks.activities.FilterSelectionActivity;
 import org.tasks.activities.ImportTaskActivity;
 import org.tasks.activities.LocationPickerActivity;
 import org.tasks.activities.PurgeDeletedActivity;
+import org.tasks.activities.ResetPreferencesActivity;
 import org.tasks.activities.SortActivity;
 import org.tasks.preferences.AppearancePreferences;
 import org.tasks.preferences.BackupPreferences;
@@ -79,6 +80,7 @@ import dagger.Provides;
                 ImportTaskActivity.class,
                 ExportTaskActivity.class,
                 ClearAllDataActivity.class,
+                ResetPreferencesActivity.class,
                 PurgeDeletedActivity.class,
                 DeleteCompletedActivity.class,
                 DeleteCompletedEventsActivity.class,

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

@@ -83,7 +83,6 @@
 	<string name="EPr_manage_header"> إدارة المهام القديمة</string>
 	<string name="EPr_manage_delete_completed">حذف المهمه المٌتمَمه</string>
 	<string name="EPr_manage_delete_completed_message">هل فعلا تريد حذف كل المهام المُتَممه؟</string>
-	<string name="EPr_manage_clear_all">حذف جميع المعلومات</string>
 	<string name="EPr_manage_delete_completed_gcal">حذف أحداث التقويم للمهام المُتَممه</string>
 	<string name="EPr_manage_delete_all_gcal">حذف جميع نشاطات التقويم للمهام</string>
 	<string name="EPr_manage_delete_all_gcal_message">هل فعلا تريد حذف جميع الأحداث للمهام ؟</string>

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

@@ -144,8 +144,6 @@
 	<string name="EPr_manage_purge_deleted">Изчистване на изтритите задачи</string>
 	<string name="EPr_manage_purge_deleted_message">Наистина ли искате да изчистите всичките си приключени задачи?\n\nТези задачи ще изчезнат завинаги!</string>
 	<string name="EPr_manage_purge_deleted_status">Изчистени %d задачи!</string>
-	<string name="EPr_manage_clear_all">Изчистване на всички данни</string>
-	<string name="EPr_manage_clear_all_message">Изтриване на всички задачи и настройки в Tasks?\n\nВнимание: не може да бъде отменено!</string>
 	<string name="EPr_manage_delete_completed_gcal">Изтрий събитията в календара за приключени задачи</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Наистина ли искате да изтриете всичките си събития за изпълнени задачи?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">Изтрити %d събития от календара!</string>

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

@@ -129,8 +129,6 @@
 	<string name="EPr_manage_purge_deleted">Vymazat smazané úkoly</string>
 	<string name="EPr_manage_purge_deleted_message">Opravdu chcete vymazat vaše smazané úkoly?\n\nTyto úkoly budou vymazány navždy!</string>
 	<string name="EPr_manage_purge_deleted_status">Vymyzáno %d úkolů!</string>
-	<string name="EPr_manage_clear_all">Smazat vše</string>
-	<string name="EPr_manage_clear_all_message">Smazat všechny úkoly a nastavení úkolů?\n\nPozor: nelze vzít zpět!</string>
 	<string name="EPr_manage_delete_completed_gcal">Smazat události v kalendáři pro hotové úkoly</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Opravdu chcete smazat všechny události pro dokončené úkoly?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">Smazáno %d událostí z kalendáře!</string>

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

@@ -139,8 +139,6 @@
 	<string name="EPr_manage_purge_deleted">Gelöschte Aufgaben endgültig löschen</string>
 	<string name="EPr_manage_purge_deleted_message">Willst du wirklich alle gelöschten Aufgaben bereinigen?\n\nDiese Aufgaben werden für immer gelöscht bleiben!</string>
 	<string name="EPr_manage_purge_deleted_status">%d Aufgaben bereinigt!</string>
-	<string name="EPr_manage_clear_all">Alle Daten löschen</string>
-	<string name="EPr_manage_clear_all_message">Alle Aufgaben und Einstellungen von Tasks löschen?\n\nWarnung: Dies kann nicht rückgängig gemacht werden!</string>
 	<string name="EPr_manage_delete_completed_gcal">Lösche Kalendereinträge von erledigten Aufgaben</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Möchtest du wirklich alle deine Kalendereinträge von erledigen Aufgaben löschen?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">%d Kalendereinträge gelöscht!</string>

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

@@ -131,8 +131,6 @@
 	<string name="EPr_manage_purge_deleted">Εκκαθάριση διεγραμμένων εργασιών</string>
 	<string name="EPr_manage_purge_deleted_message">Θέλετε πραγματικά να καθαρίσετε όλες τις διαγραμμένες εργασίες;\n\nΑυτές οι εργασίες θα χαθούν για πάντα!</string>
 	<string name="EPr_manage_purge_deleted_status">Εκκαθαρίστηκαν %d εργασίες!</string>
-	<string name="EPr_manage_clear_all">Εκκαθάριση όλων των δεδομένων</string>
-	<string name="EPr_manage_clear_all_message">Διαγραφή όλων των εργασιών και των ρυθμίσεων της εφαρμογής;\n\nΠροσοχή: είναι μη αναστρέψιμο!</string>
 	<string name="EPr_manage_delete_completed_gcal">Διαγραφή των γεγονότων ημερολογίου για ολοκληρωμένες εργασίες</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Σίγουρα θέλεις τη διαγραφή όλων των γεγονότων για τις ολοκληρωμένες εργασίες;</string>
 	<string name="EPr_manage_delete_completed_gcal_status">Διαγράφτηκαν %d γεγονότα ημερολογίου!</string>

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

@@ -140,8 +140,6 @@
 	<string name="EPr_manage_purge_deleted">Limpiar tareas eliminadas</string>
 	<string name="EPr_manage_purge_deleted_message">¿Seguro que desea limpiar todas las tareas eliminadas?\n\n¡Estas tareas se perderán por siempre!</string>
 	<string name="EPr_manage_purge_deleted_status">¡%d tareas purgadas!</string>
-	<string name="EPr_manage_clear_all">Limpiar todos los datos</string>
-	<string name="EPr_manage_clear_all_message">¿Borrar todas las tareas y configuraciones de Tasks?\n\n¡Advertencia: No hay vuelta atrás!</string>
 	<string name="EPr_manage_delete_completed_gcal">Borrar eventos del calendario para las tareas completas</string>
 	<string name="EPr_manage_delete_completed_gcal_message">¿Seguro que realmente desea borrar todas las tareas completadas?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">Borrados %d eventos del calendario!</string>

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

@@ -98,7 +98,6 @@
 	<string name="EPr_cal_end_or_start_at_due_time">زمان رویداد تقویم</string>
 	<string name="EPr_cal_end_at_due_time">اتمام رویدادهای تقویم در موعود</string>
 	<string name="EPr_cal_start_at_due_time">شروع رویدادهای تقویم در موعود</string>
-	<string name="EPr_manage_clear_all">پاک کردن تمام داده ها</string>
 	<string name="TWi_loading">در حال بارگیری...</string>
 	<string name="WCA_title">انتخاب وظیفه جهت نمایش</string>
 	<string name="DB_corrupted_body">Uh oh! It looks like you may have a corrupted database. 

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

@@ -140,8 +140,6 @@
 	<string name="EPr_manage_purge_deleted">Purger les tâches supprimées</string>
 	<string name="EPr_manage_purge_deleted_message">Voulez vous vraiment purger toutes vos tâches supprimées ?\n\nCes tâches seront perdues pour toujours !</string>
 	<string name="EPr_manage_purge_deleted_status">%d tâches purgées!</string>
-	<string name="EPr_manage_clear_all">Effacer toutes les données</string>
-	<string name="EPr_manage_clear_all_message">Supprimer toutes les tâches et configuration?\n\nAttention: cela est irréversible!</string>
 	<string name="EPr_manage_delete_completed_gcal">Supprimer les entrées de calendrier des tâches terminées</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Voulez-vous réellement supprimer tous les événements pour les tâches complétées?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">%d événements du calendrier ont été supprimés!</string>

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

@@ -141,8 +141,6 @@
 	<string name="EPr_manage_purge_deleted">Elimina definitivamente i compiti eliminati</string>
 	<string name="EPr_manage_purge_deleted_message">Vuoi davvero eliminare definitivamente i compiti eliminati?\n\nQuesti compiti saranno persi per sempre!</string>
 	<string name="EPr_manage_purge_deleted_status">Rimosse %d attività!</string>
-	<string name="EPr_manage_clear_all">Elimina tutti i dati</string>
-	<string name="EPr_manage_clear_all_message">Elimina tutti i programmi e tutte le impostazioni in Tasks?\n\nWarning: non può essere annullato!</string>
 	<string name="EPr_manage_delete_completed_gcal">Elimina gli eventi del calendario in programmi completati</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Vuoi davvero eliminare tutti gli eventi in programmi completati?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">Eliminato il %d degli eventi del calendario!</string>

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

@@ -129,8 +129,6 @@
 	<string name="EPr_manage_purge_deleted">אַיְּנִי משימות שנמחקו</string>
 	<string name="EPr_manage_purge_deleted_message">האם אתה בטוח שברצונך לְאַיֵּן את כל המשימות שנמחקו?</string>
 	<string name="EPr_manage_purge_deleted_status">%d משימות אֻיְּנוּ!</string>
-	<string name="EPr_manage_clear_all">הָסִירִי את כל הנתונים</string>
-	<string name="EPr_manage_clear_all_message">למחוק את כל המשימות ואת כל ההגדרות?\nאזהרה: לא ניתן לבטל פעולה זו!</string>
 	<string name="EPr_manage_delete_completed_gcal">מחקי אירועי יומן בעבור משימות שבוצעו</string>
 	<string name="EPr_manage_delete_completed_gcal_message">האם אתה בטוח שברצונך למחוק את כל אירועי היומן של משימות שבוצעו?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">%d אירועי יומן נמחקו!</string>

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

@@ -143,8 +143,6 @@
 	<string name="EPr_manage_purge_deleted">削除済のタスクを消去</string>
 	<string name="EPr_manage_purge_deleted_message">削除済のタスクをすべて消去してもよろしいですか?\n\nこれらのタスクは永久になくなります!</string>
 	<string name="EPr_manage_purge_deleted_status">%d タスクを消去しました!</string>
-	<string name="EPr_manage_clear_all">データをすべてクリア</string>
-	<string name="EPr_manage_clear_all_message">Tasks のすべてのタスクとタスクの設定を削除しますか?\n\n警告: 取り消しできません!</string>
 	<string name="EPr_manage_delete_completed_gcal">完了したタスクのカレンダーイベントを削除</string>
 	<string name="EPr_manage_delete_completed_gcal_message">完了したタスクのイベントをすべて削除してもよろしいですか?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">%d カレンダーイベントが削除されました!</string>

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

@@ -139,8 +139,6 @@
 	<string name="EPr_manage_purge_deleted">삭제한 일정을 비우기</string>
 	<string name="EPr_manage_purge_deleted_message">삭제한 일정을 모두 비울까요?\n\n비운 일정은 다시 살릴 수 없습니다!</string>
 	<string name="EPr_manage_purge_deleted_status">%d 일정을 비웠습니다!</string>
-	<string name="EPr_manage_clear_all">모든 자료 삭제하기</string>
-	<string name="EPr_manage_clear_all_message">Tasks의 모든 일정과 설정을 삭제할까요?\n\n경고: 되돌릴 수 없음!</string>
 	<string name="EPr_manage_delete_completed_gcal">완료한 일정의 달력 이벤트를 삭제하기</string>
 	<string name="EPr_manage_delete_completed_gcal_message">완료한 일정의 모든 이벤트를 정말 삭제할까요?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">%d 달력 이벤트를 삭제했습니다!</string>

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

@@ -142,8 +142,6 @@
 	<string name="EPr_manage_purge_deleted">Verwijderde taken opruimen</string>
 	<string name="EPr_manage_purge_deleted_message">Alle verwijderde taken werkelijk opschonen?\n\nDeze taken zijn dan definitief verwijderd!</string>
 	<string name="EPr_manage_purge_deleted_status">%d verwijderde taken opgeruimd!</string>
-	<string name="EPr_manage_clear_all">Wis Alle Gegevens</string>
-	<string name="EPr_manage_clear_all_message">Verwijder alle taken en instellingen in Tasks?\n\nWaarschuwing: kan niet ongedaan gemaakt worden!</string>
 	<string name="EPr_manage_delete_completed_gcal">Verwijder Agenda-items voor voltooide taken</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Weet je zeker dat je alle gebeurtenissen voor voltooide taken wil verwijderen?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">%d agenda-items verwijderd!</string>

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

@@ -132,8 +132,6 @@
 	<string name="EPr_manage_purge_deleted">Skasuj usunięte zadania</string>
 	<string name="EPr_manage_purge_deleted_message">Czy na pewno chcesz, aby oczyścić wszystkie usunięte zadania?\n\n Te zadania znikną na zawsze!</string>
 	<string name="EPr_manage_purge_deleted_status">Oczyszczone %d zadań!</string>
-	<string name="EPr_manage_clear_all">Usuń wszystkie dane</string>
-	<string name="EPr_manage_clear_all_message">Usunąć z Tasks wszystkie zadania i ustawienia?\n\nUwaga: tego nie da się cofnąć!</string>
 	<string name="EPr_manage_delete_completed_gcal">Usuń wydarzenia kalendarza dla zakończonych zadań</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Na pewno chcesz usunąć wszystkie wydarzenia dla zakończonych zadań?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">Usunięto %d wydarzeń kalendarza!</string>

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

@@ -131,8 +131,6 @@
 	<string name="EPr_manage_purge_deleted">Remover tarefas excluídas</string>
 	<string name="EPr_manage_purge_deleted_message">Você realmente deseja remover todas as suas tarefas excluídas?\n\nEstas tarefas serão removidas para sempre!</string>
 	<string name="EPr_manage_purge_deleted_status">Tarefas %d removidas!</string>
-	<string name="EPr_manage_clear_all">Limpar tudo!</string>
-	<string name="EPr_manage_clear_all_message">Limpar todas as tarefas e configurações do Tasks?\n\nCuidado: não pode ser desfeito!</string>
 	<string name="EPr_manage_delete_completed_gcal">Apaga eventos do calendário para tarefas concluídas</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Você quer mesmo apagar todos os seus eventos de tarefas concluídas?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">%d eventos de agenda apagados!</string>

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

@@ -143,8 +143,6 @@
 	<string name="EPr_manage_purge_deleted">Remover tarefas eliminadas</string>
 	<string name="EPr_manage_purge_deleted_message">Quer mesmo remover todas as tarefas eliminadas?\n\nNunca mais as conseguirá recuperar!</string>
 	<string name="EPr_manage_purge_deleted_status">%d tarefas removidas!</string>
-	<string name="EPr_manage_clear_all">Limpar todos os dados</string>
-	<string name="EPr_manage_clear_all_message">Eliminar tarefas e definições do Tasks?\n\nNão pode anular esta operação!</string>
 	<string name="EPr_manage_delete_completed_gcal">Eliminar eventos de calendário das tarefas terminadas</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Quer mesmo eliminar os eventos das tarefas terminadas?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">%d eventos de calendário eliminados!</string>

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

@@ -142,8 +142,6 @@
 	<string name="EPr_manage_purge_deleted">Очистить удаленные задачи?</string>
 	<string name="EPr_manage_purge_deleted_message">Действительно хотите убрать все удалённые задачи?\n\nЭта операция необратима!</string>
 	<string name="EPr_manage_purge_deleted_status">Убрано %d задач!</string>
-	<string name="EPr_manage_clear_all">Очистить все данные</string>
-	<string name="EPr_manage_clear_all_message">\"Удалить  все задачи и настройки в Tasks?\n\nВнимание: действие необратимо!\"</string>
 	<string name="EPr_manage_delete_completed_gcal">Удалить календарные события для завершенных задач</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Вы уверены, что хотите удалить все ваши события для завершенных задач?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">Удалено %d календарных событий!</string>

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

@@ -141,8 +141,6 @@
 	<string name="EPr_manage_purge_deleted">Zbaviť sa vymazaných úloh</string>
 	<string name="EPr_manage_purge_deleted_message">Naozaj chceš vyhodiť všetky tvoje vymazané úlohy?\n\nTieto budú vymazané navždy!</string>
 	<string name="EPr_manage_purge_deleted_status">Vyčistené %d úlohy</string>
-	<string name="EPr_manage_clear_all">Vymazať všetky údaje</string>
-	<string name="EPr_manage_clear_all_message">Vymazať všetky úlohy a nastavenia v Tasks?\n\nPozor: nedá sa vrátiť späť!</string>
 	<string name="EPr_manage_delete_completed_gcal">Vymazať udalosti kalendára pre dokončené úlohy</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Naozaj chceš odstrániť všetky tvoje udalosti pre dokončené úlohy?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">Vymazané %d udalosti kalendára</string>

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

@@ -135,8 +135,6 @@
 	<string name="EPr_manage_purge_deleted">Popolnoma odstrani zbrisane opravke</string>
 	<string name="EPr_manage_purge_deleted_message">Ste prepričani, da želite popolnoma odstraniti vse zbrisane opravke?\n\nTega ukaza ne bo mogoče razveljaviti! </string>
 	<string name="EPr_manage_purge_deleted_status">Število popolnoma odstranjenih opravkov: %d </string>
-	<string name="EPr_manage_clear_all">Zbriši vse podatke</string>
-	<string name="EPr_manage_clear_all_message">Zbriši vse opravke in nastavitve v aplikaciji Opravki?\n\nPozor: ukaza ni mogoče razveljaviti!</string>
 	<string name="EPr_manage_delete_completed_gcal">Zbriši dokončane opravke s koledarja dogodkov</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Ste prepričani, da želite zbrisati vse dokončane opravke iz vaših dogodkov?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">Število zbrisanih dogodkov na koledarju: %d </string>

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

@@ -127,8 +127,6 @@
 	<string name="EPr_manage_purge_deleted">Rensa bort raderade uppgifter</string>
 	<string name="EPr_manage_purge_deleted_message">Vill du verkligen rensa bort alla dina raderade uppgifter?\n\nDe här uppgifterna kommer att tas bort för alltid!</string>
 	<string name="EPr_manage_purge_deleted_status">%d uppgifter bortrensade!</string>
-	<string name="EPr_manage_clear_all">Radera alla data</string>
-	<string name="EPr_manage_clear_all_message">Radera alla uppgifter och inställningar i Tasks?\n\nVarning: denna åtgärd kan inte ångras!</string>
 	<string name="EPr_manage_delete_completed_gcal">Radera kalenderhändelser för färdiga uppgifter</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Vill du verkligen radera alla händelser i kalendern för uppgifter som är färdiga?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">%d kalenderhändelser raderade!</string>

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

@@ -112,8 +112,6 @@
 	<string name="EPr_manage_purge_deleted">Silinen Görevleri Temizle</string>
 	<string name="EPr_manage_purge_deleted_message">Tüm silinen görevleri temizlemek istediğine emin misin?\n\nBu görevler tamamen silinecek!</string>
 	<string name="EPr_manage_purge_deleted_status">%d görev temizlendi!</string>
-	<string name="EPr_manage_clear_all">Tüm Veriyi Temizle</string>
-	<string name="EPr_manage_clear_all_message">Tasks ayarları ve tüm görevler silinsin mi?\n\nUyarı: geri alınamaz!</string>
 	<string name="EPr_manage_delete_completed_gcal">Tamamlanan görevler için Takvim olaylarını sil</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Tamamlanmış görevlerden bütün olayları silmek istediğinize emin misiniz?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">%d takvim olayı silindi!</string>

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

@@ -135,8 +135,6 @@
 	<string name="EPr_manage_purge_deleted">Очистити видалені завдання</string>
 	<string name="EPr_manage_purge_deleted_message">Ви дійсно хочете очистити всі видалені завдання?\n\nЦя операція незворотна!</string>
 	<string name="EPr_manage_purge_deleted_status">Очищено %d завдань!</string>
-	<string name="EPr_manage_clear_all">Очистити всі данні</string>
-	<string name="EPr_manage_clear_all_message">Видалити всі завдання в Tasks?\n\nУвага: ця операція незворотня!</string>
 	<string name="EPr_manage_delete_completed_gcal">Видалити календарні події для завершених завдань</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Ви дійсно хочете видалити всі події для виконаних завданнь?</string>
 	<string name="EPr_manage_delete_completed_gcal_status">Видалено %d календарних подій!</string>

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

@@ -95,8 +95,6 @@
 	<string name="EPr_manage_purge_deleted">清除已删除任务</string>
 	<string name="EPr_manage_purge_deleted_message">您真的要清楚所有已删除任务吗？ \n\n 这些任务将会被彻底永久删除！</string>
 	<string name="EPr_manage_purge_deleted_status">清除了 %d 个任务！</string>
-	<string name="EPr_manage_clear_all">清除所有数据</string>
-	<string name="EPr_manage_clear_all_message">要删除清单小助理中所有任务和设置吗？\n\n系统提醒：无法还原的喔！</string>
 	<string name="EPr_manage_delete_completed_gcal">删除日程表中已完成任务</string>
 	<string name="EPr_manage_delete_completed_gcal_message">您真的想删除您所有的事件中已经完成的任务吗？</string>
 	<string name="EPr_manage_delete_completed_gcal_status">已经删除 %d 个日历事件了！</string>

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

@@ -122,8 +122,6 @@
 	<string name="EPr_manage_purge_deleted">清除已刪除任務工作</string>
 	<string name="EPr_manage_purge_deleted_message">您真的要清楚所有已刪除任務工作嗎？ \n\n 這些任務工作將會被徹底永久刪除！</string>
 	<string name="EPr_manage_purge_deleted_status">清除了 %d 個任務工作！</string>
-	<string name="EPr_manage_clear_all">清除所有數據</string>
-	<string name="EPr_manage_clear_all_message">刪除所有Tasks任務和設置\n\n警告：不可復原！</string>
 	<string name="EPr_manage_delete_completed_gcal">刪除日程表中已完成任務工作</string>
 	<string name="EPr_manage_delete_completed_gcal_message">您真的想刪除您所有的事件中已經完成的任務工作嗎？</string>
 	<string name="EPr_manage_delete_completed_gcal_status">清除%d個日曆事件!</string>

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

@@ -334,8 +334,10 @@
   <string name="EPr_manage_purge_deleted_message">Do you really want to purge all your deleted tasks?\n\nThese tasks will be gone forever!</string>
   <string name="EPr_manage_purge_deleted_status">Purged %d tasks!</string>
   <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Clear all data</string>
-  <string name="EPr_manage_clear_all_message">Delete all tasks and settings in Tasks?\n\nWarning: can\'t be undone!</string>
+  <string name="EPr_reset_preferences">Reset preferences</string>
+  <string name="EPr_reset_preferences_warning">Preferences will be reset to default values</string>
+  <string name="EPr_delete_task_data">Delete task data</string>
+  <string name="EPr_delete_task_data_warning">All tasks will be permanently deleted</string>
 
   <!-- slide 47f -->
   <string name="EPr_manage_delete_completed_gcal">Delete calendar events for completed tasks</string>

src/main/res/xml/preferences_oldtasks.xml

@@ -45,8 +45,16 @@
     </com.todoroo.astrid.ui.MultilinePreference>
 
     <Preference
-        android:key="@string/EPr_manage_clear_all"
-        android:title="@string/EPr_manage_clear_all">
+        android:key="@string/EPr_reset_preferences"
+        android:title="@string/EPr_reset_preferences">
+        <intent
+            android:targetClass="org.tasks.activities.ResetPreferencesActivity"
+            android:targetPackage="org.tasks" />
+    </Preference>
+
+    <Preference
+        android:key="@string/EPr_delete_task_data"
+        android:title="@string/EPr_delete_task_data">
         <intent
             android:targetClass="org.tasks.activities.ClearAllDataActivity"
             android:targetPackage="org.tasks" />