diff --git a/app/scripts/getloc.rb b/app/scripts/getloc.rb index 506e28df9..c88d99115 100755 --- a/app/scripts/getloc.rb +++ b/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]}) - `sed -i '/\s*\s*$/d' #{tmp_files[i]}` # strip comments + %x(gsed -i "s/\\([^\\\\\\]\\)'/\\1\\\\\\'/g" #{tmp_files[i]}) + `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 diff --git a/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java b/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java index 2f55b384c..60f8386db 100644 --- a/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java +++ b/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(); diff --git a/app/src/main/java/org/tasks/Notifier.java b/app/src/main/java/org/tasks/Notifier.java index dcaab9049..5359065b2 100644 --- a/app/src/main/java/org/tasks/Notifier.java +++ b/app/src/main/java/org/tasks/Notifier.java @@ -97,24 +97,22 @@ 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); - callNow.putExtra(MissedCallActivity.EXTRA_NAME, name); - callNow.putExtra(MissedCallActivity.EXTRA_TITLE, title); - callNow.putExtra(MissedCallActivity.EXTRA_CALL_NOW, true); - - Intent callLater = new Intent(context, MissedCallActivity.class); - callLater.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - callLater.putExtra(MissedCallActivity.EXTRA_NUMBER, number); - callLater.putExtra(MissedCallActivity.EXTRA_NAME, name); - callLater.putExtra(MissedCallActivity.EXTRA_TITLE, title); - callLater.putExtra(MissedCallActivity.EXTRA_CALL_LATER, true); - 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)); - } + Intent callNow = new Intent(context, MissedCallActivity.class); + callNow.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + callNow.putExtra(MissedCallActivity.EXTRA_NUMBER, number); + callNow.putExtra(MissedCallActivity.EXTRA_NAME, name); + callNow.putExtra(MissedCallActivity.EXTRA_TITLE, title); + callNow.putExtra(MissedCallActivity.EXTRA_CALL_NOW, true); + + Intent callLater = new Intent(context, MissedCallActivity.class); + callLater.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + callLater.putExtra(MissedCallActivity.EXTRA_NUMBER, number); + callLater.putExtra(MissedCallActivity.EXTRA_NAME, name); + callLater.putExtra(MissedCallActivity.EXTRA_TITLE, title); + callLater.putExtra(MissedCallActivity.EXTRA_CALL_LATER, true); + 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,42 +246,40 @@ 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); - - NotificationCompat.Action completeAction = new NotificationCompat.Action.Builder( - R.drawable.ic_check_white_24dp, context.getResources().getString(R.string.rmd_NoA_done), completePendingIntent).build(); - - Intent snoozeIntent = new Intent(context, SnoozeActivity.class); - snoozeIntent.setFlags(FLAG_ACTIVITY_NEW_TASK); - snoozeIntent.putExtra(SnoozeActivity.EXTRA_TASK_ID, id); - PendingIntent snoozePendingIntent = PendingIntent.getActivity(context, (int) id, snoozeIntent, PendingIntent.FLAG_UPDATE_CURRENT); - - NotificationCompat.WearableExtender wearableExtender = new NotificationCompat.WearableExtender(); - wearableExtender.addAction(completeAction); - for (final SnoozeOption snoozeOption : SnoozeDialog.getSnoozeOptions(preferences)) { - final long timestamp = snoozeOption.getDateTime().getMillis(); - Intent wearableIntent = new Intent(context, SnoozeActivity.class); - wearableIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - wearableIntent.setAction(String.format("snooze-%s-%s", id, timestamp)); - wearableIntent.putExtra(SnoozeActivity.EXTRA_TASK_ID, id); - wearableIntent.putExtra(SnoozeActivity.EXTRA_SNOOZE_TIME, timestamp); - PendingIntent wearablePendingIntent = PendingIntent.getActivity(context, (int) id, wearableIntent, PendingIntent.FLAG_UPDATE_CURRENT); - wearableExtender.addAction(new NotificationCompat.Action.Builder( - R.drawable.ic_snooze_white_24dp, context.getString(snoozeOption.getResId()), wearablePendingIntent) - .build()); - } - - builder.addAction(completeAction) - .addAction(R.drawable.ic_snooze_white_24dp, context.getResources().getString(R.string.rmd_NoA_snooze), snoozePendingIntent) - .extend(wearableExtender); + 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); + + NotificationCompat.Action completeAction = new NotificationCompat.Action.Builder( + R.drawable.ic_check_white_24dp, context.getResources().getString(R.string.rmd_NoA_done), completePendingIntent).build(); + + Intent snoozeIntent = new Intent(context, SnoozeActivity.class); + snoozeIntent.setFlags(FLAG_ACTIVITY_NEW_TASK); + snoozeIntent.putExtra(SnoozeActivity.EXTRA_TASK_ID, id); + PendingIntent snoozePendingIntent = PendingIntent.getActivity(context, (int) id, snoozeIntent, PendingIntent.FLAG_UPDATE_CURRENT); + + NotificationCompat.WearableExtender wearableExtender = new NotificationCompat.WearableExtender(); + wearableExtender.addAction(completeAction); + for (final SnoozeOption snoozeOption : SnoozeDialog.getSnoozeOptions(preferences)) { + final long timestamp = snoozeOption.getDateTime().getMillis(); + Intent wearableIntent = new Intent(context, SnoozeActivity.class); + wearableIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + wearableIntent.setAction(String.format("snooze-%s-%s", id, timestamp)); + wearableIntent.putExtra(SnoozeActivity.EXTRA_TASK_ID, id); + wearableIntent.putExtra(SnoozeActivity.EXTRA_SNOOZE_TIME, timestamp); + PendingIntent wearablePendingIntent = PendingIntent.getActivity(context, (int) id, wearableIntent, PendingIntent.FLAG_UPDATE_CURRENT); + wearableExtender.addAction(new NotificationCompat.Action.Builder( + R.drawable.ic_snooze_white_24dp, context.getString(snoozeOption.getResId()), wearablePendingIntent) + .build()); } + 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); return true; diff --git a/app/src/main/java/org/tasks/preferences/Preferences.java b/app/src/main/java/org/tasks/preferences/Preferences.java index 1b49af335..02159c0a0 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.java +++ b/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); diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ff35a9051..fbca7bc59 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -169,7 +169,6 @@ لا تذكير أثناء أوقات الراحة تبرع أختر الكمية - أظهر وظائف التأجيل و الإتمام في التنبيهات أضف منبه حذف عشوائياً diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 704fb69a0..d7e4b71d3 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -277,8 +277,6 @@ Без напомняния по време на тихи часове Дарете Изберете размер - Уведомление - Действия - Покажи опция за отлагане и пълни действия в уведомлението Добави напомняне Изтрий Произволно веднъж @@ -396,7 +394,6 @@ Настройки на заглавието Настройки на реда Уведомления нюанс - Покажи описание на задачата Tasks изисква разрешения Нов списък Изтриване на списък diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 33666d7c5..b83917b8b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -252,8 +252,6 @@ Ohodnotit Tasks Žádné připomínky během tichých hodin Darovat - Akce upozornění - Zobraz akce odložení a dokončení v oznámeních Odstranit Náhodně Vybrat datum diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2c3300c04..e4188f3db 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -270,8 +270,6 @@ Keine Erinnerungen während Ruhezeit Spenden Menge auswählen - Benachrichtigunsaktionen - Zeige Snooze und Fertig Aktionen in Benachrichtigungen an Erinnerung hinzufügen Entfernen Einmal zufällig @@ -384,7 +382,6 @@ Kopf-Einstellungen Reihen-Einstellungen Benachrichtigungsanzeige - Aufgabenbeschreibung anzeigen Tasks benötigt Zugriff Erstelle neue Liste Lösche Liste diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ef974a760..6cb0063ed 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -273,8 +273,6 @@ Sin avisos en horario silencioso Donar Elegir cantidad - Acciones de notificación - Mostrar ¡Terminada! y Posponer en la notificación Añadir recordatorio Eliminar Aleatorio, una sola vez @@ -390,7 +388,6 @@ Configuración de encabezado Configuración de fila Panel de notificaciones - Mostrar descripción de tarea Tasks requiere permisos Creando nueva lista Borrando lista diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index b632ef5ee..56a49114b 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -208,8 +208,6 @@ بدون یادآور در ساعات سکوت کمک مالی انتخاب مقدار - عمل اعلان - در اعلانات، «تعویق» و «کامل‌شده» را نشان بده اضافه کردن یادآورد حذف به طور تصادفی یک دفعه diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 6cfc19d49..66c6cddba 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -276,8 +276,6 @@ Ei ilmoituksia hiljaisena aikana Lahjoita Valitse määrä - Muistutuksien vaikutus - Näytä torkku ja kuittaa toimet ilmoituksissa Lisää muistutus Poista Satunnaisesti kerran @@ -394,7 +392,6 @@ Otsikon asetukset Rivin asetukset Muistutusvalikko - Näytä tehtävän kuvaus Tasks vaatii lupaa Luo uusi lista Poista lista diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d1101b977..a03a972a4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -268,8 +268,6 @@ Pas de rappels pendant les heures silencieuses Remercier Choisir le montant - Actions dans les notifications - Afficher l\'option de rappel et indiquer qu\'une tâche est effectuée dans la notification Ajouter un rappel Supprimer Une fois aléatoirement @@ -382,7 +380,6 @@ Paramètres de l\'en-tête Paramètres de la ligne Fréquence de notification - Montrer la description de la tâche Permissions requises de Tasks. Création d\'une nouvelle liste Suppression de la liste diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 35b34ab79..0f4b1b69c 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -274,8 +274,6 @@ Sen avisos en horario silencioso Donar Elegir cantidad - Acciones de notificación - Mostrar ¡Terminada! y Posponer en la notificación Añadir recordatorio Eliminar Aleatorio, una sola vez @@ -393,7 +391,6 @@ Configuración de encabezado Configuración de fila Panel de notificaciones - Mostrar descripción de tarea Tasks requiere permisos Creando nueva lista Borrando lista diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 804d9cb9e..4166e2333 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -277,8 +277,6 @@ Emlékeztetők mellőzése csendes órák alatt Adakozás Mennyiség kiválasztása - Értesítési műveletek - Szundi és az összes művelet mutatása az értesítésben Emlékeztető hozzáadása Eltávolítás Véletlenszerűen egyszer @@ -396,7 +394,6 @@ Fejléc beállításai Sorok beállíátsai Értesítés árnyéka - Feladat leírásának megjelenítése A Tasks engedélyre vár Új lista létrehozása Lista törlése diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 823cce2db..36f31f32d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -274,8 +274,6 @@ Non notificare durante le ore di riposo Dona Seleziona quantità - Modalità di notifica - Mostra allarme e completa le azioni in notifica Aggiungi promemoria Elimina In modo casuale @@ -392,7 +390,6 @@ Impostazioni intestazione Impostazioni riga Sfumatura notifiche - Mostra descrizione attività L\'attività richiede l\'autorizzazione Crea nuova lista Cancella lista diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 6c55339a7..622389671 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -275,8 +275,6 @@ ללא התראות בשעות השקטות לתרומה בחר כמות - כפתורים בהתראות - הצגת \"נודניק\" ו\"בוצעה\" בהתראה הוסף תזכורת הסר אקראי יחיד @@ -394,7 +392,6 @@ הגדרות כותרת הגדרות שורה וילון ההתראות - הצג תיאור משימה דרושות הרשאות יוצר רשימה חדשה מוחק רשימה diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 74546ec2a..ffa90cec2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -275,8 +275,6 @@ 消音時間の間はリマインダーは動作しません 寄付 金額を選択 - 通知アクション - 通知にスヌーズと完了アクションを表示します リマインダーを追加 削除 1回ランダムに @@ -394,7 +392,6 @@ ヘッダー設定 行設定 通知の影 - タスクの概要を表示する Tasks はアクセス許可が必要です 新しいリストを作成中 リストの削除中 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 2375ed287..ba8854099 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -279,8 +279,6 @@ 무음 시간대에는 알림 해제 기부하기 숫자 선택 - 알림 동작 - 알림 항목에 알림 잠시 미루기와 일정 완료를 표시하기 알림 추가 지우기 무작위로 한 번 @@ -398,7 +396,6 @@ 헤더 설정 줄 설정 상단바 - 할일 설명 보기 Tasks는 권한이 필요합니다. 새 목록 만들기 목록 삭제하기 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 63c4bfe44..657c8a757 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -272,8 +272,6 @@ Geen herinneringen tijdens stille uren Doneer Selecteer aantal - Notificatie Acties - Toon snooze en voltooide acties in een melding Voeg herinnering toe Verwijder Willekeurig eenmalig @@ -384,7 +382,6 @@ Titel instellingen Regel instellingen Notificatie schaduw - Toon taak omschrijving Tasks vereist permissie Nieuwe lijst aanmaken Verwijder lijst diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c4ffa7378..137808da1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -274,8 +274,6 @@ Brak przypomnień w czasie wyciszenia Wesprzyj Wybierz sumę - Akcja powiadomienia - Pokaż uśpione i ukończone zadania w powiadomieniach Dodaj przypomnienie Usuń Losowo raz @@ -392,7 +390,6 @@ Ustawienia nagłówka Ustawienia rzędu Panel powiadomień - Pokaż opis zadania Tasks wymaga uprawnienia Tworzenie nowej listy Usuwanie listy diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index baaf01f23..8db15de26 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -269,8 +269,6 @@ Sem lembretes durante as horas calmas Doar Selecionar quantia - Ações na notificação - Mostrar as ações \"Adiar\" e \"Concluída\" na notificação Adicionar lembrete Remover Aleatoriamente uma vez @@ -385,7 +383,6 @@ Config. cabeçalho Congif. entrada Painel de notificações - Mostrar descrição Tasks precisa de permissão Criando uma nova lista Excluindo lista diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d455cdf63..600210c8f 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -248,8 +248,6 @@ Avaliar o Tasks Donativos Selecione o valor - Ações de notificação - Mostrar snooze e tarefas completas nas notificações Adicionar lembrete Remover Uma vez aleatória diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2b71ccbb5..69c0ad888 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -274,8 +274,6 @@ Выкл. напоминания в тихие часы Поддержать разработку Выберите количество - Команды в уведомлении - Показывать «Повтор» и «Уже готово!» в уведомлении Добавить напоминание Удалить Случайно один раз @@ -393,7 +391,6 @@ Настройки закоголовка Настройки строк Тень уведомления - Показать описание задачи Запрашиваемые разрешения Создание нового списка Удаление списка diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 4c8a0eae0..ba64e0617 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -241,8 +241,6 @@ Ohodnotiť Tasks Darovať Vybrať sumu - Oznámenia akcií - Zobraziť odložené a dokončené akcie v notifikačnej lište Pridať pripomienku Odstrániť Raz náhodne diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index bff98b42f..75c478fd8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -273,8 +273,6 @@ Inga påminnelser kommer att göras under under tyst period Donera Välj antal - Påminnelser åtgärd - Visa åtgärden snooza och slutför i påmminelser Lägg till en påminnelse Ta bort En gång slumpmässigt diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ab1d36145..011add566 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -215,7 +215,6 @@ Geliştiriciyle iletişime geç Tasks\'i Oyla Sessiz saatlerde hatırlatıcı yok - Bildirimde erteleme ve tamamlanma hareketlerini göster Şunda rastgele bir kez Bir tarih seç Geciktiğinde diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a9bacfc8e..9431eea21 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -276,8 +276,6 @@ Без нагадувань під час тихих годин Пожертвувати Обрати кількість - Дії в сповіщеннях - Показувати дії відкладення та завершення в сповіщеннях Додати нагадування Вилучити Випадково раз @@ -395,7 +393,6 @@ Налаштування заголовку Налаштування рядку Панель сповіщення - Показувати опис завдання Завдання потребують дозволу Створення нового списку Видалення списку diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 852e0a4a9..559897276 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -242,5 +242,4 @@ 从左到右 从右到左 LED提醒 - 显示任务备注 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e7fc5aed8..8df6affc7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -240,5 +240,4 @@ 由左至右 由右至左 LED 顏色 - 顯示工作描述 \ No newline at end of file diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 615138473..4f59c2fde 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -195,7 +195,6 @@ TEA_ctrl_gcal TEA_ctrl_gtask sync_gtasks - p_rmd_notif_actions_enabled geolocation_radius geofence_responsiveness show_hidden_tasks @@ -299,7 +298,6 @@ Unlock purchases Consume purchases Debug - rmd_show_description start_of_week use_native_datetime_pickers gtask_background_sync diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ef8978a31..c9037dd70 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -675,8 +675,6 @@ File %1$s contained %2$s.\n\n No reminders during quiet hours Donate Select amount - Notification actions - Show snooze and complete actions in notification Add reminder Remove Randomly once @@ -796,7 +794,6 @@ File %1$s contained %2$s.\n\n Header settings Row settings Notification shade - Show task description Tasks requires permission Creating new list Deleting list diff --git a/app/src/main/res/xml/preferences_reminders.xml b/app/src/main/res/xml/preferences_reminders.xml index 34a935918..d9f7d19f1 100644 --- a/app/src/main/res/xml/preferences_reminders.xml +++ b/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" /> - -