Remove notification actions & description settings

app/scripts/getloc.rb

@@ -41,7 +41,7 @@ def export(tmp_files, lang, src_files_block)
   end
 
   tmp_files.each do |f|
-    %x(sed -i "s/\\\\\\'/'/g" #{f})
+    %x(gsed -i "s/\\\\\\'/'/g" #{f})
   end
 
   if lang == "master"
@@ -82,7 +82,7 @@ def import(tmp_files, lang, dst_files_block)
 
         for i in 0...tmp_files.length
           file = File.join(tmp_all_dir, l, File.basename(tmp_files[i]))
-          %x(sed -i "s/\\([^\\\\\\]\\)'/\\1\\\\\\'/g" #{file})
+          %x(gsed -i "s/\\([^\\\\\\]\\)'/\\1\\\\\\'/g" #{file})
           puts "Moving #{file} to #{dst_files[i]}"
           %x(mv #{file} #{dst_files[i]})
         end
@@ -96,8 +96,8 @@ def import(tmp_files, lang, dst_files_block)
     for i in 0...tmp_files.length
       name = File.basename(tmp_files[i])
       %x(curl --user "#{@user}:#{@password}" https://api.getlocalization.com/#{PROJECT_NAME}/api/translations/file/#{name}/#{lang_tmp}/ -o #{tmp_files[i]})
-      %x(sed -i "s/\\([^\\\\\\]\\)'/\\1\\\\\\'/g" #{tmp_files[i]})
+      %x(gsed -i "s/\\([^\\\\\\]\\)'/\\1\\\\\\'/g" #{tmp_files[i]})
-      `sed -i '/\s*<!--.*-->\s*$/d' #{tmp_files[i]}` # strip comments
+      `gsed -i '/\s*<!--.*-->\s*$/d' #{tmp_files[i]}` # strip comments
       puts "Moving #{tmp_files[i]} to #{dst_files[i]}"
       %x(mv #{tmp_files[i]} #{dst_files[i]})
     end

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

@@ -87,7 +87,7 @@ public class ReminderPreferences extends InjectingPreferenceActivity {
             return false;
         });
 
-        requires(R.string.notification_shade, atLeastJellybean(), R.string.p_rmd_notif_actions_enabled, R.string.p_notification_priority, R.string.p_rmd_show_description);
+        requires(R.string.notification_shade, atLeastJellybean(), R.string.p_notification_priority);
         requires(device.supportsLocationServices(), R.string.geolocation_reminders);
 
         updateLEDColor();

app/src/main/java/org/tasks/Notifier.java

@@ -97,7 +97,6 @@ public class Notifier {
             builder.setLargeIcon(contactImage);
         }
 
-        if (preferences.useNotificationActions()) {
         Intent callNow = new Intent(context, MissedCallActivity.class);
         callNow.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         callNow.putExtra(MissedCallActivity.EXTRA_NUMBER, number);
@@ -114,7 +113,6 @@ public class Notifier {
         builder
                 .addAction(R.drawable.ic_phone_white_24dp, context.getString(R.string.MCA_return_call), PendingIntent.getActivity(context, callNow.hashCode(), callNow, PendingIntent.FLAG_UPDATE_CURRENT))
                 .addAction(R.drawable.ic_add_white_24dp, context.getString(R.string.MCA_add_task), PendingIntent.getActivity(context, callLater.hashCode(), callLater, PendingIntent.FLAG_UPDATE_CURRENT));
-        }
 
         activateNotification(1, number.hashCode(), builder.build(), null);
     }
@@ -248,10 +246,9 @@ public class Notifier {
                 .setLights(preferences.getLEDColor(), preferences.isLEDNotificationEnabled() ? 700 : 0, 5000)
                 .setPriority(preferences.getNotificationPriority())
                 .setContentIntent(PendingIntent.getActivity(context, (int) id, intent, PendingIntent.FLAG_UPDATE_CURRENT));
-        if (!Strings.isNullOrEmpty(taskDescription) && preferences.getBoolean(R.string.p_rmd_show_description, true)) {
+        if (!Strings.isNullOrEmpty(taskDescription)) {
             builder.setStyle(new NotificationCompat.BigTextStyle().bigText(taskDescription));
         }
-        if (preferences.useNotificationActions()) {
         Intent completeIntent = new Intent(context, CompleteTaskReceiver.class);
         completeIntent.putExtra(CompleteTaskReceiver.TASK_ID, id);
         PendingIntent completePendingIntent = PendingIntent.getBroadcast(context, (int) id, completeIntent, PendingIntent.FLAG_UPDATE_CURRENT);
@@ -282,7 +279,6 @@ public class Notifier {
         builder.addAction(completeAction)
                 .addAction(R.drawable.ic_snooze_white_24dp, context.getResources().getString(R.string.rmd_NoA_snooze), snoozePendingIntent)
                 .extend(wearableExtender);
-        }
 
         activateNotification(ringTimes, (int) id, builder.build(), taskTitle);
 

app/src/main/java/org/tasks/preferences/Preferences.java

@@ -29,7 +29,6 @@ import javax.inject.Inject;
 import timber.log.Timber;
 
 import static android.content.SharedPreferences.Editor;
-import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybean;
 
 public class Preferences {
 
@@ -347,10 +346,6 @@ public class Preferences {
         }
     }
 
-    public boolean useNotificationActions() {
-        return atLeastJellybean() && getBoolean(R.string.p_rmd_notif_actions_enabled, true);
-    }
-
     public File getAttachmentsDirectory() {
         File directory = null;
         String customDir = getStringValue(R.string.p_attachment_dir);

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

@@ -169,7 +169,6 @@
 	<string name="quiet_hours_summary">لا تذكير أثناء أوقات الراحة</string>
 	<string name="TLA_menu_donate">تبرع</string>
 	<string name="select_amount">أختر الكمية</string>
-	<string name="notification_actions_summary">أظهر وظائف التأجيل و الإتمام في التنبيهات</string>
 	<string name="add_reminder">أضف منبه</string>
 	<string name="remove">حذف</string>
 	<string name="randomly">عشوائياً</string>

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

@@ -277,8 +277,6 @@
 	<string name="quiet_hours_summary">Без напомняния по време на тихи часове</string>
 	<string name="TLA_menu_donate">Дарете</string>
 	<string name="select_amount">Изберете размер</string>
-	<string name="notification_actions">Уведомление - Действия</string>
-	<string name="notification_actions_summary">Покажи опция за отлагане и пълни действия в уведомлението</string>
 	<string name="add_reminder">Добави напомняне</string>
 	<string name="remove">Изтрий</string>
 	<string name="randomly_once">Произволно веднъж</string>
@@ -396,7 +394,6 @@
 	<string name="widget_header_settings">Настройки на заглавието</string>
 	<string name="widget_row_settings">Настройки на реда</string>
 	<string name="notification_shade">Уведомления нюанс</string>
-	<string name="notification_description">Покажи описание на задачата</string>
 	<string name="sync_error_permissions">Tasks изисква разрешения</string>
 	<string name="creating_new_list">Нов списък</string>
 	<string name="deleting_list">Изтриване на списък</string>

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

@@ -252,8 +252,6 @@
 	<string name="rate_tasks">Ohodnotit Tasks</string>
 	<string name="quiet_hours_summary">Žádné připomínky během tichých hodin</string>
 	<string name="TLA_menu_donate">Darovat</string>
-	<string name="notification_actions">Akce upozornění</string>
-	<string name="notification_actions_summary">Zobraz akce odložení a dokončení v oznámeních</string>
 	<string name="remove">Odstranit</string>
 	<string name="randomly">Náhodně</string>
 	<string name="pick_a_date">Vybrat datum</string>

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

@@ -270,8 +270,6 @@
 	<string name="quiet_hours_summary">Keine Erinnerungen während Ruhezeit</string>
 	<string name="TLA_menu_donate">Spenden</string>
 	<string name="select_amount">Menge auswählen</string>
-	<string name="notification_actions">Benachrichtigunsaktionen</string>
-	<string name="notification_actions_summary">Zeige Snooze und Fertig Aktionen in Benachrichtigungen an</string>
 	<string name="add_reminder">Erinnerung hinzufügen</string>
 	<string name="remove">Entfernen</string>
 	<string name="randomly_once">Einmal zufällig</string>
@@ -384,7 +382,6 @@
 	<string name="widget_header_settings">Kopf-Einstellungen</string>
 	<string name="widget_row_settings">Reihen-Einstellungen</string>
 	<string name="notification_shade">Benachrichtigungsanzeige</string>
-	<string name="notification_description">Aufgabenbeschreibung anzeigen</string>
 	<string name="sync_error_permissions">Tasks benötigt Zugriff</string>
 	<string name="creating_new_list">Erstelle neue Liste</string>
 	<string name="deleting_list">Lösche Liste</string>

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

@@ -273,8 +273,6 @@
 	<string name="quiet_hours_summary">Sin avisos en horario silencioso</string>
 	<string name="TLA_menu_donate">Donar</string>
 	<string name="select_amount">Elegir cantidad</string>
-	<string name="notification_actions">Acciones de notificación</string>
-	<string name="notification_actions_summary">Mostrar ¡Terminada! y Posponer  en la notificación</string>
 	<string name="add_reminder">Añadir recordatorio</string>
 	<string name="remove">Eliminar</string>
 	<string name="randomly_once">Aleatorio, una sola vez</string>
@@ -390,7 +388,6 @@
 	<string name="widget_header_settings">Configuración de encabezado</string>
 	<string name="widget_row_settings">Configuración de fila</string>
 	<string name="notification_shade">Panel de notificaciones</string>
-	<string name="notification_description">Mostrar descripción de tarea</string>
 	<string name="sync_error_permissions">Tasks requiere permisos</string>
 	<string name="creating_new_list">Creando nueva lista</string>
 	<string name="deleting_list">Borrando lista</string>

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

@@ -208,8 +208,6 @@
 	<string name="quiet_hours_summary">بدون یادآور در ساعات سکوت</string>
 	<string name="TLA_menu_donate">کمک مالی</string>
 	<string name="select_amount">انتخاب مقدار</string>
-	<string name="notification_actions">عمل اعلان</string>
-	<string name="notification_actions_summary">در اعلانات، «تعویق» و «کامل‌شده» را نشان بده</string>
 	<string name="add_reminder">اضافه کردن یادآورد</string>
 	<string name="remove">حذف</string>
 	<string name="randomly_once">به طور تصادفی یک دفعه</string>

app/src/main/res/values-fi/strings.xml

@@ -276,8 +276,6 @@
 	<string name="quiet_hours_summary">Ei ilmoituksia hiljaisena aikana</string>
 	<string name="TLA_menu_donate">Lahjoita</string>
 	<string name="select_amount">Valitse määrä</string>
-	<string name="notification_actions">Muistutuksien vaikutus</string>
-	<string name="notification_actions_summary">Näytä torkku ja kuittaa toimet ilmoituksissa</string>
 	<string name="add_reminder">Lisää muistutus</string>
 	<string name="remove">Poista</string>
 	<string name="randomly_once">Satunnaisesti kerran</string>
@@ -394,7 +392,6 @@
 	<string name="widget_header_settings">Otsikon asetukset</string>
 	<string name="widget_row_settings">Rivin asetukset</string>
 	<string name="notification_shade">Muistutusvalikko</string>
-	<string name="notification_description">Näytä tehtävän kuvaus</string>
 	<string name="sync_error_permissions">Tasks vaatii  lupaa</string>
 	<string name="creating_new_list">Luo uusi lista</string>
 	<string name="deleting_list">Poista lista</string>

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

@@ -268,8 +268,6 @@
 	<string name="quiet_hours_summary">Pas de rappels pendant les heures silencieuses</string>
 	<string name="TLA_menu_donate">Remercier</string>
 	<string name="select_amount">Choisir le montant</string>
-	<string name="notification_actions">Actions dans les notifications</string>
-	<string name="notification_actions_summary">Afficher l\'option de rappel et indiquer qu\'une tâche est effectuée dans la notification</string>
 	<string name="add_reminder">Ajouter un rappel</string>
 	<string name="remove">Supprimer</string>
 	<string name="randomly_once">Une fois aléatoirement</string>
@@ -382,7 +380,6 @@
 	<string name="widget_header_settings">Paramètres de l\'en-tête</string>
 	<string name="widget_row_settings">Paramètres de la ligne</string>
 	<string name="notification_shade">Fréquence de notification</string>
-	<string name="notification_description">Montrer la description de la tâche</string>
 	<string name="sync_error_permissions">Permissions requises de Tasks.</string>
 	<string name="creating_new_list">Création d\'une nouvelle liste</string>
 	<string name="deleting_list">Suppression de la liste</string>

app/src/main/res/values-gl/strings.xml

@@ -274,8 +274,6 @@
 	<string name="quiet_hours_summary">Sen avisos en horario silencioso</string>
 	<string name="TLA_menu_donate">Donar</string>
 	<string name="select_amount">Elegir cantidad</string>
-	<string name="notification_actions">Acciones de notificación</string>
-	<string name="notification_actions_summary">Mostrar ¡Terminada! y Posponer  en la notificación</string>
 	<string name="add_reminder">Añadir recordatorio</string>
 	<string name="remove">Eliminar</string>
 	<string name="randomly_once">Aleatorio, una sola vez</string>
@@ -393,7 +391,6 @@
 	<string name="widget_header_settings">Configuración de encabezado</string>
 	<string name="widget_row_settings">Configuración de fila</string>
 	<string name="notification_shade">Panel de notificaciones</string>
-	<string name="notification_description">Mostrar descripción de tarea</string>
 	<string name="sync_error_permissions">Tasks requiere permisos</string>
 	<string name="creating_new_list">Creando nueva lista</string>
 	<string name="deleting_list">Borrando lista</string>

app/src/main/res/values-hu/strings.xml

@@ -277,8 +277,6 @@
 	<string name="quiet_hours_summary">Emlékeztetők mellőzése csendes órák alatt</string>
 	<string name="TLA_menu_donate">Adakozás</string>
 	<string name="select_amount">Mennyiség kiválasztása</string>
-	<string name="notification_actions">Értesítési műveletek</string>
-	<string name="notification_actions_summary">Szundi és az összes művelet mutatása az értesítésben</string>
 	<string name="add_reminder">Emlékeztető hozzáadása</string>
 	<string name="remove">Eltávolítás</string>
 	<string name="randomly_once">Véletlenszerűen egyszer</string>
@@ -396,7 +394,6 @@
 	<string name="widget_header_settings">Fejléc beállításai</string>
 	<string name="widget_row_settings">Sorok beállíátsai</string>
 	<string name="notification_shade">Értesítés árnyéka</string>
-	<string name="notification_description">Feladat leírásának megjelenítése</string>
 	<string name="sync_error_permissions">A Tasks engedélyre vár</string>
 	<string name="creating_new_list">Új lista létrehozása</string>
 	<string name="deleting_list">Lista törlése</string>

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

@@ -274,8 +274,6 @@
 	<string name="quiet_hours_summary">Non notificare durante le ore di riposo</string>
 	<string name="TLA_menu_donate">Dona</string>
 	<string name="select_amount">Seleziona quantità</string>
-	<string name="notification_actions">Modalità di notifica</string>
-	<string name="notification_actions_summary">Mostra allarme e completa le azioni in notifica</string>
 	<string name="add_reminder">Aggiungi promemoria</string>
 	<string name="remove">Elimina</string>
 	<string name="randomly_once">In modo casuale</string>
@@ -392,7 +390,6 @@
 	<string name="widget_header_settings">Impostazioni intestazione</string>
 	<string name="widget_row_settings">Impostazioni riga</string>
 	<string name="notification_shade">Sfumatura notifiche</string>
-	<string name="notification_description">Mostra descrizione attività</string>
 	<string name="sync_error_permissions">L\'attività richiede l\'autorizzazione</string>
 	<string name="creating_new_list">Crea nuova lista</string>
 	<string name="deleting_list">Cancella lista</string>

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

@@ -275,8 +275,6 @@
 	<string name="quiet_hours_summary">ללא התראות בשעות השקטות</string>
 	<string name="TLA_menu_donate">לתרומה</string>
 	<string name="select_amount">בחר כמות</string>
-	<string name="notification_actions">כפתורים בהתראות</string>
-	<string name="notification_actions_summary">הצגת \"נודניק\" ו\"בוצעה\" בהתראה</string>
 	<string name="add_reminder">הוסף תזכורת</string>
 	<string name="remove">הסר</string>
 	<string name="randomly_once">אקראי יחיד</string>
@@ -394,7 +392,6 @@
 	<string name="widget_header_settings">הגדרות כותרת</string>
 	<string name="widget_row_settings">הגדרות שורה</string>
 	<string name="notification_shade">וילון ההתראות</string>
-	<string name="notification_description">הצג תיאור משימה</string>
 	<string name="sync_error_permissions">דרושות הרשאות</string>
 	<string name="creating_new_list">יוצר רשימה חדשה</string>
 	<string name="deleting_list">מוחק רשימה</string>

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

@@ -275,8 +275,6 @@
 	<string name="quiet_hours_summary">消音時間の間はリマインダーは動作しません</string>
 	<string name="TLA_menu_donate">寄付</string>
 	<string name="select_amount">金額を選択</string>
-	<string name="notification_actions">通知アクション</string>
-	<string name="notification_actions_summary">通知にスヌーズと完了アクションを表示します</string>
 	<string name="add_reminder">リマインダーを追加</string>
 	<string name="remove">削除</string>
 	<string name="randomly_once">1回ランダムに</string>
@@ -394,7 +392,6 @@
 	<string name="widget_header_settings">ヘッダー設定</string>
 	<string name="widget_row_settings">行設定</string>
 	<string name="notification_shade">通知の影</string>
-	<string name="notification_description">タスクの概要を表示する</string>
 	<string name="sync_error_permissions">Tasks はアクセス許可が必要です</string>
 	<string name="creating_new_list">新しいリストを作成中</string>
 	<string name="deleting_list">リストの削除中</string>

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

@@ -279,8 +279,6 @@
 	<string name="quiet_hours_summary">무음 시간대에는 알림 해제</string>
 	<string name="TLA_menu_donate">기부하기</string>
 	<string name="select_amount">숫자 선택</string>
-	<string name="notification_actions">알림 동작</string>
-	<string name="notification_actions_summary">알림 항목에 알림 잠시 미루기와 일정 완료를 표시하기</string>
 	<string name="add_reminder">알림 추가</string>
 	<string name="remove">지우기</string>
 	<string name="randomly_once">무작위로 한 번</string>
@@ -398,7 +396,6 @@
 	<string name="widget_header_settings">헤더 설정</string>
 	<string name="widget_row_settings">줄 설정</string>
 	<string name="notification_shade">상단바</string>
-	<string name="notification_description">할일 설명 보기</string>
 	<string name="sync_error_permissions">Tasks는 권한이 필요합니다. </string>
 	<string name="creating_new_list">새 목록 만들기</string>
 	<string name="deleting_list">목록 삭제하기</string>

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

@@ -272,8 +272,6 @@
 	<string name="quiet_hours_summary">Geen herinneringen tijdens stille uren</string>
 	<string name="TLA_menu_donate">Doneer</string>
 	<string name="select_amount">Selecteer aantal</string>
-	<string name="notification_actions">Notificatie Acties</string>
-	<string name="notification_actions_summary">Toon snooze en voltooide acties in een melding</string>
 	<string name="add_reminder">Voeg herinnering toe</string>
 	<string name="remove">Verwijder</string>
 	<string name="randomly_once">Willekeurig eenmalig</string>
@@ -384,7 +382,6 @@
 	<string name="widget_header_settings">Titel instellingen</string>
 	<string name="widget_row_settings">Regel instellingen</string>
 	<string name="notification_shade">Notificatie schaduw</string>
-	<string name="notification_description">Toon taak omschrijving</string>
 	<string name="sync_error_permissions">Tasks vereist permissie</string>
 	<string name="creating_new_list">Nieuwe lijst aanmaken</string>
 	<string name="deleting_list">Verwijder lijst</string>

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

@@ -274,8 +274,6 @@
 	<string name="quiet_hours_summary">Brak przypomnień w czasie wyciszenia</string>
 	<string name="TLA_menu_donate">Wesprzyj</string>
 	<string name="select_amount">Wybierz sumę</string>
-	<string name="notification_actions">Akcja powiadomienia</string>
-	<string name="notification_actions_summary">Pokaż uśpione i ukończone zadania w powiadomieniach</string>
 	<string name="add_reminder">Dodaj przypomnienie</string>
 	<string name="remove">Usuń</string>
 	<string name="randomly_once">Losowo raz</string>
@@ -392,7 +390,6 @@
 	<string name="widget_header_settings">Ustawienia nagłówka</string>
 	<string name="widget_row_settings">Ustawienia rzędu</string>
 	<string name="notification_shade">Panel powiadomień</string>
-	<string name="notification_description">Pokaż opis zadania</string>
 	<string name="sync_error_permissions">Tasks wymaga uprawnienia</string>
 	<string name="creating_new_list">Tworzenie nowej listy</string>
 	<string name="deleting_list">Usuwanie listy</string>

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

@@ -269,8 +269,6 @@
 	<string name="quiet_hours_summary">Sem lembretes durante as horas calmas</string>
 	<string name="TLA_menu_donate">Doar</string>
 	<string name="select_amount">Selecionar quantia</string>
-	<string name="notification_actions">Ações na notificação</string>
-	<string name="notification_actions_summary">Mostrar as ações \"Adiar\" e \"Concluída\" na notificação</string>
 	<string name="add_reminder">Adicionar lembrete</string>
 	<string name="remove">Remover</string>
 	<string name="randomly_once">Aleatoriamente uma vez</string>
@@ -385,7 +383,6 @@
 	<string name="widget_header_settings">Config. cabeçalho</string>
 	<string name="widget_row_settings">Congif. entrada</string>
 	<string name="notification_shade">Painel de notificações</string>
-	<string name="notification_description">Mostrar descrição</string>
 	<string name="sync_error_permissions">Tasks precisa de permissão</string>
 	<string name="creating_new_list">Criando uma nova lista</string>
 	<string name="deleting_list">Excluindo lista</string>

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

@@ -248,8 +248,6 @@
 	<string name="rate_tasks">Avaliar o Tasks</string>
 	<string name="TLA_menu_donate">Donativos</string>
 	<string name="select_amount">Selecione o valor</string>
-	<string name="notification_actions">Ações de notificação</string>
-	<string name="notification_actions_summary">Mostrar snooze e tarefas completas nas notificações</string>
 	<string name="add_reminder">Adicionar lembrete</string>
 	<string name="remove">Remover</string>
 	<string name="randomly_once">Uma vez aleatória</string>

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

@@ -274,8 +274,6 @@
 	<string name="quiet_hours_summary">Выкл. напоминания в тихие часы</string>
 	<string name="TLA_menu_donate">Поддержать разработку</string>
 	<string name="select_amount">Выберите количество</string>
-	<string name="notification_actions">Команды в уведомлении</string>
-	<string name="notification_actions_summary">Показывать «Повтор» и «Уже готово!» в уведомлении</string>
 	<string name="add_reminder">Добавить напоминание</string>
 	<string name="remove">Удалить</string>
 	<string name="randomly_once">Случайно один раз</string>
@@ -393,7 +391,6 @@
 	<string name="widget_header_settings">Настройки закоголовка</string>
 	<string name="widget_row_settings">Настройки строк</string>
 	<string name="notification_shade">Тень уведомления</string>
-	<string name="notification_description">Показать описание задачи</string>
 	<string name="sync_error_permissions">Запрашиваемые разрешения</string>
 	<string name="creating_new_list">Создание нового списка</string>
 	<string name="deleting_list">Удаление списка</string>

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

@@ -241,8 +241,6 @@
 	<string name="rate_tasks">Ohodnotiť Tasks</string>
 	<string name="TLA_menu_donate">Darovať</string>
 	<string name="select_amount">Vybrať sumu</string>
-	<string name="notification_actions">Oznámenia akcií</string>
-	<string name="notification_actions_summary">Zobraziť odložené a dokončené akcie v notifikačnej lište</string>
 	<string name="add_reminder">Pridať pripomienku</string>
 	<string name="remove">Odstrániť</string>
 	<string name="randomly_once">Raz náhodne</string>

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

@@ -273,8 +273,6 @@
 	<string name="quiet_hours_summary">Inga påminnelser kommer att göras under under tyst period</string>
 	<string name="TLA_menu_donate">Donera</string>
 	<string name="select_amount">Välj antal</string>
-	<string name="notification_actions">Påminnelser åtgärd</string>
-	<string name="notification_actions_summary">Visa åtgärden snooza och slutför i påmminelser</string>
 	<string name="add_reminder">Lägg till en påminnelse</string>
 	<string name="remove">Ta bort</string>
 	<string name="randomly_once">En gång slumpmässigt</string>

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

@@ -215,7 +215,6 @@
 	<string name="contact_developer">Geliştiriciyle iletişime geç</string>
 	<string name="rate_tasks">Tasks\'i Oyla</string>
 	<string name="quiet_hours_summary">Sessiz saatlerde hatırlatıcı yok</string>
-	<string name="notification_actions_summary">Bildirimde erteleme ve tamamlanma hareketlerini göster</string>
 	<string name="randomly_once">Şunda rastgele bir kez</string>
 	<string name="pick_a_date">Bir tarih seç</string>
 	<string name="when_overdue">Geciktiğinde</string>

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

@@ -276,8 +276,6 @@
 	<string name="quiet_hours_summary">Без нагадувань під час тихих годин</string>
 	<string name="TLA_menu_donate">Пожертвувати</string>
 	<string name="select_amount">Обрати кількість</string>
-	<string name="notification_actions">Дії в сповіщеннях</string>
-	<string name="notification_actions_summary">Показувати дії відкладення та завершення в сповіщеннях</string>
 	<string name="add_reminder">Додати нагадування</string>
 	<string name="remove">Вилучити</string>
 	<string name="randomly_once">Випадково раз</string>
@@ -395,7 +393,6 @@
 	<string name="widget_header_settings">Налаштування заголовку</string>
 	<string name="widget_row_settings">Налаштування рядку</string>
 	<string name="notification_shade">Панель сповіщення</string>
-	<string name="notification_description">Показувати опис завдання</string>
 	<string name="sync_error_permissions">Завдання потребують дозволу</string>
 	<string name="creating_new_list">Створення нового списку</string>
 	<string name="deleting_list">Видалення списку</string>

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

@@ -242,5 +242,4 @@
 	<string name="layout_direction_left_to_right">从左到右</string>
 	<string name="layout_direction_right_to_left">从右到左</string>
 	<string name="led_notification">LED提醒</string>
-	<string name="notification_description">显示任务备注</string>
 </resources>

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

@@ -240,5 +240,4 @@
 	<string name="layout_direction_left_to_right">由左至右</string>
 	<string name="layout_direction_right_to_left">由右至左</string>
 	<string name="led_color">LED 顏色</string>
-	<string name="notification_description">顯示工作描述</string>
 </resources>

app/src/main/res/values/keys.xml

@@ -195,7 +195,6 @@
     <string name="TEA_ctrl_gcal">TEA_ctrl_gcal</string>
   <string name="TEA_ctrl_google_task_list">TEA_ctrl_gtask</string>
     <string name="sync_gtasks">sync_gtasks</string>
-    <string name="p_rmd_notif_actions_enabled">p_rmd_notif_actions_enabled</string>
   <string name="p_geofence_radius">geolocation_radius</string>
   <string name="p_geofence_responsiveness">geofence_responsiveness</string>
   <string name="p_show_hidden_tasks">show_hidden_tasks</string>
@@ -299,7 +298,6 @@
   <string name="debug_unlock_purchases">Unlock purchases</string>
   <string name="debug_consume_purchases">Consume purchases</string>
   <string name="debug">Debug</string>
-  <string name="p_rmd_show_description">rmd_show_description</string>
   <string name="p_start_of_week">start_of_week</string>
   <string name="p_use_native_datetime_pickers">use_native_datetime_pickers</string>
   <string name="gtask_background_sync">gtask_background_sync</string>

app/src/main/res/values/strings.xml

@@ -675,8 +675,6 @@ File %1$s contained %2$s.\n\n
     <string name="quiet_hours_summary">No reminders during quiet hours</string>
     <string name="TLA_menu_donate">Donate</string>
     <string name="select_amount">Select amount</string>
-    <string name="notification_actions">Notification actions</string>
-    <string name="notification_actions_summary">Show snooze and complete actions in notification</string>
     <string name="add_reminder">Add reminder</string>
     <string name="remove">Remove</string>
     <string name="randomly_once">Randomly once</string>
@@ -796,7 +794,6 @@ File %1$s contained %2$s.\n\n
   <string name="widget_header_settings">Header settings</string>
   <string name="widget_row_settings">Row settings</string>
   <string name="notification_shade">Notification shade</string>
-  <string name="notification_description">Show task description</string>
   <string name="sync_error_permissions">Tasks requires permission</string>
   <string name="creating_new_list">Creating new list</string>
   <string name="deleting_list">Deleting list</string>

app/src/main/res/xml/preferences_reminders.xml

@@ -54,17 +54,6 @@
             android:key="@string/p_rmd_persistent"
             android:summary="@string/persistent_notifications_description"
             android:title="@string/persistent_notifications" />
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:defaultValue="true"
-            android:dependency="@string/p_rmd_enabled"
-            android:key="@string/p_rmd_notif_actions_enabled"
-            android:summary="@string/notification_actions_summary"
-            android:title="@string/notification_actions" />
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:defaultValue="true"
-            android:dependency="@string/p_rmd_enabled"
-            android:key="@string/p_rmd_show_description"
-            android:title="@string/notification_description" />
 
     </PreferenceCategory>