diff --git a/astrid/src/main/AndroidManifest.xml b/astrid/src/main/AndroidManifest.xml
index dfcc6751a..a8ec4ec63 100644
--- a/astrid/src/main/AndroidManifest.xml
+++ b/astrid/src/main/AndroidManifest.xml
@@ -219,12 +219,6 @@
-
-
-
-
-
-
diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index 4bb33f756..c1829c64d 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -511,8 +511,7 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
* Report who launched this activity
*/
protected void trackActivitySource() {
- switch (getIntent().getIntExtra(TOKEN_SOURCE,
- Constants.SOURCE_DEFAULT)) {
+ switch (getIntent().getIntExtra(TOKEN_SOURCE, Constants.SOURCE_DEFAULT)) {
case Constants.SOURCE_NOTIFICATION:
break;
case Constants.SOURCE_OTHER:
@@ -523,7 +522,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
break;
case Constants.SOURCE_C2DM:
break;
- case Constants.SOURCE_REENGAGEMENT:
}
getIntent().putExtra(TOKEN_SOURCE, Constants.SOURCE_DEFAULT); // Only report source once
}
diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementFragment.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementFragment.java
deleted file mode 100644
index 8bc42e570..000000000
--- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementFragment.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.reminders;
-
-import android.content.res.Resources;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.todoroo.astrid.activity.TaskListFragment;
-import com.todoroo.astrid.service.ThemeService;
-
-import org.tasks.R;
-
-public class ReengagementFragment extends TaskListFragment {
-
- public static final String EXTRA_TEXT = "dialogText"; //$NON-NLS-1$
-
- @Override
- protected void initializeData() {
- // hide quick add
- getView().findViewById(R.id.taskListFooter).setVisibility(View.GONE);
-
- super.initializeData();
-
- setupSpeechBubble();
- }
-
- @Override
- protected View getListBody(ViewGroup root) {
- ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.task_list_body_reengagement, root, false);
-
- View taskListView = super.getListBody(parent);
- parent.addView(taskListView, 0);
-
- return parent;
- }
-
- @Override
- protected void refresh() {
- super.refresh();
- setupSpeechBubble();
- }
-
- private void setupSpeechBubble() {
- Resources r = getActivity().getResources();
- TextView snooze = (TextView) getView().findViewById(R.id.reminder_snooze);
- snooze.setBackgroundColor(r.getColor(ThemeService.getThemeColor()));
- TextView reminder = (TextView) getView().findViewById(R.id.reminder_message);
- if (taskAdapter.getCount() == 0) {
- snooze.setText(R.string.rmd_reengage_add_tasks);
- snooze.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- quickAddBar.performButtonClick();
- }
- });
- } else {
- snooze.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- getActivity().finish();
- }
- });
- }
-
- reminder.setText(extras.getString(EXTRA_TEXT));
- }
-
-}
diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementReceiver.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementReceiver.java
deleted file mode 100644
index ff683f1f1..000000000
--- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementReceiver.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.reminders;
-
-import android.app.Notification;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Color;
-import android.os.Bundle;
-
-import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.DependencyInjectionService;
-import com.todoroo.andlib.service.NotificationManager;
-import com.todoroo.andlib.service.NotificationManager.AndroidNotificationManager;
-import com.todoroo.andlib.sql.Query;
-import com.todoroo.andlib.sql.QueryTemplate;
-import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.activity.TaskListActivity;
-import com.todoroo.astrid.activity.TaskListFragment;
-import com.todoroo.astrid.api.FilterWithCustomIntent;
-import com.todoroo.astrid.core.SortHelper;
-import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
-import com.todoroo.astrid.data.Task;
-import com.todoroo.astrid.service.TaskService;
-import com.todoroo.astrid.utility.Constants;
-import com.todoroo.astrid.utility.Flags;
-
-import org.tasks.R;
-
-public class ReengagementReceiver extends BroadcastReceiver {
-
- @Autowired TaskService taskService;
-
- private static final int TASK_LIMIT = 3;
-
- @Override
- public void onReceive(Context context, Intent intent) {
- if (!Preferences.getBoolean(R.string.p_rmd_enabled, true)) {
- return;
- }
-
- DependencyInjectionService.getInstance().inject(this);
-
- int reengagementReminders = Preferences.getInt(ReengagementService.PREF_REENGAGEMENT_COUNT, 1);
- Preferences.setInt(ReengagementService.PREF_REENGAGEMENT_COUNT, reengagementReminders + 1);
-
- Intent notifIntent = new Intent(context, TaskListActivity.class);
-
- QueryTemplate template = new QueryTemplate().where(TaskCriteria.activeVisibleMine());
- String sql = SortHelper.adjustQueryForFlagsAndSort(template.toString(), 0, SortHelper.SORT_AUTO) + " LIMIT " + TASK_LIMIT; //$NON-NLS-1$
-
- boolean hasTasks = false;
- TodorooCursor tasks = taskService.query(Query.select(Task.ID).where(TaskCriteria.activeVisibleMine()).limit(TASK_LIMIT));
- try {
- hasTasks = tasks.getCount() > 0;
- } finally {
- tasks.close();
- }
-
- String title = Notifications.getRandomReminder(context.getResources().getStringArray(R.array.rmd_reengage_notif_titles));
- if (title.contains("%s")) { //$NON-NLS-1$
- String name = ""; //$NON-NLS-1$
- title = String.format(title, name);
- }
-
- String text = Notifications.getRandomReminder(context.getResources().getStringArray(hasTasks ? R.array.rmd_reengage_dialog_options : R.array.rmd_reengage_dialog_empty_options));
-
- FilterWithCustomIntent filter = new FilterWithCustomIntent(context.getString(R.string.rmd_NoA_filter),
- context.getString(R.string.rmd_NoA_filter),
- sql,
- null);
- filter.customTaskList = new ComponentName(context, ReengagementFragment.class);
- filter.customExtras = new Bundle();
- filter.customExtras.putString(ReengagementFragment.EXTRA_TEXT, text);
-
- notifIntent.setAction("NOTIFY_reengagement"); //$NON-NLS-1$
- notifIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter);
- notifIntent.putExtra(ReengagementFragment.EXTRA_TEXT, text);
- notifIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
- notifIntent.putExtra(TaskListActivity.TOKEN_SOURCE, Constants.SOURCE_REENGAGEMENT);
-
-
- NotificationManager manager = new AndroidNotificationManager(context);
- Notification notification = new Notification(R.drawable.notif_astrid,
- text, System.currentTimeMillis());
-
- PendingIntent pendingIntent = PendingIntent.getActivity(context,
- 0, notifIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
- notification.setLatestEventInfo(context,
- title,
- text,
- pendingIntent);
-
- notification.flags |= Notification.FLAG_AUTO_CANCEL;
- if(Preferences.getBoolean(R.string.p_rmd_persistent, true)) {
- notification.flags |= Notification.FLAG_NO_CLEAR |
- Notification.FLAG_SHOW_LIGHTS;
- notification.ledOffMS = 5000;
- notification.ledOnMS = 700;
- notification.ledARGB = Color.YELLOW;
- } else {
- notification.defaults = Notification.DEFAULT_LIGHTS;
- }
-
- manager.notify(0, notification);
- Flags.set(Flags.REFRESH); // Forces a reload when app launches
-
- ReengagementService.scheduleReengagementAlarm(context);
- }
-
-}
diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementService.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementService.java
deleted file mode 100644
index e5fbce981..000000000
--- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementService.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.reminders;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-
-import com.todoroo.andlib.utility.DateUtilities;
-import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.utility.AstridPreferences;
-import com.todoroo.astrid.utility.Constants;
-
-import java.util.Date;
-
-public final class ReengagementService {
-
- private static final int REQUEST_CODE = 10;
-
-
- public static final String PREF_REENGAGEMENT_COUNT = "pref_reengagement_count"; //$NON-NLS-1$
-
- public static final String BROADCAST_SHOW_REENGAGEMENT = Constants.PACKAGE + ".SHOW_REENGAGEMENT"; //$NON-NLS-1$
-
- public static void scheduleReengagementAlarm(Context context) {
- AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
- Intent intent = new Intent(BROADCAST_SHOW_REENGAGEMENT);
- PendingIntent pendingIntent = PendingIntent.getBroadcast(context, REQUEST_CODE, intent, 0);
- am.cancel(pendingIntent);
-
- long time = getNextReminderTime();
- am.set(AlarmManager.RTC_WAKEUP, time, pendingIntent);
- }
-
- private static long getNextReminderTime() {
- int reengagementReminders = Preferences.getInt(PREF_REENGAGEMENT_COUNT, 1);
- int days;
- if (DateUtilities.now() - Preferences.getLong(AstridPreferences.P_FIRST_LAUNCH, 0) > DateUtilities.ONE_DAY * 30) { // Installed longer than 30 days
- // Sequence: every 6, 8, 10 days
- days = Math.min(10, 4 + 2 * reengagementReminders);
- } else {
- // Sequence: every 2, 3, 4, 5 days
- days = Math.min(5, 1 + reengagementReminders);
- }
-
- Date date = new Date(DateUtilities.now() + DateUtilities.ONE_DAY * days / 1000L * 1000L);
- date.setHours(18);
- date.setMinutes(0);
- date.setSeconds(0);
-
- return date.getTime();
- }
-
-}
diff --git a/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java b/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java
index c45aa6318..02d5b681c 100644
--- a/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java
@@ -45,7 +45,6 @@ import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gcal.CalendarStartupReceiver;
import com.todoroo.astrid.gtasks.GtasksPreferenceService;
import com.todoroo.astrid.gtasks.sync.GtasksSyncService;
-import com.todoroo.astrid.reminders.ReengagementService;
import com.todoroo.astrid.reminders.ReminderStartupReceiver;
import com.todoroo.astrid.tags.TaskToTagMetadata;
import com.todoroo.astrid.utility.AstridPreferences;
@@ -178,7 +177,6 @@ public class StartupService {
public void run() {
startWidgetService(context);
- ReengagementService.scheduleReengagementAlarm(context);
taskService.cleanup();
// if sync ongoing flag was set, clear it
diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java b/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java
index 29cebb761..23cf6dffb 100644
--- a/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java
+++ b/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java
@@ -40,7 +40,6 @@ public final class Constants {
public static final int SOURCE_WIDGET = 2;
public static final int SOURCE_PPWIDGET = 3;
public static final int SOURCE_C2DM = 4;
- public static final int SOURCE_REENGAGEMENT = 5;
// --- notification id's
diff --git a/astrid/src/main/res/layout/task_list_body_reengagement.xml b/astrid/src/main/res/layout/task_list_body_reengagement.xml
deleted file mode 100644
index bc5180043..000000000
--- a/astrid/src/main/res/layout/task_list_body_reengagement.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml
index c57758d77..ac03cecc3 100644
--- a/astrid/src/main/res/values-de/strings.xml
+++ b/astrid/src/main/res/values-de/strings.xml
@@ -427,30 +427,6 @@
SchlummernHerzlichen Glückwunsch zum Abschluss!Erinnerung:
-
- Eine Mitteilung von Tasks
- Notiz für %s.
- Ihre Tasks-Übersicht
- Erinnerungen von Tasks
-
- Aufgabe hinzufügen
-
- Zeit, Ihre Todo-Liste zu verkürzen!
- Sehr geehrte Damen und Herren, einige Aufgaben warten zur Durchsicht!
- Hallo, könnten Sie sich das bitte ansehen?
- Ich haben einige Aufgaben, die Ihnen zugewiesen wurden!
- Ein neuer Stapel Aufgaben für Sie!
- Sie sehen großartig aus! Können wir loslegen?
- Heute ist ein wunderbarer Tag um ein paar Dinge fertig zu bekommen!
-
-
- Möchten Sie Ihre Aufgaben nicht besser organisieren?
- Ich bin Tasks! Meine Aufgabe ist es, Sie bei Ihren Aufgaben zu unterstützen!
- Sie sehen beschäftigt aus, kann ich Ihnen diese Aufgaben abnehmen?
- Ich kann Sie bei Ihrer gesamten Aufgabenplanung unterstützen.
- Wollen Sie mehr schaffen? Ich auch!
- Sehr erfreut, Sie kennenzulernen!
- ErinnerungseinstellungenRuhezeiten, Snooze Einstellungen, HartnäckigkeitErinnerungen aktiviert?
diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml
index e1e8873c6..7a36d9163 100644
--- a/astrid/src/main/res/values-es/strings.xml
+++ b/astrid/src/main/res/values-es/strings.xml
@@ -442,30 +442,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n
Espera...¡Felicitaciones por terminar!Recordatorio:
-
- Una nota desde Tasks
- Memorándum para %s.
- Tu resumen Tasks
- Recordatorios de Tasks
-
- Añadir una tarea
-
- ¡Es hora de acortar la lista de tareas!
- Estimada dama o caballero, ¡algunas tareas esperan su inspección!
- Hola, ¿Podrías darle una revisada a éstas?
- ¡Tengo unas tareas con tu nombre en ellas!
- ¡Un lote de frescas tareas para ti hoy!
- ¡Luces espectacular! ¿Listo para empezar?
- Un hermoso día para hacer un poco de trabajo, ¡eso creo!
-
-
- ¿No quieres estar organizado?
- ¡Soy Tasks! ¡Estoy aquí para ayudarte a hacer más!
- ¡Pareces ocupado! Déjame quitarte alguna de esas tareas de tu plato.
- Puedo ayudarle a rastrear todos los detalles en tu vida.
- ¿Tomaste seriamente acerca de hacer más? ¡Yo también!
- ¡Es un placer conocerlo!
- Configurar recordatoriosHoras tranquilas, opciones de vigilia, nivel de persistencia¿Habilitar recordatorios?
diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml
index c757c8440..d26825bff 100644
--- a/astrid/src/main/res/values-fr/strings.xml
+++ b/astrid/src/main/res/values-fr/strings.xml
@@ -438,30 +438,6 @@
Rappeler ultérieurement...Félicitations pour avoir fini cette tâcheRappel :
-
- Une note de la part d\'Tasks
- Mémo pour %s.
- Votre résumé Tasks
- Rappels d\'Tasks
-
- Ajouter une tâche
-
- Il est temps de réduire votre liste de tâches!
- Cher Monsieur ou Madame, certaines tâches attendent votre inspection !
- Bonjour ! Pourriez-vous jeter un œil à ça ?
- Il y a des tâches avec votre nom dessus !
- Une livraison de tâches toute fraiche pour vous aujourd\'hui !
- Vous êtes magnifique ! Prêt à commencer ?
- Un jour idéal pour travailler, à mon avis !
-
-
- Vous ne voulez pas être organisé ?
- Je suis Tasks ! Je suis ici pour t\'aider à en faire plus !
- Vous avez l\'air occupé ! Laissez moi vous débarrasser de ces tâches.
- Je peux vous aider à garder des traces de tous les détails de votre vie.
- Vous voulez vraiment en faire plus ? Moi aussi !
- Enchanté de faire votre connaissance !
- Paramètres de rappelHeures de repos, options de report, niveau de persistanceActiver les rappels ?
diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml
index ac70dc47d..0bc70d8b8 100644
--- a/astrid/src/main/res/values-it/strings.xml
+++ b/astrid/src/main/res/values-it/strings.xml
@@ -382,30 +382,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
Rimanda...Congratulazioni per il completamento!Promemoria:
-
- Nota da Tasks
- Memo per %s
- Your Tasks digest
- Promemoria da Tasks
-
- Aggiungi un\'attività
-
- E\' tempo di accorciare la tua lista delle cose da fare!
- Caro signore o signora, alcune attività attendono di essere visionate!
- Ehi, puoi dare un\'occhiata a queste?
- Ho alcune attività con il tuo nome!
- Un nuovo elenco di attività per te oggi!
- Hai un aspetto favoloso! Sei pronto ad iniziare?
- Un giorno perfetto per completare qualche attività, credo!
-
-
- Non vuoi organizzarti?
- Sono Tasks! Sono qui ad aiutarti a fare di più!
- Sembri impegnato! Fammi togliere alcune attività dal tuo carico di lavoro.
- Posso aiutarti a tenere traccia di tutti i dettagli nella tua vita.
- Sei serio sul volerne completare ancora? Allora anch\'io!
- Pleasure to make your acquaintance!
- Impostazioni promemoriaOre tranquille, funzione di ripetizione, livello di persistenzaI promemoria sono abilitati?
diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml
index c5aa2e1e7..3266b0d96 100644
--- a/astrid/src/main/res/values-iw/strings.xml
+++ b/astrid/src/main/res/values-iw/strings.xml
@@ -443,30 +443,6 @@
השתקאיחולי על השלמת המשימה!תזכורת:
-
- הודעה מ-Tasks
- מזכר עבור %s
- תמצית מ-משימות
- תזכורות ממשימות
-
- הוסף משימה
-
- הגיע הזמן לקצר את רשימת המשימות שלך!
- אדון או גברת יקרה, ישנן כמה משימות שמחכות שתבחנו אותם!
- שלום לך, תוכל להעיף מבט על אלה?
- יש לי כמה משימות ששמך מתנוסס עליהן!
- ערימה חדשה של משימות עבורך היום!
- אתה נראה נהדר! מוכן להתחיל לעבוד?
- אני חושב שהיום הוא יום מצויין כדי לעבוד קצת!
-
-
- אתה לא מתכוון להתחיל להתארגן?
- שמי משימות ואני אעזור לך לעשות יותר דברים!
- אתה נראה עסוק! תן לי להקל עליך.
- אני יכולה לעזור לך לארגן את כל הדברים הקטנים שבחייך.
- רציני/ת לגבי להספיק לעשות יותר דברים? גם אני!
- נעים להכיר!
- הגדרות תזכורתשעות שקטות, אשפרויות נימנום, רמת המשכות\?תזכורות מאופשרות
diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml
index ca8e25d59..e6ccba4d4 100644
--- a/astrid/src/main/res/values-ja/strings.xml
+++ b/astrid/src/main/res/values-ja/strings.xml
@@ -211,7 +211,6 @@
お知らせ既に完了しています!スヌーズ
- タスクを追加する通知の設定消音時間の始まり%s 以降、通知音は鳴りません
diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml
index eb665d0c0..bc0b84090 100644
--- a/astrid/src/main/res/values-ko/strings.xml
+++ b/astrid/src/main/res/values-ko/strings.xml
@@ -451,30 +451,6 @@
알림 잠시 미루기완료를 축하합니다!알림:
-
- 아스트리드 노트
- %s 의 메모.
- 당신의 아스트리드 요약
- 아스트리드 알림
-
- 일정 추가하기
-
- 당신의 할일 목록을 줄일 시간이에요!
- 친애하는 당신, 몇가지 일정이 당신의 손길을 기다려요!
- 안녕, 이것 좀 봐줄 수 있을까?
- 거기 네 이름으로 된 일정이 좀 있어!
- 오늘 너를 위해 새로운 일정 목록이 있어!
- 너 끝내준다! 시작할 준비 됐지?
- 내가 생각하기에 일을 마치기에 좋은 날인 듯!
-
-
- 조직적이고 싶지 않니?
- 나 아스트리드! 네 일을 돕기 위해 내가 여기 있노라!
- 너 바뻐 보인다! 니 일정 중 몇 가지는 내가 처리해 줄께.
- 나는 네 삶의 모든 세부 사항의 기록을 유지할 수 있도록 도울 수 있어.
- 일을 더 확실히 마치고 싶지? 나도 그래!
- 너를 알게 되서 기쁘다!
- 알림 설정알람 꺼짐 시간, 스누즈 설정, 알람 지속 레벨알림을 사용할까요?
diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml
index 8ed98201b..90f0e21ca 100644
--- a/astrid/src/main/res/values-nl/strings.xml
+++ b/astrid/src/main/res/values-nl/strings.xml
@@ -440,30 +440,6 @@
Sluimeren...Gefeliciteerd met het afronden!Herinnering:
-
- Een bericht van Tasks
- Bericht voor %s
- Uw takenoverzicht
- Herinneringen van Tasks
-
- Taak toevoegen
-
- Het is tijd om je to-do lijst op te schonen!
- Sommige taken vereisen jouw aandacht!
- Hallo, zou je hier naar kunnen kijken?
- Ik heb een aantal taken met jouw naam erop!
- Een nieuwe lading taken voor jou om naar te kijken vandaag!
- Je ziet er fantastisch uit! Klaar om te beginnen?
- Ik denk dat het een fantastische dag is om wat werk gedaan te krijgen!
-
-
- Zou je niet georganiseerd willen zijn?
- Ik ben Tasks! Klaar om je te helpen meer voor elkaar te krijgen!
- Bezige bij! Laat mij een paar taken van je overnemen.
- Ik kan je helpen om alle details van je leven in de gaten te houden.
- Dus jij wil echt meer voor elkaar krijgen? Ik ook!
- Aangenaam kennis te maken!
- Instellingen herinneringenRustige uren, snooze opties, niveau volhoudenHerinneringen Ingeschakeld?
diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml
index 0777ac456..c24b8672d 100644
--- a/astrid/src/main/res/values-pl/strings.xml
+++ b/astrid/src/main/res/values-pl/strings.xml
@@ -431,30 +431,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g
Wstrzymaj...Gratuluję ukończenia!Przypomnienie:
-
- A note from Tasks
- Memo for %s.
- Your Tasks digest
- Przypomnienia z Tasks
-
- Dodaj zadanie
-
- Time to shorten your to-do list!
- Drogi Panie i Władco, pewne zadania oczekują Twojej uwagi!
- Siemanko, możesz rzucić na to okiem?
- Mam parę zadań z Twoim imieniem!
- Świeża dostawa zadań!
- Wyglądasz wyśmienicie! Gotowy do roboty?
- Cudowny dzień, by zająć się pewnymi sprawami!
-
-
- Nie chcesz się zorganizować?
- Nazywam się Tasks! Jestem tu, by Ci pomóc zrobić więcej!
- Wyglądasz na zajętego! Pozwól, że zabiorę trochę tych zadań.
- Mogę Ci pomóc mieć na uwadze wszystkie szczegóły Twojego życia.
- Na serio chcesz zrobić coś jeszcze? Ja też!
- Miło Cię poznać!
- Ustawienia przypomnieńCiche godziny, opcje drzemki, poziom trwaniaPrzypomnienia włączone?
diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml
index 0514b5109..e50d87a20 100644
--- a/astrid/src/main/res/values-pt-rBR/strings.xml
+++ b/astrid/src/main/res/values-pt-rBR/strings.xml
@@ -400,30 +400,6 @@
AdiarParabéns!Lembrete:
-
- Uma nota do Tasks
- Recado para %s.
- Seu resumo no Tasks
- Lembretes do Tasks
-
- Inserir tarefa
-
- Hora de diminuir sua lista de tarefas!
- Prezado sr. ou sra., algumas tarefas aguardam sua inspeção!
- Olá, você poderia dar uma olhada nissos?
- Eu achei algumas tarefas com seu nome nelas!
- Um novo lote de tarefas para você hoje!
- Você parece fabuloso! Pronto para começar?
- Um dia amável para concluir alguns trabalhos, eu acho!
-
-
- Você não quer se organizar?
- Sou Tasks! Estou aqui para te ajudar a fazer mais!
- Você parece ocupado! Deixe-me tirar algumas tarefas de seu prato.
- Eu posso te ajudar a manter o controle sobre todos os detalhes de sua vida.
- Está falando sério sobre estar fazendo mais? Eu também!
- Prazer em conhecê-lo!
- Configurações de lembretesHoras quieto, opções de soneca, nível de persistênciaHabilitar lembretes?
diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml
index fec32ee2e..5efc3599f 100644
--- a/astrid/src/main/res/values-ru/strings.xml
+++ b/astrid/src/main/res/values-ru/strings.xml
@@ -432,30 +432,6 @@
ПовторПоздравляем с окончанием!Напоминания:
-
- Заметка из Tasks
- Напоминание для %s
- Обзор задач от Tasks
- Напоминания от Tasks
-
- Добавить задание
-
- Время сократить Ваш список задач!
- Дорогой сэр или мадам, некоторые задачи ждут Вашего внимания!
- Привет, могли бы Вы взглянуть сюда?
- У меня есть несколько задач на Ваше имя!
- Свежая пачка задач для Вас на сегодня.
- Вы выглядите потрясающе! Готовы начать?
- Прекрасный день, чтобы поработат, я думаю!
-
-
- Разве вы не хотите навести порядок?
- Я Tasks! Я здесь, чтобы помочь Вам сделать больше!
- Вы выглядите занятым. Позвольте убрать некоторые задачи из вашего списка.
- Я могу помочь Вам следить за всеми деталями Вашей жизни.
- Вы серьёзно о том что нужно сделать побольше? Ну что, я тоже!
- Очень приятно с Вами познакомиться!
- Настройки напоминанийТихие часы, опции короткого сна, уровень настойчивостиВключить напоминания?
diff --git a/astrid/src/main/res/values-sl-rSI/strings.xml b/astrid/src/main/res/values-sl-rSI/strings.xml
index 350acd29c..8c14d9e45 100644
--- a/astrid/src/main/res/values-sl-rSI/strings.xml
+++ b/astrid/src/main/res/values-sl-rSI/strings.xml
@@ -6,11 +6,12 @@
Naredi fotografijo
- Izberi iz galerije
+ Izberi iz GalerijeIzbriši fotografijoDodaj komentar...OsvežiSeznam
+ Seznami slikVnesi ime seznamaIzberi Google račun, ki naj se uporablja:Glasna opozorila
@@ -88,13 +89,14 @@
Naredi kopijo opravkaZbriši opravekRazveljavi izbris opravka
+ Očisti opravekSkriti opravkiPrikaži dokončane opravkePrikaži skrite opravkePrikaži zbrisane opravkeRočna nastavitev s podopravkiPametno razvrščanje
- Po naslovu
+ Po nazivuPo dospelostiPo prioritetiPo zadnjih spremembah
@@ -135,8 +137,8 @@
Jutri(dan kasneje)Naslednji teden
- In two weeks
- Next month
+ V roku dveh tednov
+ Naslednji mesecČas ni določen
@@ -327,7 +329,7 @@
Dodaj meriloPrikazShrani & prikaži
- Opraviti do:?
+ Opraviti do: ?Opraviti do:Brez datuma dospelosti
@@ -340,7 +342,7 @@
Prioriteta namanj ?Prioriteta...
- Seznam:?
+ Seznam: ?Seznam...Naziv seznama vsebuje...Naziv seznama vsebuje:?
@@ -373,6 +375,7 @@
Avtentikacija v Google Naloge ni uspela. Prosimo, preverite geslo svojega računa in poskusite ponovno kasneje.Napaka pri upravitelju računov na vašem telefonu. Prosimo, odjavite se, nato pa ponovno prijavite skozi nastavitve Google Nalog.Napaka pri overjanju v ozadju. Prosimo, poskusite začeti z usklajevanjem med delovanjem aplikacije Opravki.
+ $NUM jih ustreza: $FILTERNapredne nastavitveOpomniki zgrešenih klicev, vnos glasu in razne nastavitveNapaka na omrežju! Prepoznava govora za delovanje potrebuje omrežno povezavo.
@@ -396,6 +399,7 @@
Ni ustrezne aplikacijeSlikaGlas
+ GorIzberite datotekoIzberite mapoNapaka pri dovoljenjih! Prosimo, preverite, da niste preprečili aplikaciji Opravki dostopa do SD kartice.
@@ -442,30 +446,6 @@
DremežČestitke za dokončanje!Opomnik:
-
- Obvestilo aplikacije Opravki
- Sporočilo za %s.
- Pozetek vaših Opravkov
- Opomniki aplikacije Opravki
-
- Dodaj opravek
-
- Čas je, da skrajšate vaš seznam opravil!
- Gospod ali gospa, nekaj opravkov čaka na vašo pozornost.
- Živjo, tole bi bilo treba pregledati!
- Imam nekaj opravkov zate!
- Sveži paket današnjih opravkov zate.
- Super izgledaš! Bova začela?
- Lep dan za delo, bi rekel.
-
-
- Si želiš več urejenosti?
- Sem aplikacija Opravki! Tukaj sem, da vam pomagam pri produktivnosti!
- Zdiš se, da imaš polne roke dela! Dovoli mi prestaviti nekatere opravke na kasneje.
- Lahko ti pomagam slediti vsem podrobnostim tvojega življenja.
- Res želiš narediti več? Jaz tudi!
- Me veseli, da sva se spoznala!
- Nastavitve opomnikaTihi čas, možnosti dremeža, stopnja vztrajnostiOpomniki omogočeni?
@@ -624,6 +604,7 @@
od datuma dospelostiod datuma dokončanja
+ $I dne $DVsak %sVsak %1$s\n do %2$s%s po dokončanju
@@ -667,6 +648,8 @@
Vnos glasu žal ni na razpolago vašemu sistemu.\n Če je mogoče, nadgradite svojega Androida vsaj na verzijo 2.1.Trg žal ne podpira vašega sistema.\n Poskusite naložiti glasovno iskanje z drugega vira.Vnos glasu
+ Gumb za vnos glasu bo prikazan s seznamom opravkov
+ Gumb za vnos glasu ne bo viden ob seznamu opravkovOpravke ustvari neposrednoOpravki bodo ustvarjeni na podlagi snemanja glasuNaziv opravka lahko uredite, ko se konča vnos glasu
diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml
index dbb495bbd..611ee1363 100644
--- a/astrid/src/main/res/values-sv/strings.xml
+++ b/astrid/src/main/res/values-sv/strings.xml
@@ -395,7 +395,6 @@ och återställer dina aktuella uppgifter från en backup
Vänta...Grattis till den slutförda uppgiften!Påminnelse:
- Lägg till uppgiftPåminnelseinställningarTysta timmar, snooze alternativ, envishets-nivåPåminnelser valda?
diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml
index 83c67738d..5244a3efc 100644
--- a/astrid/src/main/res/values-tr/strings.xml
+++ b/astrid/src/main/res/values-tr/strings.xml
@@ -376,30 +376,6 @@
ErteleBitirdiğin için tebrikler!Hatırlatıcı:
-
- Tasks\'ten bir not
- Bilgi notu: %s.
- Tasks özetiniz
- Tasks Hatırlatmaları
-
- Görev ekle
-
- Yapılacaklar listenizi kısaltmanın tam zamanı!
- Sevgili iş bitirici, bazı görevler incelemeniz için beklemektedir!
- Selamlar saygılar, şunlara hızlıca bir göz atabilir misin?
- Üzerinde adınızın yazdığı bazı görevlerim var!
- Bugün sizi yeni bir sürü görev bekliyor!
- Akıl almaz görünüyorsun! Başlamaya hazır mısın?
- Bazı işleri yola koymak için ne güzel bir gün, bence!
-
-
- Daha düzenli olmak istemiyor musun?
- Ben Tasks! Daha çalışkan olman için buradayım!
- Meşgul görünüyorsun! Görevlerinden bazılarını listenden kaldırmama izin ver.
- Hayatındaki tüm ayrıntıları izlemene yardımcı olabilirim.
- İş bitirme konusunda oldukça ciddisin? Ben de!
- Tanıştığımıza memnun oldum!
- Hatırlatıcı AyarlarıSessiz saatler, erteleme seçenekleri, süreklilik düzeyiHatırlatmalar etkin mi?
diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml
index 7a41f2d90..6f7c4cd46 100644
--- a/astrid/src/main/res/values-uk/strings.xml
+++ b/astrid/src/main/res/values-uk/strings.xml
@@ -445,13 +445,6 @@
ВідкластиВітаю з завершенням!Нагадування:
-
- A note from Tasks
- Memo for %s.
- Your Tasks digest
- Нагадування від Tasks
-
- Додати завданняНалаштування нагадуваньТихі години, опції короткого сну, рівень наполегливостіУвімкнути нагадування?
diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml
index 81881cb1b..e01a63348 100644
--- a/astrid/src/main/res/values-zh-rCN/strings.xml
+++ b/astrid/src/main/res/values-zh-rCN/strings.xml
@@ -363,30 +363,6 @@
晚点提醒...恭喜,已经完成了!提醒:
-
- 清单小助理的提示
- %s 的备忘录。
- 您的清单小助理摘要
- 清单小助理的提醒
-
- 添加任务
-
- 是时候缩短您的任务清单了!
- 尊敬的先生或女士,有一些任务等待您的检查!
- 嘿,您好,您可不可以看一看这些任务?
- 我有些任务,上面有您的名字喔!
- 您今天的一批新任务!
- 您看起来棒极了!准备好开始了吗?
- 今天不错,是时候搞定一些事儿了,我认为是这样的!
-
-
- 您不想生活变得更加有条理吗?
- 我是清单小助理!我随时帮助您做更多事情!
- 您好像好忙喔!让我来分担一下您的重担里的一些活儿呗。
- 我可以帮您记录您生活中的所有细节。
- 您真的要搞定更多事情吗?我也是啊!
- 好高兴认识您咽!
- 提醒设置勿扰模式,稍候提醒,持续提醒允许提醒?
diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml
index 601663784..1c14599de 100644
--- a/astrid/src/main/res/values-zh-rTW/strings.xml
+++ b/astrid/src/main/res/values-zh-rTW/strings.xml
@@ -385,30 +385,6 @@
晚點提醒...恭喜,已經完成了!提醒:
-
- Tasks 的提示
- %s 的備忘錄。
- 您的 Tasks 摘要
- Tasks 的提醒
-
- 添加任務工作
-
- 是時候縮短您的任務工作清單了!
- 尊敬的先生或女士,有一些任務工作等待您的檢查!
- 嘿,您好,您可不可以看一看這些任務工作?
- 我有些任務工作,上面有您的名字喔!
- 您今天的一批新任務工作!
- 您看起來棒極了!準備好開始了嗎?
- 今天不錯,是時候搞定一些事兒了,我認為是這樣的!
-
-
- 您不想生活變得更加有條理嗎?
- 我是Tasks!我隨時幫助您做更多事情!
- 您好像好忙喔!讓我來分擔一下您的重擔裡的一些活兒唄。
- 我可以幫您記錄您生活中的所有細節。
- 您真的要搞定更多事情嗎?我也是啊!
- 好高興認識您咽!
- 提醒設置勿擾模式,稍候提醒,持續提醒允許提醒?
diff --git a/astrid/src/main/res/values/strings-reminders.xml b/astrid/src/main/res/values/strings-reminders.xml
index 663eeaedc..62ed0b7fa 100644
--- a/astrid/src/main/res/values/strings-reminders.xml
+++ b/astrid/src/main/res/values/strings-reminders.xml
@@ -71,39 +71,6 @@
Reminder:
-
-
-
-
- A note from Tasks
-
- Memo for %s.
- Your Tasks digest
- Reminders from Tasks
-
-
- Add a task
-
-
-
- Time to shorten your to-do list!
- Dear sir or madam, some tasks await your inspection!
- Hi there, could you take a look at these?
- I\'ve got some tasks with your name on them!
- A fresh batch of tasks for you today!
- You look fabulous! Ready to get started?
- A lovely day for getting some work done, I think!
-
-
-
-
- Don\'t you want to get organized?
- I\'m Tasks! I\'m here to help you do more!
- You look busy! Let me take some of those tasks off of your plate.
- I can help you keep track of all of the details in your life.
- You\'re serious about getting more done? So am I!
- Pleasure to make your acquaintance!
-