Merge branch 'rc-1.6.0'

README.md

@@ -1,6 +1,6 @@
 # Everyday Tasks
 
-Track and log your tasks with EverydayTasks and create schedules for repetitive tasks. See how many time you have spent for certain tasks, and get notified if a scheduled task is due.
+Track and log your tasks with EverydayTasks and create schedules for repetitive tasks. See how much time you have spent for certain tasks, and get notified if a scheduled task is due.
 
 ## Core features of the app
 

TRANSLATE.md

@@ -10,7 +10,7 @@ Please help to translate the app to other languages! You only need a Github-acco
 # Add a new language
 
 1. Open the reference translation file for English [en.json](https://raw.githubusercontent.com/jenspfahl/EverydayTasks/master/assets/i18n/en.json).
-2. Tanslate the values of the file like this: 
+2. Translate the values of the file like this: 
 ```
 "button_save": "Save"
 ```
@@ -19,7 +19,7 @@ Please help to translate the app to other languages! You only need a Github-acco
 "button_save": "Speichern"
 ```
 
-If you see placeholders surounded with `{}`, just leave the content of this like it is. Example:
+If you see placeholders surrounded with `{}`, just leave the content of this like it is. Example:
 ```
 "task_started_at": "'{title}' started at {when}"
 ```
@@ -28,8 +28,8 @@ Here don't translate `title` and `when` but replace the rest!
 "task_started_at": "'{title}' gestartet um {when}"
 ```
 
-3. Create a new issue [here](https://github.com/jenspfahl/EverydayTasks/issues/new). (Github account needed)
-4. Insert your complete tanslation in the description field and write the language name in the title and submit it.
+3. Create a new issue [here](https://github.com/jenspfahl/EverydayTasks/issues/new). (GitHub account needed)
+4. Insert your complete translation in the description field and write the language name in the title and submit it.
 5. I will integrate the translation in the next release.
 
 If you are used to work with Git branches and JSON files you can also create a new one for your translated language and create a Pull Request to get them integrated in the next release.

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#9e9d24</color>
+</resources>

assets/i18n/de.json

@@ -67,6 +67,7 @@
       "due_at_hint": "Fällig um",
       "due_at_emphasis": "Wähle wann die Aufgabe fällig ist",
       "activate_schedule": "Aktiviere den Zeitplan",
+      "mark_as_important": "Markiere Zeitplan als wichtig",
       "due_on_hint": "Fällig am",
       "scheduled_from_emphasis": "Wähle ab wann der Zeitplan gilt",
       "activate_reminders": "Aktiviere Erinnerung",
@@ -75,6 +76,13 @@
       "repetition_mode": "Dynamische Wiederholung",
       "repetition_mode_dynamic": "Die nächste Aufgabe ist fällig basierend auf dem gewählten Intervall und wann die letzte Aufgabe erledigt wurde.",
       "repetition_mode_fixed": "Die nächste Aufgabe ist fällig gemäß dem gewählten Intervall, ungeachtet wann die letzte Aufgabe erledigt wurde.",
+      "repetition_mode_one_shot": "Die nächste Aufgabe ist fällig wenn das gewählten Fälligkeitsdatum erreicht wurde, ohne weitere Wiederholungen.",
+      "fixed_monthly_hint" : "Zusätzliche Fälligkeitstage pro Monat",
+      "fixed_monthly_title" : "Mögliche Tage eines willkürlichen Monats",
+      "fixed_monthly_message" : "Wähle weitere mögliche Fälligkeitstage eines willkürlichen Monats für diesen Zeitplan aus. Falls ein Tag nicht im Fälligkeitsmonat existiert (z.B. 31. April), wird der Zeitplan entsprechend zeitiger getriggert (hier 30. April). Das gleiche gilt für Schalttage.",
+      "fixed_yearly_hint" : "Zusätzliche Fälligkeitstage pro Jahr",
+      "fixed_yearly_title" : "Mögliche Tage eines willkürlichen Jahres",
+      "fixed_yearly_message" : "Wähle weitere mögliche Fälligkeitstage eines willkürlichen Jahres für diesen Zeitplan aus. Falls ein Tag nicht im Fälligkeitsjahr existiert (z.B. 31. April), wird der Zeitplan entsprechend zeitiger getriggert (hier 30. April). Das gleiche gilt für Schalttage.",
       "create": {
         "title": "Neuer Zeitplan",
         "success": "Neuer Zeitplan '{title}' wurde angelegt"
@@ -191,7 +199,8 @@
           "by_remaining_time": "Nach verbleibender Zeit sortieren",
           "by_category": "Nach Kategorien sortieren",
           "by_title": "Nach Titel sortieren",
-          "hide_non_active": "Nicht aktive verbergen"
+          "hide_non_active": "Nicht aktive verbergen",
+          "important_on_top": "Wichtige fällige ganz oben"
         },
         "notifications": {
           "enabled": "Fälligkeitsbenachrichtigung aktiviert",
@@ -206,6 +215,8 @@
         "paused": "pausiert",
         "inactive": "inaktiv",
         "scheduled": "geplant",
+        "completed": "erledigt",
+        "later_due": "später fällig",
         "due_yesterday_and_before": "Fällig seit gestern und älter",
         "due_today": "Heute fällig",
         "due_tomorrow": "Morgen fällig",
@@ -235,6 +246,16 @@
           "title_custom": "Nächste Fälligkeit für '{title}' ist ...",
           "success_custom": "Die nächste Fälligkeit für '{title}' wurde angepasst"
         },
+        "move_forward": {
+          "title": "Fälligkeitsdatum überspringen",
+          "message": "Möchtest du die Fälligkeit für '{title}' auf das nächste Fälligkeitsdatum setzen, basierend auf dem Zeitplan ? Die nächste Fälligkeit ist dann {nextDueDate} um {newNextDueDate}.",
+          "success": "Fälligkeitsdatum für '{title}' angepasst"
+        },
+        "one_time": {
+          "title": "Zeitplan stoppen",
+          "message": "Du kannst den Zeitplan für '{title}' stoppen, ohne eine Tätigkeit zu erfassen. Der Zeitplan wird dann als Erledigt markiert. Fortfahren?",
+          "success": "Due date for '{title}' updated"
+        },
         "pause_resume": {
           "paused": "Zeitplan '{title}' pausiert",
           "resumed": "Zeitplan '{title}' wieder fortgesetzt"
@@ -368,6 +389,14 @@
         "show_daytime_as_word": {
           "title": "Zeige Tageszeit als Wort",
           "description": "Zeigt z.B. '{evening}' für Abends"
+        },
+        "configure_daytimes": {
+          "title": "Ändere vorkonfigurierte Tageszeiten",
+          "description": "Ändert die tatsächliche Tageszeit für z.B. 'Abends'"
+        },
+        "reset_daytimes": {
+          "title": "Tageszeiten zurücksetzen",
+          "description": "Sollen alle Tageszeiten auf die Default-Werte zurückgesetzt werden?"
         }
       },
       "action_feedback": {
@@ -610,7 +639,8 @@
     "durations": {
       "half_an_hour": "eine halbe Stunde",
       "three_quarters_of_an_hour": "eine dreiviertel Stunde",
-      "an_hour": "eine Stunde"
+      "an_hour": "eine Stunde",
+      "one_and_a_half": "eineinhalb Stunden"
     },
     "words": {
       "on_for_dates": "am",
@@ -626,6 +656,7 @@
       "on_for_enabled": "an",
       "off_for_disabled": "aus",
       "clear": "zurücksetzen",
+      "important": "wichtig",
       "value": "Wert",
       "unit": "Einheit",
       "unknown": "unbekannt",
@@ -662,7 +693,8 @@
     },
     "repetition_mode": {
       "dynamic": "Flexibel",
-      "fixed": "Fest"
+      "fixed": "Fest",
+      "one_time": "Einmalig"
     }
   },
 

assets/i18n/en.json

@@ -67,6 +67,7 @@
       "due_at_hint": "Due at",
       "due_at_emphasis": "Select when the task is due",
       "activate_schedule": "Activate schedule",
+      "mark_as_important": "Mark schedule as important",
       "due_on_hint": "Due on",
       "scheduled_from_emphasis": "Select when the schedule starts",
       "activate_reminders": "Activate reminder",
@@ -75,6 +76,13 @@
       "repetition_mode": "Dynamic repetition mode",
       "repetition_mode_dynamic": "Next task is due based on the chosen interval and when the recent task was done.",
       "repetition_mode_fixed": "Next task is due based on the exact interval, no matter when the recent task was done.",
+      "repetition_mode_one_shot": "Next task is due based on the provided due date, without any repetition.",
+      "fixed_monthly_hint" : "Add additional due days per month",
+      "fixed_monthly_title" : "Possible days of an arbitrary month",
+      "fixed_monthly_message" : "Select additional due days of an arbitrary month for this schedule. If a day doesn't exist in the actual due month (e.g. 31th of April) the schedule is triggered earlier (here 30th of April). Same happens for leap days.",
+      "fixed_yearly_hint" : "Add additional due days per year",
+      "fixed_yearly_title" : "Possible days of an arbitrary year",
+      "fixed_yearly_message" : "Select additional due days of an arbitrary year for this schedule. If a day doesn't exist in the actual due year (e.g. 31th of April) the schedule is triggered earlier (here 30th of April). Same happens for leap days.",
       "create": {
         "title": "Create new schedule",
         "success": "New schedule with name '{title}' has been created"
@@ -191,7 +199,8 @@
           "by_remaining_time": "Sort by remaining time",
           "by_category": "Sort by category",
           "by_title": "Sort by title",
-          "hide_non_active": "Hide inactive"
+          "hide_non_active": "Hide inactive",
+          "important_on_top": "Important due on top"
         },
         "notifications": {
           "enabled": "All reminders and notifications enabled",
@@ -206,6 +215,8 @@
         "paused": "paused",
         "inactive": "inactive",
         "scheduled": "scheduled",
+        "completed": "completed",
+        "later_due": "due later",
         "due_yesterday_and_before": "Due before today",
         "due_today": "Due today",
         "due_tomorrow": "Due tomorrow",
@@ -235,6 +246,16 @@
           "title_custom": "Next due date for '{title}' is ...",
           "success_custom": "Next due date for '{title}' updated"
         },
+        "move_forward": {
+          "title": "Skip due date",
+          "message": "Do you want to move forward the due date of '{title}' to the next date based on the schedule? The schedule is then due {nextDueDate} at {newNextDueDate}.",
+          "success": "Due date for '{title}' updated"
+        },
+        "one_time": {
+          "title": "Stop schedule",
+          "message": "You are about to stop the current one-time schedule of '{title}'. The schedule will be marked as completed without a new journal entry. Are you sure?",
+          "success": "Due date for '{title}' updated"
+        },
         "pause_resume": {
           "paused": "Schedule '{title}' paused",
           "resumed": "Schedule '{title}' resumed"
@@ -368,6 +389,14 @@
         "show_daytime_as_word": {
           "title": "Show daytime as word",
           "description": "E.g. shows '{evening}' for the evening"
+        },
+        "configure_daytimes": {
+          "title": "Change preconfigured daytimes",
+          "description": "Changes the actual daytime of e.g. 'evening'"
+        },
+        "reset_daytimes": {
+          "title": "Reset daytimes",
+          "description": "Do you want to reset the current configured daytimes to the default values?"
         }
       },
       "action_feedback": {
@@ -556,7 +585,8 @@
     "durations": {
       "half_an_hour": "half an hour",
       "three_quarters_of_an_hour": "three quarters of an hour",
-      "an_hour": "an hour"
+      "an_hour": "an hour",
+      "one_and_a_half": "one and a half hours"
     },
     "words": {
       "on_for_dates": "on",
@@ -572,6 +602,7 @@
       "on_for_enabled": "on",
       "off_for_disabled": "off",
       "clear": "clear",
+      "important": "important",
       "value": "value",
       "unit": "unit",
       "unknown": "unknown",
@@ -608,7 +639,8 @@
     },
     "repetition_mode": {
       "dynamic": "Flexible",
-      "fixed": "Fixed"
+      "fixed": "Fixed",
+      "one_time": "One-time"
     }
   },
 

assets/i18n/fr.json

@@ -67,6 +67,7 @@
       "due_at_hint": "Horaire d'échéance",
       "due_at_emphasis": "Veuillez sélectionner l'horaire d'échéance",
       "activate_schedule": "Activer dans le planning",
+      "mark_as_important": "Mark schedule as important",
       "due_on_hint": "Echéance",
       "scheduled_from_hint": "Planifier à partir de ",
       "scheduled_from_emphasis": "Sélectionner la date de début dans le planning",
@@ -76,6 +77,13 @@
       "repetition_mode": "Mode de répétition dynamique",
       "repetition_mode_dynamic": "La prochaine tâche est due, en fonction de la fréquence choisie et de la date de complétion de la dernière occurence. ",
       "repetition_mode_fixed": "La date d'échéance de la prochaine tâche est basée sur la fréquence sélectionnée, indépendamment de la date de complétion de la dernière occurence. ",
+      "repetition_mode_one_shot": "Next task is due based on the provided due date, without any repetition.",
+      "fixed_monthly_hint" : "Add additional due days per month",
+      "fixed_monthly_title" : "Possible days of an arbitrary month",
+      "fixed_monthly_message" : "Select additional due days of an arbitrary month for this schedule. If a day doesn't exist in the actual due month (e.g. 31th of April) the schedule is triggered earlier (here 30th of April). Same happens for leap days.",
+      "fixed_yearly_hint" : "Add additional due days per year",
+      "fixed_yearly_title" : "Possible days of an arbitrary year",
+      "fixed_yearly_message" : "Select additional due days of an arbitrary year for this schedule. If a day doesn't exist in the actual due year (e.g. 31th of April) the schedule is triggered earlier (here 30th of April). Same happens for leap days.",
       "create": {
         "title": "Créer une tâche planifiée",
         "success": "La nouvelle tâche '{title}' a été créée dans le planning. "
@@ -192,7 +200,8 @@
           "by_remaining_time": "Trier par temps restant",
           "by_category": "Trier par catégorie",
           "by_title": "Trier par titre",
-          "hide_non_active": "Masquer si désactivé"
+          "hide_non_active": "Masquer si désactivé",
+          "important_on_top": "Important due on top"
         },
         "notifications": {
           "enabled": "Notification d'échéance activée",
@@ -207,6 +216,8 @@
         "paused": "en pause",
         "inactive": "inactive",
         "scheduled": "planifiée",
+        "completed": "completed",
+        "later_due": "due later",
         "due_yesterday_and_before": "Pour avant aujourd'hui",
         "due_today": "Pour aujourd'hui",
         "due_tomorrow": "Pour demain",
@@ -236,6 +247,16 @@
           "title_custom": "La prochaine échéance pour '{title}' est ...",
           "success_custom": "Prochaine échéance pour '{title}' mise à jour"
         },
+        "move_forward": {
+          "title": "Skip due date",
+          "message": "Do you want to move forward the due date of '{title}' to the next date based on the schedule? The schedule is then due {nextDueDate} at {newNextDueDate}.",
+          "success": "Due date for '{title}' updated"
+        },
+        "one_time": {
+          "title": "Stop schedule",
+          "message": "You are about to stop the current one-time schedule of '{title}'. The schedule will be marked as completed without a tracked task event. Are you sure?",
+          "success": "Due date for '{title}' updated"
+        },
         "pause_resume": {
           "paused": "Tâche planifiée '{title}' mise en pause",
           "resumed": "Tâche planifiée '{title}' relancée"
@@ -368,7 +389,15 @@
         },
         "show_daytime_as_word": {
           "title": "Indiquer le moment de la journée",
-          "description": "Par exemple, indiquer '{evening}' pour le soir. "
+          "description": "Par exemple, indiquer '{evening}' pour le soir. ",
+          "configure_daytimes": {
+            "title": "Change preconfigured daytimes",
+            "description": "Changes the actual daytime of e.g. 'evening'"
+          },
+          "reset_daytimes": {
+            "title": "Reset daytimes",
+            "description": "Do you want to reset the current configured daytimes to the default values?"
+          }
         }
       },
       "action_feedback": {
@@ -557,7 +586,8 @@
     "durations": {
       "half_an_hour": "une demie heure",
       "three_quarters_of_an_hour": "trois quarts d'heure",
-      "an_hour": "une heure"
+      "an_hour": "une heure",
+      "one_and_a_half": "one and a half hours"
     },
     "words": {
       "on_for_dates": "le",
@@ -573,6 +603,7 @@
       "on_for_enabled": "activé",
       "off_for_disabled": "désactivé",
       "clear": "effacer",
+      "important": "important",
       "value": "valeur",
       "unit": "unité",
       "unknown": "inconnu",
@@ -609,7 +640,8 @@
     },
     "repetition_mode": {
       "dynamic": "Flexible",
-      "fixed": "Fixe"
+      "fixed": "Fixe",
+      "one_time": "One-time"
     }
   },