[tx-robot] updated from transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

74 files changed, 968 insertions, 1000 deletions

diff --git a/apps/dav/l10n/bg.js b/apps/dav/l10n/bg.js
index f4842a46d30..b5879844b13 100644
--- a/apps/dav/l10n/bg.js
+++ b/apps/dav/l10n/bg.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Календар",
-    "Todos" : "Задачи",
     "Personal" : "Личен",
     "{actor} created calendar {calendar}" : "{actor} направи календар {calendar}",
     "You created calendar {calendar}" : "Създадохте календара {calendar}",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} възстанови събитие {event} от календар {calendar}",
     "You restored event {event} of calendar {calendar}" : "Вие възстановихте събитие {event} от календар {calendar}",
     "Busy" : "Зает",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} създаде задача {todo} в списък {calendar}",
-    "You created todo {todo} in list {calendar}" : "Създадохте задача {todo} в списък {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} изтри задача {todo} от списък {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Изтрихте задача {todo} от списък {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} актуализира задача {todo} в списък {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Променихте задача {todo} в списък {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} разреши задача {todo} в списък {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Разрешихте задача {todo} в списък {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} възобнови задача {todo} в списък {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Възобновихте задача {todo} в списък {calendar}",
     "Calendar, contacts and tasks" : "Календар, контакти и задачи",
     "A <strong>calendar</strong> was modified" : "Промяна на <strong>календар</strong>",
     "A calendar <strong>event</strong> was modified" : "Промяна на календарно <strong>събитие</strong>",
-    "A calendar <strong>todo</strong> was modified" : "Промяна на календарна <strong>задача</strong>",
     "Contact birthdays" : "Рождени дни на контакти",
     "Death of %s" : "Смърт на %s",
     "Calendar:" : "Календар:",
@@ -174,6 +162,18 @@ OC.L10N.register(
     "Tentative" : "Несигурно",
     "Number of guests" : "Брой на гостите ",
     "Comment" : "Коментар",
-    "Your attendance was updated successfully." : "Вашето присъствие е актуализирано успешно."
+    "Your attendance was updated successfully." : "Вашето присъствие е актуализирано успешно.",
+    "Todos" : "Задачи",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} създаде задача {todo} в списък {calendar}",
+    "You created todo {todo} in list {calendar}" : "Създадохте задача {todo} в списък {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} изтри задача {todo} от списък {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Изтрихте задача {todo} от списък {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} актуализира задача {todo} в списък {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Променихте задача {todo} в списък {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} разреши задача {todo} в списък {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Разрешихте задача {todo} в списък {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} възобнови задача {todo} в списък {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Възобновихте задача {todo} в списък {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Промяна на календарна <strong>задача</strong>"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/bg.json b/apps/dav/l10n/bg.json
index 3a6ffd3e5fe..dd46cff7b1d 100644
--- a/apps/dav/l10n/bg.json
+++ b/apps/dav/l10n/bg.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Календар",
-    "Todos" : "Задачи",
     "Personal" : "Личен",
     "{actor} created calendar {calendar}" : "{actor} направи календар {calendar}",
     "You created calendar {calendar}" : "Създадохте календара {calendar}",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} възстанови събитие {event} от календар {calendar}",
     "You restored event {event} of calendar {calendar}" : "Вие възстановихте събитие {event} от календар {calendar}",
     "Busy" : "Зает",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} създаде задача {todo} в списък {calendar}",
-    "You created todo {todo} in list {calendar}" : "Създадохте задача {todo} в списък {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} изтри задача {todo} от списък {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Изтрихте задача {todo} от списък {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} актуализира задача {todo} в списък {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Променихте задача {todo} в списък {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} разреши задача {todo} в списък {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Разрешихте задача {todo} в списък {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} възобнови задача {todo} в списък {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Възобновихте задача {todo} в списък {calendar}",
     "Calendar, contacts and tasks" : "Календар, контакти и задачи",
     "A <strong>calendar</strong> was modified" : "Промяна на <strong>календар</strong>",
     "A calendar <strong>event</strong> was modified" : "Промяна на календарно <strong>събитие</strong>",
-    "A calendar <strong>todo</strong> was modified" : "Промяна на календарна <strong>задача</strong>",
     "Contact birthdays" : "Рождени дни на контакти",
     "Death of %s" : "Смърт на %s",
     "Calendar:" : "Календар:",
@@ -172,6 +160,18 @@
     "Tentative" : "Несигурно",
     "Number of guests" : "Брой на гостите ",
     "Comment" : "Коментар",
-    "Your attendance was updated successfully." : "Вашето присъствие е актуализирано успешно."
+    "Your attendance was updated successfully." : "Вашето присъствие е актуализирано успешно.",
+    "Todos" : "Задачи",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} създаде задача {todo} в списък {calendar}",
+    "You created todo {todo} in list {calendar}" : "Създадохте задача {todo} в списък {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} изтри задача {todo} от списък {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Изтрихте задача {todo} от списък {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} актуализира задача {todo} в списък {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Променихте задача {todo} в списък {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} разреши задача {todo} в списък {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Разрешихте задача {todo} в списък {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} възобнови задача {todo} в списък {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Възобновихте задача {todo} в списък {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Промяна на календарна <strong>задача</strong>"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/ca.js b/apps/dav/l10n/ca.js
index 63d0d35c797..00d08150a10 100644
--- a/apps/dav/l10n/ca.js
+++ b/apps/dav/l10n/ca.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Calendari",
-    "Todos" : "Tasques",
     "Personal" : "Personal",
     "{actor} created calendar {calendar}" : "{actor} ha creat el calendari {calendar}",
     "You created calendar {calendar}" : "Heu creat el calendari {calendar}",
@@ -31,19 +30,8 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "{actor} esdeveniment actualitzat {esdeveniment} al calendari {calendar}",
     "You updated event {event} in calendar {calendar}" : "Heu actualitzat l'esdeveniment {event} al calendari {calendar}",
     "Busy" : "Ocupat",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} ha creat la tasca {todo} a {calendar}",
-    "You created todo {todo} in list {calendar}" : "Heu creat la tasca {todo} a {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha suprimit la tasca {todo} de la llista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Heu suprimit la tasca {todo} de la llista {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} ha actualitzat la tasca {todo} a {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Heu actualitzat la tasca {todo} a {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} ha resolt la tasca {todo} a {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Heu resolt la tasca {todo} a {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ha tornat a obrir la tasca {todo} a {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Heu tornat a obrir la tasca {todo} a {calendar}",
     "A <strong>calendar</strong> was modified" : "El <strong>calendari</strong> has estat modificat",
     "A calendar <strong>event</strong> was modified" : "S'ha modificat un <strong> esdeveniment </strong> del calendari",
-    "A calendar <strong>todo</strong> was modified" : "S'ha modificat una <strong>tasca</strong> d'un calendari",
     "Contact birthdays" : "Aniversaris dels contactes",
     "Death of %s" : "Mort de %s",
     "Calendar:" : "Calendari:",
@@ -113,6 +101,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Accepteu la invitació?",
     "Tentative" : "Provisional",
     "Comment" : "Comentari",
-    "Your attendance was updated successfully." : "La vostra assistència ha estat actualitzada correctament."
+    "Your attendance was updated successfully." : "La vostra assistència ha estat actualitzada correctament.",
+    "Todos" : "Tasques",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} ha creat la tasca {todo} a {calendar}",
+    "You created todo {todo} in list {calendar}" : "Heu creat la tasca {todo} a {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha suprimit la tasca {todo} de la llista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Heu suprimit la tasca {todo} de la llista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ha actualitzat la tasca {todo} a {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Heu actualitzat la tasca {todo} a {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} ha resolt la tasca {todo} a {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Heu resolt la tasca {todo} a {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ha tornat a obrir la tasca {todo} a {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Heu tornat a obrir la tasca {todo} a {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "S'ha modificat una <strong>tasca</strong> d'un calendari"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/ca.json b/apps/dav/l10n/ca.json
index 0952b65181b..02526a4cf01 100644
--- a/apps/dav/l10n/ca.json
+++ b/apps/dav/l10n/ca.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Calendari",
-    "Todos" : "Tasques",
     "Personal" : "Personal",
     "{actor} created calendar {calendar}" : "{actor} ha creat el calendari {calendar}",
     "You created calendar {calendar}" : "Heu creat el calendari {calendar}",
@@ -29,19 +28,8 @@
     "{actor} updated event {event} in calendar {calendar}" : "{actor} esdeveniment actualitzat {esdeveniment} al calendari {calendar}",
     "You updated event {event} in calendar {calendar}" : "Heu actualitzat l'esdeveniment {event} al calendari {calendar}",
     "Busy" : "Ocupat",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} ha creat la tasca {todo} a {calendar}",
-    "You created todo {todo} in list {calendar}" : "Heu creat la tasca {todo} a {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha suprimit la tasca {todo} de la llista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Heu suprimit la tasca {todo} de la llista {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} ha actualitzat la tasca {todo} a {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Heu actualitzat la tasca {todo} a {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} ha resolt la tasca {todo} a {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Heu resolt la tasca {todo} a {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ha tornat a obrir la tasca {todo} a {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Heu tornat a obrir la tasca {todo} a {calendar}",
     "A <strong>calendar</strong> was modified" : "El <strong>calendari</strong> has estat modificat",
     "A calendar <strong>event</strong> was modified" : "S'ha modificat un <strong> esdeveniment </strong> del calendari",
-    "A calendar <strong>todo</strong> was modified" : "S'ha modificat una <strong>tasca</strong> d'un calendari",
     "Contact birthdays" : "Aniversaris dels contactes",
     "Death of %s" : "Mort de %s",
     "Calendar:" : "Calendari:",
@@ -111,6 +99,18 @@
     "Are you accepting the invitation?" : "Accepteu la invitació?",
     "Tentative" : "Provisional",
     "Comment" : "Comentari",
-    "Your attendance was updated successfully." : "La vostra assistència ha estat actualitzada correctament."
+    "Your attendance was updated successfully." : "La vostra assistència ha estat actualitzada correctament.",
+    "Todos" : "Tasques",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} ha creat la tasca {todo} a {calendar}",
+    "You created todo {todo} in list {calendar}" : "Heu creat la tasca {todo} a {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha suprimit la tasca {todo} de la llista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Heu suprimit la tasca {todo} de la llista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ha actualitzat la tasca {todo} a {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Heu actualitzat la tasca {todo} a {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} ha resolt la tasca {todo} a {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Heu resolt la tasca {todo} a {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ha tornat a obrir la tasca {todo} a {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Heu tornat a obrir la tasca {todo} a {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "S'ha modificat una <strong>tasca</strong> d'un calendari"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/cs.js b/apps/dav/l10n/cs.js
index 82d4323b315..8b2035c5f30 100644
--- a/apps/dav/l10n/cs.js
+++ b/apps/dav/l10n/cs.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalendář",
-    "Todos" : "Úkoly",
     "Personal" : "Osobní",
     "{actor} created calendar {calendar}" : "{actor} vytvořil(a) kalendář {calendar}",
     "You created calendar {calendar}" : "Vytvořili jste kalendář {calendar}",
@@ -37,22 +36,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} obnovil(a) událost {event} kalendáře {calendar}",
     "You restored event {event} of calendar {calendar}" : "Obnovili jste událost {event} kalendáře {calendar}",
     "Busy" : "Zaneprázdněn(a)",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} vytvořil(a) v seznamu {calendar} vytvořila úkol {todo}",
-    "You created todo {todo} in list {calendar}" : "V seznamu {calendar} jste vytvořili úkol {todo}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} smazal(a) úkol {todo} ze seznamu {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Ze seznamu {calendar} jste smazali úkol {todo}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} aktualizoval(a) úkol {todo} v seznamu {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Aktualizovali jste úkol {todo} v seznamu {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} vyřešil(a) úkol {todo} v seznamu {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Vyřešili jste úkol {todo} v seznamu {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} znovu otevřel(a) úkol {todo} v seznamu {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Znovu jste otevřeli úkol {todo} v seznamu {calendar}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} přesunul(a) úkol {todo} ze seznamu {sourceCalendar} do seznamu {targetCalendar}",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Přesunuli jste úkol {todo} ze seznamu {sourceCalendar} do seznamu {targetCalendar}",
     "Calendar, contacts and tasks" : "Kalendář, kontakty a úkoly",
     "A <strong>calendar</strong> was modified" : "<strong>Kalendář</strong> byl změněn",
     "A calendar <strong>event</strong> was modified" : "<strong>Událost</strong> v kalendáři byla změněna",
-    "A calendar <strong>todo</strong> was modified" : "<strong>Úkol</strong> v kalendáři byl změněn",
     "Contact birthdays" : "Narozeniny kontaktů",
     "Death of %s" : "Datum úmrtí %s",
     "Calendar:" : "Kalendář:",
@@ -181,6 +167,18 @@ OC.L10N.register(
     "Tentative" : "Nezávazně",
     "Number of guests" : "Počet hostů",
     "Comment" : "Komentář",
-    "Your attendance was updated successfully." : "Vaše účast byla úspěšně aktualizována."
+    "Your attendance was updated successfully." : "Vaše účast byla úspěšně aktualizována.",
+    "Todos" : "Úkoly",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} vytvořil(a) v seznamu {calendar} vytvořila úkol {todo}",
+    "You created todo {todo} in list {calendar}" : "V seznamu {calendar} jste vytvořili úkol {todo}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} smazal(a) úkol {todo} ze seznamu {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Ze seznamu {calendar} jste smazali úkol {todo}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} aktualizoval(a) úkol {todo} v seznamu {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Aktualizovali jste úkol {todo} v seznamu {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} vyřešil(a) úkol {todo} v seznamu {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vyřešili jste úkol {todo} v seznamu {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} znovu otevřel(a) úkol {todo} v seznamu {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Znovu jste otevřeli úkol {todo} v seznamu {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "<strong>Úkol</strong> v kalendáři byl změněn"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
diff --git a/apps/dav/l10n/cs.json b/apps/dav/l10n/cs.json
index 03e15cd07ba..a782a40ec52 100644
--- a/apps/dav/l10n/cs.json
+++ b/apps/dav/l10n/cs.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalendář",
-    "Todos" : "Úkoly",
     "Personal" : "Osobní",
     "{actor} created calendar {calendar}" : "{actor} vytvořil(a) kalendář {calendar}",
     "You created calendar {calendar}" : "Vytvořili jste kalendář {calendar}",
@@ -35,22 +34,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} obnovil(a) událost {event} kalendáře {calendar}",
     "You restored event {event} of calendar {calendar}" : "Obnovili jste událost {event} kalendáře {calendar}",
     "Busy" : "Zaneprázdněn(a)",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} vytvořil(a) v seznamu {calendar} vytvořila úkol {todo}",
-    "You created todo {todo} in list {calendar}" : "V seznamu {calendar} jste vytvořili úkol {todo}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} smazal(a) úkol {todo} ze seznamu {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Ze seznamu {calendar} jste smazali úkol {todo}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} aktualizoval(a) úkol {todo} v seznamu {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Aktualizovali jste úkol {todo} v seznamu {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} vyřešil(a) úkol {todo} v seznamu {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Vyřešili jste úkol {todo} v seznamu {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} znovu otevřel(a) úkol {todo} v seznamu {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Znovu jste otevřeli úkol {todo} v seznamu {calendar}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} přesunul(a) úkol {todo} ze seznamu {sourceCalendar} do seznamu {targetCalendar}",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Přesunuli jste úkol {todo} ze seznamu {sourceCalendar} do seznamu {targetCalendar}",
     "Calendar, contacts and tasks" : "Kalendář, kontakty a úkoly",
     "A <strong>calendar</strong> was modified" : "<strong>Kalendář</strong> byl změněn",
     "A calendar <strong>event</strong> was modified" : "<strong>Událost</strong> v kalendáři byla změněna",
-    "A calendar <strong>todo</strong> was modified" : "<strong>Úkol</strong> v kalendáři byl změněn",
     "Contact birthdays" : "Narozeniny kontaktů",
     "Death of %s" : "Datum úmrtí %s",
     "Calendar:" : "Kalendář:",
@@ -179,6 +165,18 @@
     "Tentative" : "Nezávazně",
     "Number of guests" : "Počet hostů",
     "Comment" : "Komentář",
-    "Your attendance was updated successfully." : "Vaše účast byla úspěšně aktualizována."
+    "Your attendance was updated successfully." : "Vaše účast byla úspěšně aktualizována.",
+    "Todos" : "Úkoly",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} vytvořil(a) v seznamu {calendar} vytvořila úkol {todo}",
+    "You created todo {todo} in list {calendar}" : "V seznamu {calendar} jste vytvořili úkol {todo}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} smazal(a) úkol {todo} ze seznamu {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Ze seznamu {calendar} jste smazali úkol {todo}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} aktualizoval(a) úkol {todo} v seznamu {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Aktualizovali jste úkol {todo} v seznamu {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} vyřešil(a) úkol {todo} v seznamu {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vyřešili jste úkol {todo} v seznamu {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} znovu otevřel(a) úkol {todo} v seznamu {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Znovu jste otevřeli úkol {todo} v seznamu {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "<strong>Úkol</strong> v kalendáři byl změněn"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/da.js b/apps/dav/l10n/da.js
index ec7ca67b4c7..0018b8f7947 100644
--- a/apps/dav/l10n/da.js
+++ b/apps/dav/l10n/da.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalender",
-    "Todos" : "Opgaver",
     "Personal" : "Personligt",
     "{actor} created calendar {calendar}" : "{actor} oprettede kalenderen {calendar}",
     "You created calendar {calendar}" : "Du oprettede kalenderen {calendar}",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} gendannede begivenhed {event} i kalender {calendar}",
     "You restored event {event} of calendar {calendar}" : "Du gendannede begivenhed {begivenhed} i kalender {kalender}",
     "Busy" : "Optaget",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} oprettede en opgave {todo} i listen {calendar}",
-    "You created todo {todo} in list {calendar}" : "Du oprettede opgaven {todo} i listen {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} slettede opgaven {todo} fra listen {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Du slettede opgaven {todo} fra listen {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} opdaterede opgaven {todo} i listen {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Du opdaterede opgaven {todo} i listen {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} løste opgaven {todo} i listen {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Du løste opgaven {todo} i listen {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} genåbnede opgaven {todo} i listen {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Du genåbnede opgaven {todo} i listen {calendar}",
     "Calendar, contacts and tasks" : "Kalender, kontakter og opgaver",
     "A <strong>calendar</strong> was modified" : "En <strong>kalender</strong> er blevet ændret",
     "A calendar <strong>event</strong> was modified" : "En kalender <strong>begivenhed</strong> er blevet ændret",
-    "A calendar <strong>todo</strong> was modified" : "En kalender  <strong>opgave</strong> blev ændret",
     "Contact birthdays" : "Kontakt fødselsdag",
     "Death of %s" : "Død af%s",
     "Calendar:" : "Kalender:",
@@ -102,6 +90,18 @@ OC.L10N.register(
     "Hence they will not be available immediately after enabling but will show up after some time." : "Derfor vil de ikke blive synlige med det samme efter aktivering, men vil vise sig efter noget tid.",
     "Are you accepting the invitation?" : "Accepter du invitationen?",
     "Tentative" : "Foreløbig",
-    "Comment" : "Kommentér"
+    "Comment" : "Kommentér",
+    "Todos" : "Opgaver",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} oprettede en opgave {todo} i listen {calendar}",
+    "You created todo {todo} in list {calendar}" : "Du oprettede opgaven {todo} i listen {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} slettede opgaven {todo} fra listen {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Du slettede opgaven {todo} fra listen {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} opdaterede opgaven {todo} i listen {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Du opdaterede opgaven {todo} i listen {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} løste opgaven {todo} i listen {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Du løste opgaven {todo} i listen {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} genåbnede opgaven {todo} i listen {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Du genåbnede opgaven {todo} i listen {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "En kalender  <strong>opgave</strong> blev ændret"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/da.json b/apps/dav/l10n/da.json
index 56cbfd455cd..aa71d4631af 100644
--- a/apps/dav/l10n/da.json
+++ b/apps/dav/l10n/da.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalender",
-    "Todos" : "Opgaver",
     "Personal" : "Personligt",
     "{actor} created calendar {calendar}" : "{actor} oprettede kalenderen {calendar}",
     "You created calendar {calendar}" : "Du oprettede kalenderen {calendar}",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} gendannede begivenhed {event} i kalender {calendar}",
     "You restored event {event} of calendar {calendar}" : "Du gendannede begivenhed {begivenhed} i kalender {kalender}",
     "Busy" : "Optaget",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} oprettede en opgave {todo} i listen {calendar}",
-    "You created todo {todo} in list {calendar}" : "Du oprettede opgaven {todo} i listen {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} slettede opgaven {todo} fra listen {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Du slettede opgaven {todo} fra listen {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} opdaterede opgaven {todo} i listen {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Du opdaterede opgaven {todo} i listen {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} løste opgaven {todo} i listen {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Du løste opgaven {todo} i listen {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} genåbnede opgaven {todo} i listen {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Du genåbnede opgaven {todo} i listen {calendar}",
     "Calendar, contacts and tasks" : "Kalender, kontakter og opgaver",
     "A <strong>calendar</strong> was modified" : "En <strong>kalender</strong> er blevet ændret",
     "A calendar <strong>event</strong> was modified" : "En kalender <strong>begivenhed</strong> er blevet ændret",
-    "A calendar <strong>todo</strong> was modified" : "En kalender  <strong>opgave</strong> blev ændret",
     "Contact birthdays" : "Kontakt fødselsdag",
     "Death of %s" : "Død af%s",
     "Calendar:" : "Kalender:",
@@ -100,6 +88,18 @@
     "Hence they will not be available immediately after enabling but will show up after some time." : "Derfor vil de ikke blive synlige med det samme efter aktivering, men vil vise sig efter noget tid.",
     "Are you accepting the invitation?" : "Accepter du invitationen?",
     "Tentative" : "Foreløbig",
-    "Comment" : "Kommentér"
+    "Comment" : "Kommentér",
+    "Todos" : "Opgaver",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} oprettede en opgave {todo} i listen {calendar}",
+    "You created todo {todo} in list {calendar}" : "Du oprettede opgaven {todo} i listen {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} slettede opgaven {todo} fra listen {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Du slettede opgaven {todo} fra listen {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} opdaterede opgaven {todo} i listen {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Du opdaterede opgaven {todo} i listen {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} løste opgaven {todo} i listen {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Du løste opgaven {todo} i listen {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} genåbnede opgaven {todo} i listen {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Du genåbnede opgaven {todo} i listen {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "En kalender  <strong>opgave</strong> blev ændret"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/de.js b/apps/dav/l10n/de.js
index 06586d201df..11fb5d539d6 100644
--- a/apps/dav/l10n/de.js
+++ b/apps/dav/l10n/de.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalender",
-    "Todos" : "Aufgaben",
     "Personal" : "Persönlich",
     "{actor} created calendar {calendar}" : "{actor} hat den Kalender {calendar} erstellt",
     "You created calendar {calendar}" : "Du hast den Kalender {calendar} erstellt",
@@ -32,25 +31,14 @@ OC.L10N.register(
     "You deleted event {event} from calendar {calendar}" : "Du hast den Termin {event} im Kalender {calendar} gelöscht",
     "{actor} updated event {event} in calendar {calendar}" : "{actor} hat den Termin {event} im Kalender {calendar} aktualisiert",
     "You updated event {event} in calendar {calendar}" : "Du hast den Termin {event} im Kalender {calendar} aktualisiert",
+    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} hat das Ereignis {event} vom Kalender {sourceCalendar} in den Kalender {targetCalendar} verschoben",
     "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Du hast das Ereignis {event} vom Kalender {sourceCalendar} in den Kalender {targetCalendar} verschoben",
     "{actor} restored event {event} of calendar {calendar}" : "{actor} hat das Adressbuch {addressbook} mit Dir geteilt",
     "You restored event {event} of calendar {calendar}" : "Du hast den Termin {event} im Kalender {calendar} wiederhergestellt",
     "Busy" : "Beschäftigt",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erstellt",
-    "You created todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} erstellt",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} gelöscht",
-    "You deleted todo {todo} from list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} gelöscht",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} aktualisiert",
-    "You updated todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} aktualisiert",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erledigt",
-    "You solved todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} erledigt",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
-    "You reopened todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Du hast die Aufgabe {todo} von der Liste {sourceCalendar} in die Liste {targetCalendar} verschoben",
     "Calendar, contacts and tasks" : "Kalender, Kontakte und Aufgaben",
     "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet",
     "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Termin</strong> wurde bearbeitet",
-    "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet",
     "Contact birthdays" : "Geburtstage von Kontakten",
     "Death of %s" : "Todestag von %s",
     "Calendar:" : "Kalender:",
@@ -179,6 +167,18 @@ OC.L10N.register(
     "Tentative" : "Vorläufig",
     "Number of guests" : "Anzahl Gäste",
     "Comment" : "Kommentar",
-    "Your attendance was updated successfully." : "Dein Teilnehmerstatus wurde aktualisiert."
+    "Your attendance was updated successfully." : "Dein Teilnehmerstatus wurde aktualisiert.",
+    "Todos" : "Aufgaben",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erstellt",
+    "You created todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} erstellt",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} gelöscht",
+    "You deleted todo {todo} from list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} gelöscht",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} aktualisiert",
+    "You updated todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} aktualisiert",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erledigt",
+    "You solved todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} erledigt",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
+    "You reopened todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
+    "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/de.json b/apps/dav/l10n/de.json
index 4657dca751d..aaba5489f88 100644
--- a/apps/dav/l10n/de.json
+++ b/apps/dav/l10n/de.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalender",
-    "Todos" : "Aufgaben",
     "Personal" : "Persönlich",
     "{actor} created calendar {calendar}" : "{actor} hat den Kalender {calendar} erstellt",
     "You created calendar {calendar}" : "Du hast den Kalender {calendar} erstellt",
@@ -30,25 +29,14 @@
     "You deleted event {event} from calendar {calendar}" : "Du hast den Termin {event} im Kalender {calendar} gelöscht",
     "{actor} updated event {event} in calendar {calendar}" : "{actor} hat den Termin {event} im Kalender {calendar} aktualisiert",
     "You updated event {event} in calendar {calendar}" : "Du hast den Termin {event} im Kalender {calendar} aktualisiert",
+    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} hat das Ereignis {event} vom Kalender {sourceCalendar} in den Kalender {targetCalendar} verschoben",
     "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Du hast das Ereignis {event} vom Kalender {sourceCalendar} in den Kalender {targetCalendar} verschoben",
     "{actor} restored event {event} of calendar {calendar}" : "{actor} hat das Adressbuch {addressbook} mit Dir geteilt",
     "You restored event {event} of calendar {calendar}" : "Du hast den Termin {event} im Kalender {calendar} wiederhergestellt",
     "Busy" : "Beschäftigt",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erstellt",
-    "You created todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} erstellt",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} gelöscht",
-    "You deleted todo {todo} from list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} gelöscht",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} aktualisiert",
-    "You updated todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} aktualisiert",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erledigt",
-    "You solved todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} erledigt",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
-    "You reopened todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Du hast die Aufgabe {todo} von der Liste {sourceCalendar} in die Liste {targetCalendar} verschoben",
     "Calendar, contacts and tasks" : "Kalender, Kontakte und Aufgaben",
     "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet",
     "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Termin</strong> wurde bearbeitet",
-    "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet",
     "Contact birthdays" : "Geburtstage von Kontakten",
     "Death of %s" : "Todestag von %s",
     "Calendar:" : "Kalender:",
@@ -177,6 +165,18 @@
     "Tentative" : "Vorläufig",
     "Number of guests" : "Anzahl Gäste",
     "Comment" : "Kommentar",
-    "Your attendance was updated successfully." : "Dein Teilnehmerstatus wurde aktualisiert."
+    "Your attendance was updated successfully." : "Dein Teilnehmerstatus wurde aktualisiert.",
+    "Todos" : "Aufgaben",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erstellt",
+    "You created todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} erstellt",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} gelöscht",
+    "You deleted todo {todo} from list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} gelöscht",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} aktualisiert",
+    "You updated todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} aktualisiert",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erledigt",
+    "You solved todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} erledigt",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
+    "You reopened todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
+    "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/de_DE.js b/apps/dav/l10n/de_DE.js
index 8768921169e..8b831e6f0d4 100644
--- a/apps/dav/l10n/de_DE.js
+++ b/apps/dav/l10n/de_DE.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalender",
-    "Todos" : "Aufgaben",
     "Personal" : "Persönlich",
     "{actor} created calendar {calendar}" : "{actor} hat den Kalender {calendar} erstellt",
     "You created calendar {calendar}" : "Sie haben den Kalender {calendar} erstellt",
@@ -37,22 +36,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} hat den Termin {event} im Kalender {calendar} wiederhergestellt",
     "You restored event {event} of calendar {calendar}" : "Sie haben den Termin {event} im Kalender {calendar} wiederhergestellt",
     "Busy" : "Beschäftigt",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erstellt",
-    "You created todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} erstellt",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} gelöscht",
-    "You deleted todo {todo} from list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} gelöscht",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} aktualisiert",
-    "You updated todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} aktualisiert",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erledigt",
-    "You solved todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} erledigt",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
-    "You reopened todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} hat die Aufgabe {todo} von der Liste {sourceCalendar} in die Liste {targetCalendar} verschoben",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Sie haben die Aufgabe {todo} von der Liste {sourceCalendar} in die Liste {targetCalendar} verschoben",
     "Calendar, contacts and tasks" : "Kalender, Kontakte und Aufgaben",
     "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet",
     "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Termin</strong> wurde bearbeitet",
-    "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet",
     "Contact birthdays" : "Geburtstage von Kontakten",
     "Death of %s" : "Todestag von %s",
     "Calendar:" : "Kalender:",
@@ -181,6 +167,18 @@ OC.L10N.register(
     "Tentative" : "Vorläufig",
     "Number of guests" : "Anzahl Gäste",
     "Comment" : "Kommentar",
-    "Your attendance was updated successfully." : "Ihr Teilnehmerstatus wurde aktualisiert."
+    "Your attendance was updated successfully." : "Ihr Teilnehmerstatus wurde aktualisiert.",
+    "Todos" : "Aufgaben",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erstellt",
+    "You created todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} erstellt",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} gelöscht",
+    "You deleted todo {todo} from list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} gelöscht",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} aktualisiert",
+    "You updated todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} aktualisiert",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erledigt",
+    "You solved todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} erledigt",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
+    "You reopened todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
+    "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/de_DE.json b/apps/dav/l10n/de_DE.json
index e8273acefbc..639f4428d48 100644
--- a/apps/dav/l10n/de_DE.json
+++ b/apps/dav/l10n/de_DE.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalender",
-    "Todos" : "Aufgaben",
     "Personal" : "Persönlich",
     "{actor} created calendar {calendar}" : "{actor} hat den Kalender {calendar} erstellt",
     "You created calendar {calendar}" : "Sie haben den Kalender {calendar} erstellt",
@@ -35,22 +34,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} hat den Termin {event} im Kalender {calendar} wiederhergestellt",
     "You restored event {event} of calendar {calendar}" : "Sie haben den Termin {event} im Kalender {calendar} wiederhergestellt",
     "Busy" : "Beschäftigt",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erstellt",
-    "You created todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} erstellt",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} gelöscht",
-    "You deleted todo {todo} from list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} gelöscht",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} aktualisiert",
-    "You updated todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} aktualisiert",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erledigt",
-    "You solved todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} erledigt",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
-    "You reopened todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} hat die Aufgabe {todo} von der Liste {sourceCalendar} in die Liste {targetCalendar} verschoben",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Sie haben die Aufgabe {todo} von der Liste {sourceCalendar} in die Liste {targetCalendar} verschoben",
     "Calendar, contacts and tasks" : "Kalender, Kontakte und Aufgaben",
     "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet",
     "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Termin</strong> wurde bearbeitet",
-    "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet",
     "Contact birthdays" : "Geburtstage von Kontakten",
     "Death of %s" : "Todestag von %s",
     "Calendar:" : "Kalender:",
@@ -179,6 +165,18 @@
     "Tentative" : "Vorläufig",
     "Number of guests" : "Anzahl Gäste",
     "Comment" : "Kommentar",
-    "Your attendance was updated successfully." : "Ihr Teilnehmerstatus wurde aktualisiert."
+    "Your attendance was updated successfully." : "Ihr Teilnehmerstatus wurde aktualisiert.",
+    "Todos" : "Aufgaben",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erstellt",
+    "You created todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} erstellt",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} gelöscht",
+    "You deleted todo {todo} from list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} gelöscht",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} aktualisiert",
+    "You updated todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} aktualisiert",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erledigt",
+    "You solved todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} erledigt",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
+    "You reopened todo {todo} in list {calendar}" : "Sie haben die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
+    "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/el.js b/apps/dav/l10n/el.js
index e9a8c403943..dc5084f506b 100644
--- a/apps/dav/l10n/el.js
+++ b/apps/dav/l10n/el.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Ημερολόγιο",
-    "Todos" : "Εργασίες προς εκτέλεση",
     "Personal" : "Προσωπικά",
     "{actor} created calendar {calendar}" : "{actor} δημιουργήθηκε το ημερολόγιο {calendar}",
     "You created calendar {calendar}" : "Δημιουργήσατε ημερολόγιο {ημερολόγιο}",
@@ -31,19 +30,8 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "Ο {actor} ενημέρωσε το γεγονός {event} στο ημερολόγιο {calendar}",
     "You updated event {event} in calendar {calendar}" : "Ενημερώσατε το συμβάν {event} στο ημερολόγιο {calendar}",
     "Busy" : "Απασχολημένος",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} δημιούργησε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
-    "You created todo {todo} in list {calendar}" : "Δημιουργήσατε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
-    "{actor} deleted todo {todo} from list {calendar}" : "Ο {actor} διέγραψε την εκκρεμότητα  {todo} από τη  λίστα {ημερολόγιο}",
-    "You deleted todo {todo} from list {calendar}" : "Διέγραψες την εκκρεμότητα {todo} από τη λίστα {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} ενημέρωσε την εκκρεμότητα {todo} στη λίστα {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Ενημέρωσες την εκκρεμότητα {todo} στη λίστα {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} επίλυσε την εκκρεμότητα {todo} στην λίστα {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Επίλυσες την εκκρεμότητα {todo} στην λίστα {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} άνοιξε ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Άνοιξες ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
     "A <strong>calendar</strong> was modified" : "Τροποποιήθηκε ένα <strong>ημερολόγιο</strong> ",
     "A calendar <strong>event</strong> was modified" : "Τροποποιήθηκε ένα <strong>γεγονός</strong> του ημερολογίου",
-    "A calendar <strong>todo</strong> was modified" : "Ενός ημερολογίου η <strong>εκκρεμότητα</strong> τροποποιήθηκε",
     "Contact birthdays" : "Γενέθλια επαφών",
     "Death of %s" : "Θάνατος του %s",
     "Calendar:" : "Ημερολόγιο:",
@@ -113,6 +101,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Αποδέχεστε την πρόσκληση;",
     "Tentative" : "Δοκιμαστικό",
     "Comment" : "Σχόλιο",
-    "Your attendance was updated successfully." : "Η παρουσία σας ενημερώθηκε με επιτυχία."
+    "Your attendance was updated successfully." : "Η παρουσία σας ενημερώθηκε με επιτυχία.",
+    "Todos" : "Εργασίες προς εκτέλεση",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} δημιούργησε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "You created todo {todo} in list {calendar}" : "Δημιουργήσατε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "{actor} deleted todo {todo} from list {calendar}" : "Ο {actor} διέγραψε την εκκρεμότητα  {todo} από τη  λίστα {ημερολόγιο}",
+    "You deleted todo {todo} from list {calendar}" : "Διέγραψες την εκκρεμότητα {todo} από τη λίστα {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ενημέρωσε την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ενημέρωσες την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} επίλυσε την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Επίλυσες την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} άνοιξε ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Άνοιξες ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Ενός ημερολογίου η <strong>εκκρεμότητα</strong> τροποποιήθηκε"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/el.json b/apps/dav/l10n/el.json
index 79151b2d754..d76e8094d4f 100644
--- a/apps/dav/l10n/el.json
+++ b/apps/dav/l10n/el.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Ημερολόγιο",
-    "Todos" : "Εργασίες προς εκτέλεση",
     "Personal" : "Προσωπικά",
     "{actor} created calendar {calendar}" : "{actor} δημιουργήθηκε το ημερολόγιο {calendar}",
     "You created calendar {calendar}" : "Δημιουργήσατε ημερολόγιο {ημερολόγιο}",
@@ -29,19 +28,8 @@
     "{actor} updated event {event} in calendar {calendar}" : "Ο {actor} ενημέρωσε το γεγονός {event} στο ημερολόγιο {calendar}",
     "You updated event {event} in calendar {calendar}" : "Ενημερώσατε το συμβάν {event} στο ημερολόγιο {calendar}",
     "Busy" : "Απασχολημένος",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} δημιούργησε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
-    "You created todo {todo} in list {calendar}" : "Δημιουργήσατε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
-    "{actor} deleted todo {todo} from list {calendar}" : "Ο {actor} διέγραψε την εκκρεμότητα  {todo} από τη  λίστα {ημερολόγιο}",
-    "You deleted todo {todo} from list {calendar}" : "Διέγραψες την εκκρεμότητα {todo} από τη λίστα {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} ενημέρωσε την εκκρεμότητα {todo} στη λίστα {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Ενημέρωσες την εκκρεμότητα {todo} στη λίστα {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} επίλυσε την εκκρεμότητα {todo} στην λίστα {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Επίλυσες την εκκρεμότητα {todo} στην λίστα {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} άνοιξε ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Άνοιξες ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
     "A <strong>calendar</strong> was modified" : "Τροποποιήθηκε ένα <strong>ημερολόγιο</strong> ",
     "A calendar <strong>event</strong> was modified" : "Τροποποιήθηκε ένα <strong>γεγονός</strong> του ημερολογίου",
-    "A calendar <strong>todo</strong> was modified" : "Ενός ημερολογίου η <strong>εκκρεμότητα</strong> τροποποιήθηκε",
     "Contact birthdays" : "Γενέθλια επαφών",
     "Death of %s" : "Θάνατος του %s",
     "Calendar:" : "Ημερολόγιο:",
@@ -111,6 +99,18 @@
     "Are you accepting the invitation?" : "Αποδέχεστε την πρόσκληση;",
     "Tentative" : "Δοκιμαστικό",
     "Comment" : "Σχόλιο",
-    "Your attendance was updated successfully." : "Η παρουσία σας ενημερώθηκε με επιτυχία."
+    "Your attendance was updated successfully." : "Η παρουσία σας ενημερώθηκε με επιτυχία.",
+    "Todos" : "Εργασίες προς εκτέλεση",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} δημιούργησε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "You created todo {todo} in list {calendar}" : "Δημιουργήσατε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "{actor} deleted todo {todo} from list {calendar}" : "Ο {actor} διέγραψε την εκκρεμότητα  {todo} από τη  λίστα {ημερολόγιο}",
+    "You deleted todo {todo} from list {calendar}" : "Διέγραψες την εκκρεμότητα {todo} από τη λίστα {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ενημέρωσε την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ενημέρωσες την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} επίλυσε την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Επίλυσες την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} άνοιξε ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Άνοιξες ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Ενός ημερολογίου η <strong>εκκρεμότητα</strong> τροποποιήθηκε"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/eo.js b/apps/dav/l10n/eo.js
index 63861008c39..50cb8077a10 100644
--- a/apps/dav/l10n/eo.js
+++ b/apps/dav/l10n/eo.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalendaro",
-    "Todos" : "Taskoj",
     "Personal" : "Persona",
     "{actor} created calendar {calendar}" : "{actor} kreis kalendaron {calendar}",
     "You created calendar {calendar}" : "Vi kreis kalendaron {calendar}",
@@ -31,19 +30,8 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "{actor} ĝisdatigis okazaĵon {event} en kalendaro {calendar}",
     "You updated event {event} in calendar {calendar}" : "Vi ĝisdatigis okazaĵon {event} en kalendaro {calendar}",
     "Busy" : "Okupita",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} kreis farendaĵon {todo} en listo {calendar}",
-    "You created todo {todo} in list {calendar}" : "Vi kreis farendaĵon {todo} en listo {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} forigis farendaĵon {todo} en listo {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Vi forigis farendaĵon {todo} en listo {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} ĝisdatigis farendaĵon {todo} en listo {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Vi ĝisdatigis farendaĵon {todo} en listo {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} plenumis farendaĵon {todo} en listo {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Vi plenumis farendaĵon {todo} en listo {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} remalfermis farendaĵon {todo} en listo {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Vi remalfermis farendaĵon {todo} en listo {calendar}",
     "A <strong>calendar</strong> was modified" : "<strong>Kalendaro</strong> estis modifita",
     "A calendar <strong>event</strong> was modified" : "Kalendara <strong>okazaĵo</strong> estis modifita",
-    "A calendar <strong>todo</strong> was modified" : "Kalendara <strong>farendaĵo</strong> estis modifita",
     "Contact birthdays" : "Kontaktaj datrevenoj",
     "Death of %s" : "Morto de %s",
     "Calendar:" : "Kalendaro:",
@@ -100,6 +88,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Ĉu vi akceptas la inviton?",
     "Tentative" : "Nekonfirmita",
     "Comment" : "Komento",
-    "Your attendance was updated successfully." : "Via ĉeesto sukcese ĝisdatiĝis."
+    "Your attendance was updated successfully." : "Via ĉeesto sukcese ĝisdatiĝis.",
+    "Todos" : "Taskoj",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} kreis farendaĵon {todo} en listo {calendar}",
+    "You created todo {todo} in list {calendar}" : "Vi kreis farendaĵon {todo} en listo {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} forigis farendaĵon {todo} en listo {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Vi forigis farendaĵon {todo} en listo {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ĝisdatigis farendaĵon {todo} en listo {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Vi ĝisdatigis farendaĵon {todo} en listo {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} plenumis farendaĵon {todo} en listo {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vi plenumis farendaĵon {todo} en listo {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} remalfermis farendaĵon {todo} en listo {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Vi remalfermis farendaĵon {todo} en listo {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Kalendara <strong>farendaĵo</strong> estis modifita"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/eo.json b/apps/dav/l10n/eo.json
index 2eb6017f344..8025d45c597 100644
--- a/apps/dav/l10n/eo.json
+++ b/apps/dav/l10n/eo.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalendaro",
-    "Todos" : "Taskoj",
     "Personal" : "Persona",
     "{actor} created calendar {calendar}" : "{actor} kreis kalendaron {calendar}",
     "You created calendar {calendar}" : "Vi kreis kalendaron {calendar}",
@@ -29,19 +28,8 @@
     "{actor} updated event {event} in calendar {calendar}" : "{actor} ĝisdatigis okazaĵon {event} en kalendaro {calendar}",
     "You updated event {event} in calendar {calendar}" : "Vi ĝisdatigis okazaĵon {event} en kalendaro {calendar}",
     "Busy" : "Okupita",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} kreis farendaĵon {todo} en listo {calendar}",
-    "You created todo {todo} in list {calendar}" : "Vi kreis farendaĵon {todo} en listo {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} forigis farendaĵon {todo} en listo {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Vi forigis farendaĵon {todo} en listo {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} ĝisdatigis farendaĵon {todo} en listo {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Vi ĝisdatigis farendaĵon {todo} en listo {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} plenumis farendaĵon {todo} en listo {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Vi plenumis farendaĵon {todo} en listo {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} remalfermis farendaĵon {todo} en listo {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Vi remalfermis farendaĵon {todo} en listo {calendar}",
     "A <strong>calendar</strong> was modified" : "<strong>Kalendaro</strong> estis modifita",
     "A calendar <strong>event</strong> was modified" : "Kalendara <strong>okazaĵo</strong> estis modifita",
-    "A calendar <strong>todo</strong> was modified" : "Kalendara <strong>farendaĵo</strong> estis modifita",
     "Contact birthdays" : "Kontaktaj datrevenoj",
     "Death of %s" : "Morto de %s",
     "Calendar:" : "Kalendaro:",
@@ -98,6 +86,18 @@
     "Are you accepting the invitation?" : "Ĉu vi akceptas la inviton?",
     "Tentative" : "Nekonfirmita",
     "Comment" : "Komento",
-    "Your attendance was updated successfully." : "Via ĉeesto sukcese ĝisdatiĝis."
+    "Your attendance was updated successfully." : "Via ĉeesto sukcese ĝisdatiĝis.",
+    "Todos" : "Taskoj",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} kreis farendaĵon {todo} en listo {calendar}",
+    "You created todo {todo} in list {calendar}" : "Vi kreis farendaĵon {todo} en listo {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} forigis farendaĵon {todo} en listo {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Vi forigis farendaĵon {todo} en listo {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ĝisdatigis farendaĵon {todo} en listo {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Vi ĝisdatigis farendaĵon {todo} en listo {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} plenumis farendaĵon {todo} en listo {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vi plenumis farendaĵon {todo} en listo {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} remalfermis farendaĵon {todo} en listo {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Vi remalfermis farendaĵon {todo} en listo {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Kalendara <strong>farendaĵo</strong> estis modifita"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/es.js b/apps/dav/l10n/es.js
index 375abc0f62b..dad59cef5eb 100644
--- a/apps/dav/l10n/es.js
+++ b/apps/dav/l10n/es.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Calendario",
-    "Todos" : "Todos",
     "Personal" : "Personal",
     "{actor} created calendar {calendar}" : "{actor} creó el calendario {calendar}",
     "You created calendar {calendar}" : "Usted creó el calendario {calendar}",
@@ -32,23 +31,14 @@ OC.L10N.register(
     "You deleted event {event} from calendar {calendar}" : "Usted eliminó el evento {event} del calendario {calendar}",
     "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizó el evento {event} en el calendario {calendar}",
     "You updated event {event} in calendar {calendar}" : "Usted actualizó el evento {event} en el calendario {calendar}",
+    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} ha movido el evento {event} del calendario {sourceCalendar} al calendario {targetCalendar}",
+    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Has movido el evento {event} del calendario {sourceCalendar} al calendario {targetCalendar}",
     "{actor} restored event {event} of calendar {calendar}" : "{actor} ha restablecido el evento {event} del calendario {calendar}",
     "You restored event {event} of calendar {calendar}" : "Has reestablecido el evento {event} del calendario {calendar}",
     "Busy" : "Ocupado",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} creó la tarea {todo} en la lista {calendar}",
-    "You created todo {todo} in list {calendar}" : "Usted creó la tarea {todo} en la lista {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eliminó la tarea {todo} de la lista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Usted eliminó la tarea {tod} de la lista {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizó la tarea {todo }en la lista {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Usted actualizó la tarea {todo} en la lista {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} completó la tarea {todo} en la lista {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Usted completó la tarea {todo} en la lista {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabrió la tarea {todo} en la lista {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Usted reabrió la tarea {todo} en la lista {calendar}",
     "Calendar, contacts and tasks" : "Calendario, contactos y tareas",
     "A <strong>calendar</strong> was modified" : "Un <strong>calendario</strong> fue modificado.",
     "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> del calendario fue modificado.",
-    "A calendar <strong>todo</strong> was modified" : "Una <strong>lista de tareas</strong> fue modificada",
     "Contact birthdays" : "Cumpleaños del contacto",
     "Death of %s" : "Muerte de %s",
     "Calendar:" : "Calendario:",
@@ -177,6 +167,18 @@ OC.L10N.register(
     "Tentative" : "Provisional",
     "Number of guests" : "Número de invitados",
     "Comment" : "Comentario",
-    "Your attendance was updated successfully." : "Tu asistencia se ha actualizado con éxito."
+    "Your attendance was updated successfully." : "Tu asistencia se ha actualizado con éxito.",
+    "Todos" : "Todos",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} creó la tarea {todo} en la lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Usted creó la tarea {todo} en la lista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eliminó la tarea {todo} de la lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Usted eliminó la tarea {tod} de la lista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizó la tarea {todo }en la lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Usted actualizó la tarea {todo} en la lista {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} completó la tarea {todo} en la lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Usted completó la tarea {todo} en la lista {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabrió la tarea {todo} en la lista {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Usted reabrió la tarea {todo} en la lista {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Una <strong>lista de tareas</strong> fue modificada"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/dav/l10n/es.json b/apps/dav/l10n/es.json
index 350c64df063..4f7161fe3c5 100644
--- a/apps/dav/l10n/es.json
+++ b/apps/dav/l10n/es.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Calendario",
-    "Todos" : "Todos",
     "Personal" : "Personal",
     "{actor} created calendar {calendar}" : "{actor} creó el calendario {calendar}",
     "You created calendar {calendar}" : "Usted creó el calendario {calendar}",
@@ -30,23 +29,14 @@
     "You deleted event {event} from calendar {calendar}" : "Usted eliminó el evento {event} del calendario {calendar}",
     "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizó el evento {event} en el calendario {calendar}",
     "You updated event {event} in calendar {calendar}" : "Usted actualizó el evento {event} en el calendario {calendar}",
+    "{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "{actor} ha movido el evento {event} del calendario {sourceCalendar} al calendario {targetCalendar}",
+    "You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}" : "Has movido el evento {event} del calendario {sourceCalendar} al calendario {targetCalendar}",
     "{actor} restored event {event} of calendar {calendar}" : "{actor} ha restablecido el evento {event} del calendario {calendar}",
     "You restored event {event} of calendar {calendar}" : "Has reestablecido el evento {event} del calendario {calendar}",
     "Busy" : "Ocupado",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} creó la tarea {todo} en la lista {calendar}",
-    "You created todo {todo} in list {calendar}" : "Usted creó la tarea {todo} en la lista {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eliminó la tarea {todo} de la lista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Usted eliminó la tarea {tod} de la lista {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizó la tarea {todo }en la lista {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Usted actualizó la tarea {todo} en la lista {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} completó la tarea {todo} en la lista {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Usted completó la tarea {todo} en la lista {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabrió la tarea {todo} en la lista {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Usted reabrió la tarea {todo} en la lista {calendar}",
     "Calendar, contacts and tasks" : "Calendario, contactos y tareas",
     "A <strong>calendar</strong> was modified" : "Un <strong>calendario</strong> fue modificado.",
     "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> del calendario fue modificado.",
-    "A calendar <strong>todo</strong> was modified" : "Una <strong>lista de tareas</strong> fue modificada",
     "Contact birthdays" : "Cumpleaños del contacto",
     "Death of %s" : "Muerte de %s",
     "Calendar:" : "Calendario:",
@@ -175,6 +165,18 @@
     "Tentative" : "Provisional",
     "Number of guests" : "Número de invitados",
     "Comment" : "Comentario",
-    "Your attendance was updated successfully." : "Tu asistencia se ha actualizado con éxito."
+    "Your attendance was updated successfully." : "Tu asistencia se ha actualizado con éxito.",
+    "Todos" : "Todos",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} creó la tarea {todo} en la lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Usted creó la tarea {todo} en la lista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eliminó la tarea {todo} de la lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Usted eliminó la tarea {tod} de la lista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizó la tarea {todo }en la lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Usted actualizó la tarea {todo} en la lista {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} completó la tarea {todo} en la lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Usted completó la tarea {todo} en la lista {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabrió la tarea {todo} en la lista {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Usted reabrió la tarea {todo} en la lista {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Una <strong>lista de tareas</strong> fue modificada"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/eu.js b/apps/dav/l10n/eu.js
index ef2288a3862..63ad0bddcad 100644
--- a/apps/dav/l10n/eu.js
+++ b/apps/dav/l10n/eu.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Egutegia",
-    "Todos" : "Egitekoak",
     "Personal" : "Pertsonala",
     "{actor} created calendar {calendar}" : "{actor}-k sortutako egutegia: {calendar}",
     "You created calendar {calendar}" : "{calendar} egutegia sortu duzu",
@@ -37,22 +36,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor}-(e)k berrezarri du  {calendar} egutegiko {event} gertaera  ",
     "You restored event {event} of calendar {calendar}" : "Berrezarri duzu  {calendar} egutegiko {event} gertaera ",
     "Busy" : "Lanpetua",
-    "{actor} created todo {todo} in list {calendar}" : "{actor}-ek {calendar} zerrendan {todo} zeregina sortu du.",
-    "You created todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} ekintza sortu duzu.",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina borratu du.",
-    "You deleted todo {todo} from list {calendar}" : " {calendar} zerrendan {todo} zeregina borratu duzu.",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina eguneratu du.",
-    "You updated todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} zeregina eguneratu duzu.",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina bukatu du.",
-    "You solved todo {todo} in list {calendar}" : " {calendar} zerrendan {todo} zeregina bukatu duzu.",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} erabiltzaileak {calendar} zerrendan {todo} zeregina berrireki du.",
-    "You reopened todo {todo} in list {calendar}" : "{calendar} egutegian {todo} zeregina berrireki duzu. ",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor}-(e)k {todo} egitekoa {sourceCalendar} zerrendatik {targetCalendar} zerrendara mugitu du",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{todo} egitekoa {sourceCalendar} zerrendatik {targetCalendar} zerrendara mugitu duzu",
     "Calendar, contacts and tasks" : "Egutegia, kontaktuak eta atazak",
     "A <strong>calendar</strong> was modified" : "Egutegia aldatu da",
     "A calendar <strong>event</strong> was modified" : "Egutegiaren <strong>gertaera</strong> bat aldatu da",
-    "A calendar <strong>todo</strong> was modified" : "Egutegiaren zeregin bat aldatu da",
     "Contact birthdays" : "Kontaktuen urtebetetzeak",
     "Death of %s" : "%s(r)en heriotza",
     "Calendar:" : "Egutegia:",
@@ -181,6 +167,18 @@ OC.L10N.register(
     "Tentative" : "Behin behinekoa",
     "Number of guests" : "Gonbidatu kopurua",
     "Comment" : "Iruzkindu",
-    "Your attendance was updated successfully." : "Zure parte-hartzea ondo eguneratu da."
+    "Your attendance was updated successfully." : "Zure parte-hartzea ondo eguneratu da.",
+    "Todos" : "Egitekoak",
+    "{actor} created todo {todo} in list {calendar}" : "{actor}-ek {calendar} zerrendan {todo} zeregina sortu du.",
+    "You created todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} ekintza sortu duzu.",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina borratu du.",
+    "You deleted todo {todo} from list {calendar}" : " {calendar} zerrendan {todo} zeregina borratu duzu.",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina eguneratu du.",
+    "You updated todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} zeregina eguneratu duzu.",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina bukatu du.",
+    "You solved todo {todo} in list {calendar}" : " {calendar} zerrendan {todo} zeregina bukatu duzu.",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} erabiltzaileak {calendar} zerrendan {todo} zeregina berrireki du.",
+    "You reopened todo {todo} in list {calendar}" : "{calendar} egutegian {todo} zeregina berrireki duzu. ",
+    "A calendar <strong>todo</strong> was modified" : "Egutegiaren zeregin bat aldatu da"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/eu.json b/apps/dav/l10n/eu.json
index 9aa5fe2a1b1..336df305b1c 100644
--- a/apps/dav/l10n/eu.json
+++ b/apps/dav/l10n/eu.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Egutegia",
-    "Todos" : "Egitekoak",
     "Personal" : "Pertsonala",
     "{actor} created calendar {calendar}" : "{actor}-k sortutako egutegia: {calendar}",
     "You created calendar {calendar}" : "{calendar} egutegia sortu duzu",
@@ -35,22 +34,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor}-(e)k berrezarri du  {calendar} egutegiko {event} gertaera  ",
     "You restored event {event} of calendar {calendar}" : "Berrezarri duzu  {calendar} egutegiko {event} gertaera ",
     "Busy" : "Lanpetua",
-    "{actor} created todo {todo} in list {calendar}" : "{actor}-ek {calendar} zerrendan {todo} zeregina sortu du.",
-    "You created todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} ekintza sortu duzu.",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina borratu du.",
-    "You deleted todo {todo} from list {calendar}" : " {calendar} zerrendan {todo} zeregina borratu duzu.",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina eguneratu du.",
-    "You updated todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} zeregina eguneratu duzu.",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina bukatu du.",
-    "You solved todo {todo} in list {calendar}" : " {calendar} zerrendan {todo} zeregina bukatu duzu.",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} erabiltzaileak {calendar} zerrendan {todo} zeregina berrireki du.",
-    "You reopened todo {todo} in list {calendar}" : "{calendar} egutegian {todo} zeregina berrireki duzu. ",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor}-(e)k {todo} egitekoa {sourceCalendar} zerrendatik {targetCalendar} zerrendara mugitu du",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{todo} egitekoa {sourceCalendar} zerrendatik {targetCalendar} zerrendara mugitu duzu",
     "Calendar, contacts and tasks" : "Egutegia, kontaktuak eta atazak",
     "A <strong>calendar</strong> was modified" : "Egutegia aldatu da",
     "A calendar <strong>event</strong> was modified" : "Egutegiaren <strong>gertaera</strong> bat aldatu da",
-    "A calendar <strong>todo</strong> was modified" : "Egutegiaren zeregin bat aldatu da",
     "Contact birthdays" : "Kontaktuen urtebetetzeak",
     "Death of %s" : "%s(r)en heriotza",
     "Calendar:" : "Egutegia:",
@@ -179,6 +165,18 @@
     "Tentative" : "Behin behinekoa",
     "Number of guests" : "Gonbidatu kopurua",
     "Comment" : "Iruzkindu",
-    "Your attendance was updated successfully." : "Zure parte-hartzea ondo eguneratu da."
+    "Your attendance was updated successfully." : "Zure parte-hartzea ondo eguneratu da.",
+    "Todos" : "Egitekoak",
+    "{actor} created todo {todo} in list {calendar}" : "{actor}-ek {calendar} zerrendan {todo} zeregina sortu du.",
+    "You created todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} ekintza sortu duzu.",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina borratu du.",
+    "You deleted todo {todo} from list {calendar}" : " {calendar} zerrendan {todo} zeregina borratu duzu.",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina eguneratu du.",
+    "You updated todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} zeregina eguneratu duzu.",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina bukatu du.",
+    "You solved todo {todo} in list {calendar}" : " {calendar} zerrendan {todo} zeregina bukatu duzu.",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} erabiltzaileak {calendar} zerrendan {todo} zeregina berrireki du.",
+    "You reopened todo {todo} in list {calendar}" : "{calendar} egutegian {todo} zeregina berrireki duzu. ",
+    "A calendar <strong>todo</strong> was modified" : "Egutegiaren zeregin bat aldatu da"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/fi.js b/apps/dav/l10n/fi.js
index 07a8eb95b8d..64814ca4a06 100644
--- a/apps/dav/l10n/fi.js
+++ b/apps/dav/l10n/fi.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalenteri",
-    "Todos" : "Tehtävät",
     "Personal" : "Henkilökohtainen",
     "{actor} created calendar {calendar}" : "{actor} loi kalenterin {calendar}",
     "You created calendar {calendar}" : "Loit kalenterin {calendar}",
@@ -33,20 +32,9 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "{actor} päivitti tapahtuman {event} kalenteriin {calendar}",
     "You updated event {event} in calendar {calendar}" : "Päivitit tapahtuman {event} kalenteriin {calendar}",
     "Busy" : "Varattu",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} loi tehtävän {todo} listaan {calendar}",
-    "You created todo {todo} in list {calendar}" : "Loit tehtävän {todo} listaan {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} poisti tehtävän {todo} listasta {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Poistit tehtävän {todo} listasta {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} päivitti tehtävän {todo} listassa {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Päivitit tehtävän {todo} listassa {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} suoritti tehtävän {todo} listasta {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Suoritit tehtävän {todo} listasta {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} avasi uudelleen tehtävän {todo} listassa {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Avasit uudelleen tehtävän {todo} listassa {calendar}",
     "Calendar, contacts and tasks" : "Kalenteri, yhteystiedot ja tehtävät",
     "A <strong>calendar</strong> was modified" : "<strong>Kalenteria</strong> on muokattu",
     "A calendar <strong>event</strong> was modified" : "Kalenterin <strong>tapahtumaa</strong> on muokattu",
-    "A calendar <strong>todo</strong> was modified" : "Kalenterin <strong>tehtävää</strong> on muokattu",
     "Contact birthdays" : "Yhteystietojen syntymäpäivät",
     "Death of %s" : "%s kuolema",
     "Calendar:" : "Kalenteri:",
@@ -140,6 +128,18 @@ OC.L10N.register(
     "Tentative" : "Alustava",
     "Number of guests" : "Vieraiden määrä",
     "Comment" : "Kommentti",
-    "Your attendance was updated successfully." : "Osallistumisesi päivitettiin onnistuneesti."
+    "Your attendance was updated successfully." : "Osallistumisesi päivitettiin onnistuneesti.",
+    "Todos" : "Tehtävät",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} loi tehtävän {todo} listaan {calendar}",
+    "You created todo {todo} in list {calendar}" : "Loit tehtävän {todo} listaan {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} poisti tehtävän {todo} listasta {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Poistit tehtävän {todo} listasta {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} päivitti tehtävän {todo} listassa {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Päivitit tehtävän {todo} listassa {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} suoritti tehtävän {todo} listasta {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Suoritit tehtävän {todo} listasta {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} avasi uudelleen tehtävän {todo} listassa {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Avasit uudelleen tehtävän {todo} listassa {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Kalenterin <strong>tehtävää</strong> on muokattu"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/fi.json b/apps/dav/l10n/fi.json
index 5398895b76f..363aa524c45 100644
--- a/apps/dav/l10n/fi.json
+++ b/apps/dav/l10n/fi.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalenteri",
-    "Todos" : "Tehtävät",
     "Personal" : "Henkilökohtainen",
     "{actor} created calendar {calendar}" : "{actor} loi kalenterin {calendar}",
     "You created calendar {calendar}" : "Loit kalenterin {calendar}",
@@ -31,20 +30,9 @@
     "{actor} updated event {event} in calendar {calendar}" : "{actor} päivitti tapahtuman {event} kalenteriin {calendar}",
     "You updated event {event} in calendar {calendar}" : "Päivitit tapahtuman {event} kalenteriin {calendar}",
     "Busy" : "Varattu",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} loi tehtävän {todo} listaan {calendar}",
-    "You created todo {todo} in list {calendar}" : "Loit tehtävän {todo} listaan {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} poisti tehtävän {todo} listasta {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Poistit tehtävän {todo} listasta {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} päivitti tehtävän {todo} listassa {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Päivitit tehtävän {todo} listassa {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} suoritti tehtävän {todo} listasta {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Suoritit tehtävän {todo} listasta {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} avasi uudelleen tehtävän {todo} listassa {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Avasit uudelleen tehtävän {todo} listassa {calendar}",
     "Calendar, contacts and tasks" : "Kalenteri, yhteystiedot ja tehtävät",
     "A <strong>calendar</strong> was modified" : "<strong>Kalenteria</strong> on muokattu",
     "A calendar <strong>event</strong> was modified" : "Kalenterin <strong>tapahtumaa</strong> on muokattu",
-    "A calendar <strong>todo</strong> was modified" : "Kalenterin <strong>tehtävää</strong> on muokattu",
     "Contact birthdays" : "Yhteystietojen syntymäpäivät",
     "Death of %s" : "%s kuolema",
     "Calendar:" : "Kalenteri:",
@@ -138,6 +126,18 @@
     "Tentative" : "Alustava",
     "Number of guests" : "Vieraiden määrä",
     "Comment" : "Kommentti",
-    "Your attendance was updated successfully." : "Osallistumisesi päivitettiin onnistuneesti."
+    "Your attendance was updated successfully." : "Osallistumisesi päivitettiin onnistuneesti.",
+    "Todos" : "Tehtävät",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} loi tehtävän {todo} listaan {calendar}",
+    "You created todo {todo} in list {calendar}" : "Loit tehtävän {todo} listaan {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} poisti tehtävän {todo} listasta {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Poistit tehtävän {todo} listasta {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} päivitti tehtävän {todo} listassa {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Päivitit tehtävän {todo} listassa {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} suoritti tehtävän {todo} listasta {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Suoritit tehtävän {todo} listasta {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} avasi uudelleen tehtävän {todo} listassa {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Avasit uudelleen tehtävän {todo} listassa {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Kalenterin <strong>tehtävää</strong> on muokattu"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/fr.js b/apps/dav/l10n/fr.js
index 3d9caf69ef0..95b8395b659 100644
--- a/apps/dav/l10n/fr.js
+++ b/apps/dav/l10n/fr.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Agenda",
-    "Todos" : "Tâches",
     "Personal" : "Personnel",
     "{actor} created calendar {calendar}" : "{actor} a créé l'agenda {calendar}",
     "You created calendar {calendar}" : "Vous avez créé l'agenda {calendar}",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} a restauré l'événement {event} dans l'agenda {calendar}",
     "You restored event {event} of calendar {calendar}" : "Vous avez restauré l'événement {event} dans l'agenda {calendar}",
     "Busy" : "Occupé",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} a créé la tâche {todo} dans la liste {calendar}",
-    "You created todo {todo} in list {calendar}" : "Vous avez créé la tâche {todo} dans la liste {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} a supprimé la tâche {todo} de la liste {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Vous avez supprimé la tâche {todo} de la liste {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} a mis à jour la tâche {todo} dans la liste {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Vous avez mis à jour la tâche {todo} dans la liste {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} a terminé la tâche {todo} de la liste {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Vous avez terminé la tâche {todo} de la liste {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} a réouvert la tâche {todo} dans la liste {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Vous avez réouvert la tâche {todo} dans la liste {calendar}",
     "Calendar, contacts and tasks" : "Agenda, contacts et tâches",
     "A <strong>calendar</strong> was modified" : "Un <strong>agenda</strong> a été modifié",
     "A calendar <strong>event</strong> was modified" : "Un <strong>événement</strong> de l'agenda a été modifié",
-    "A calendar <strong>todo</strong> was modified" : "Une <strong>liste de tâches</strong> de l'agenda a été modifiée",
     "Contact birthdays" : "Anniversaires des contacts",
     "Death of %s" : "Mort de %s",
     "Calendar:" : "Agenda:",
@@ -173,6 +161,18 @@ OC.L10N.register(
     "Tentative" : "Provisoire",
     "Number of guests" : "Nombre d'invités",
     "Comment" : "Commentaire",
-    "Your attendance was updated successfully." : "Votre présence a été mise à jour avec succès."
+    "Your attendance was updated successfully." : "Votre présence a été mise à jour avec succès.",
+    "Todos" : "Tâches",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} a créé la tâche {todo} dans la liste {calendar}",
+    "You created todo {todo} in list {calendar}" : "Vous avez créé la tâche {todo} dans la liste {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} a supprimé la tâche {todo} de la liste {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Vous avez supprimé la tâche {todo} de la liste {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} a mis à jour la tâche {todo} dans la liste {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Vous avez mis à jour la tâche {todo} dans la liste {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} a terminé la tâche {todo} de la liste {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vous avez terminé la tâche {todo} de la liste {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} a réouvert la tâche {todo} dans la liste {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Vous avez réouvert la tâche {todo} dans la liste {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Une <strong>liste de tâches</strong> de l'agenda a été modifiée"
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/dav/l10n/fr.json b/apps/dav/l10n/fr.json
index 7134ea75384..b52b5d11d3e 100644
--- a/apps/dav/l10n/fr.json
+++ b/apps/dav/l10n/fr.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Agenda",
-    "Todos" : "Tâches",
     "Personal" : "Personnel",
     "{actor} created calendar {calendar}" : "{actor} a créé l'agenda {calendar}",
     "You created calendar {calendar}" : "Vous avez créé l'agenda {calendar}",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} a restauré l'événement {event} dans l'agenda {calendar}",
     "You restored event {event} of calendar {calendar}" : "Vous avez restauré l'événement {event} dans l'agenda {calendar}",
     "Busy" : "Occupé",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} a créé la tâche {todo} dans la liste {calendar}",
-    "You created todo {todo} in list {calendar}" : "Vous avez créé la tâche {todo} dans la liste {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} a supprimé la tâche {todo} de la liste {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Vous avez supprimé la tâche {todo} de la liste {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} a mis à jour la tâche {todo} dans la liste {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Vous avez mis à jour la tâche {todo} dans la liste {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} a terminé la tâche {todo} de la liste {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Vous avez terminé la tâche {todo} de la liste {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} a réouvert la tâche {todo} dans la liste {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Vous avez réouvert la tâche {todo} dans la liste {calendar}",
     "Calendar, contacts and tasks" : "Agenda, contacts et tâches",
     "A <strong>calendar</strong> was modified" : "Un <strong>agenda</strong> a été modifié",
     "A calendar <strong>event</strong> was modified" : "Un <strong>événement</strong> de l'agenda a été modifié",
-    "A calendar <strong>todo</strong> was modified" : "Une <strong>liste de tâches</strong> de l'agenda a été modifiée",
     "Contact birthdays" : "Anniversaires des contacts",
     "Death of %s" : "Mort de %s",
     "Calendar:" : "Agenda:",
@@ -171,6 +159,18 @@
     "Tentative" : "Provisoire",
     "Number of guests" : "Nombre d'invités",
     "Comment" : "Commentaire",
-    "Your attendance was updated successfully." : "Votre présence a été mise à jour avec succès."
+    "Your attendance was updated successfully." : "Votre présence a été mise à jour avec succès.",
+    "Todos" : "Tâches",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} a créé la tâche {todo} dans la liste {calendar}",
+    "You created todo {todo} in list {calendar}" : "Vous avez créé la tâche {todo} dans la liste {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} a supprimé la tâche {todo} de la liste {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Vous avez supprimé la tâche {todo} de la liste {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} a mis à jour la tâche {todo} dans la liste {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Vous avez mis à jour la tâche {todo} dans la liste {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} a terminé la tâche {todo} de la liste {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vous avez terminé la tâche {todo} de la liste {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} a réouvert la tâche {todo} dans la liste {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Vous avez réouvert la tâche {todo} dans la liste {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Une <strong>liste de tâches</strong> de l'agenda a été modifiée"
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/gl.js b/apps/dav/l10n/gl.js
index cdc03edca59..6159f311993 100644
--- a/apps/dav/l10n/gl.js
+++ b/apps/dav/l10n/gl.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Calendario",
-    "Todos" : "Asuntos pendentes",
     "Personal" : "Persoal",
     "{actor} created calendar {calendar}" : "{actor} creou o calendario {calendar}",
     "You created calendar {calendar}" : "Vostede creou o calendario {calendar}",
@@ -31,19 +30,8 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizou o evento {event} no calendario {calendar}",
     "You updated event {event} in calendar {calendar}" : "Vostede actualizou o evento {event} no calendario {calendar}",
     "Busy" : "Ocupado",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} creou os asuntos pendentes {todo} na lista {calendar}",
-    "You created todo {todo} in list {calendar}" : "Vostede creou os asuntos pendentes {todo} na lista {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eliminou os asuntos pendentes {todo} da lista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Vostede eliminou os asuntos pendentes {todo} da lista {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizou os asuntos pendentes {todo} na lista {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Vostede actualizou os asuntos pendentes {todo} na lista {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} resolveu os asuntos pendentes {todo} na lista {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Vostede resolveu os asuntos pendentes {todo} na lista {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} volveu abrir os asuntos pendentes {todo} na lista {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Vostede volveu abrir os asuntos pendentes {todo} na lista {calendar}",
     "A <strong>calendar</strong> was modified" : "Foi modificado un <strong>calendario</strong>",
     "A calendar <strong>event</strong> was modified" : "Foi modificado un <strong>evento</strong> do calendario",
-    "A calendar <strong>todo</strong> was modified" : "Foi modificado un <strong>asunto pendente</strong> do calendario",
     "Contact birthdays" : "Aniversario do contacto",
     "Death of %s" : "Falecemento de %s",
     "Calendar:" : "Calendario:",
@@ -113,6 +101,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Acepta vostede o convite?",
     "Tentative" : "Tentativa",
     "Comment" : "Comentario",
-    "Your attendance was updated successfully." : "A súa asistencia foi actualizada satisfactoriamente."
+    "Your attendance was updated successfully." : "A súa asistencia foi actualizada satisfactoriamente.",
+    "Todos" : "Asuntos pendentes",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} creou os asuntos pendentes {todo} na lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Vostede creou os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eliminou os asuntos pendentes {todo} da lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Vostede eliminou os asuntos pendentes {todo} da lista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizou os asuntos pendentes {todo} na lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Vostede actualizou os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} resolveu os asuntos pendentes {todo} na lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vostede resolveu os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} volveu abrir os asuntos pendentes {todo} na lista {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Vostede volveu abrir os asuntos pendentes {todo} na lista {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Foi modificado un <strong>asunto pendente</strong> do calendario"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/gl.json b/apps/dav/l10n/gl.json
index f00a9f4e7ae..bb11ce4a5d6 100644
--- a/apps/dav/l10n/gl.json
+++ b/apps/dav/l10n/gl.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Calendario",
-    "Todos" : "Asuntos pendentes",
     "Personal" : "Persoal",
     "{actor} created calendar {calendar}" : "{actor} creou o calendario {calendar}",
     "You created calendar {calendar}" : "Vostede creou o calendario {calendar}",
@@ -29,19 +28,8 @@
     "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizou o evento {event} no calendario {calendar}",
     "You updated event {event} in calendar {calendar}" : "Vostede actualizou o evento {event} no calendario {calendar}",
     "Busy" : "Ocupado",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} creou os asuntos pendentes {todo} na lista {calendar}",
-    "You created todo {todo} in list {calendar}" : "Vostede creou os asuntos pendentes {todo} na lista {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eliminou os asuntos pendentes {todo} da lista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Vostede eliminou os asuntos pendentes {todo} da lista {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizou os asuntos pendentes {todo} na lista {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Vostede actualizou os asuntos pendentes {todo} na lista {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} resolveu os asuntos pendentes {todo} na lista {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Vostede resolveu os asuntos pendentes {todo} na lista {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} volveu abrir os asuntos pendentes {todo} na lista {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Vostede volveu abrir os asuntos pendentes {todo} na lista {calendar}",
     "A <strong>calendar</strong> was modified" : "Foi modificado un <strong>calendario</strong>",
     "A calendar <strong>event</strong> was modified" : "Foi modificado un <strong>evento</strong> do calendario",
-    "A calendar <strong>todo</strong> was modified" : "Foi modificado un <strong>asunto pendente</strong> do calendario",
     "Contact birthdays" : "Aniversario do contacto",
     "Death of %s" : "Falecemento de %s",
     "Calendar:" : "Calendario:",
@@ -111,6 +99,18 @@
     "Are you accepting the invitation?" : "Acepta vostede o convite?",
     "Tentative" : "Tentativa",
     "Comment" : "Comentario",
-    "Your attendance was updated successfully." : "A súa asistencia foi actualizada satisfactoriamente."
+    "Your attendance was updated successfully." : "A súa asistencia foi actualizada satisfactoriamente.",
+    "Todos" : "Asuntos pendentes",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} creou os asuntos pendentes {todo} na lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Vostede creou os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eliminou os asuntos pendentes {todo} da lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Vostede eliminou os asuntos pendentes {todo} da lista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizou os asuntos pendentes {todo} na lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Vostede actualizou os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} resolveu os asuntos pendentes {todo} na lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vostede resolveu os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} volveu abrir os asuntos pendentes {todo} na lista {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Vostede volveu abrir os asuntos pendentes {todo} na lista {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Foi modificado un <strong>asunto pendente</strong> do calendario"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/he.js b/apps/dav/l10n/he.js
index 1e15402036f..00b31765b85 100644
--- a/apps/dav/l10n/he.js
+++ b/apps/dav/l10n/he.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "יומן",
-    "Todos" : "משימות מטלות",
     "Personal" : "אישי",
     "{actor} created calendar {calendar}" : "היומן {calendar} נוצר על ידי {actor}",
     "You created calendar {calendar}" : "מחקת את היומן {calendar}",
@@ -31,19 +30,8 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "האירוע {event} עודכן בלוח השנה {calendar} על ידי {actor}",
     "You updated event {event} in calendar {calendar}" : "עדכנת את האירוע {event} בלוח השנה {calendar}",
     "Busy" : "עסוק",
-    "{actor} created todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נוצרה על ידי {actor}",
-    "You created todo {todo} in list {calendar}" : "יצרת את המשימה לביצוע {todo} ברשימה {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "המשימה לביצוע {todo} מהרשימה {calendar} נמחקה על ידי {actor}",
-    "You deleted todo {todo} from list {calendar}" : "מחקת את המשימה לביצוע {todo} מהרשימה {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} עודכנה על ידי {actor}",
-    "You updated todo {todo} in list {calendar}" : "עדכנת את המשימה לביצוע {todo} ברשימה {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נפתרה על ידי {actor}",
-    "You solved todo {todo} in list {calendar}" : "פתרת משימה לביצוע {todo} ברשימה {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נפתחה מחדש על ידי {actor}",
-    "You reopened todo {todo} in list {calendar}" : "פתחת מחדש את המשימה לביצוע {todo} ברשימה {calendar}",
     "A <strong>calendar</strong> was modified" : " <strong>יומן</strong> נערך",
     "A calendar <strong>event</strong> was modified" : "<strong>אירוע</strong> ביומן נערך",
-    "A calendar <strong>todo</strong> was modified" : "נערכה <strong>מטלה</strong> בלוח שנה",
     "Contact birthdays" : "ימי הולדת של אנשי קשר",
     "Death of %s" : "הפטירה של %s",
     "Calendar:" : "לוח שנה:",
@@ -111,6 +99,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "האם להיענות להזמנה?",
     "Tentative" : "טנטטיבית",
     "Comment" : "הערה",
-    "Your attendance was updated successfully." : "ההשתתפות שלך עודכנה בהצלחה."
+    "Your attendance was updated successfully." : "ההשתתפות שלך עודכנה בהצלחה.",
+    "Todos" : "משימות מטלות",
+    "{actor} created todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נוצרה על ידי {actor}",
+    "You created todo {todo} in list {calendar}" : "יצרת את המשימה לביצוע {todo} ברשימה {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "המשימה לביצוע {todo} מהרשימה {calendar} נמחקה על ידי {actor}",
+    "You deleted todo {todo} from list {calendar}" : "מחקת את המשימה לביצוע {todo} מהרשימה {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} עודכנה על ידי {actor}",
+    "You updated todo {todo} in list {calendar}" : "עדכנת את המשימה לביצוע {todo} ברשימה {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נפתרה על ידי {actor}",
+    "You solved todo {todo} in list {calendar}" : "פתרת משימה לביצוע {todo} ברשימה {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נפתחה מחדש על ידי {actor}",
+    "You reopened todo {todo} in list {calendar}" : "פתחת מחדש את המשימה לביצוע {todo} ברשימה {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "נערכה <strong>מטלה</strong> בלוח שנה"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
diff --git a/apps/dav/l10n/he.json b/apps/dav/l10n/he.json
index f344047fa78..46bd17eac40 100644
--- a/apps/dav/l10n/he.json
+++ b/apps/dav/l10n/he.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "יומן",
-    "Todos" : "משימות מטלות",
     "Personal" : "אישי",
     "{actor} created calendar {calendar}" : "היומן {calendar} נוצר על ידי {actor}",
     "You created calendar {calendar}" : "מחקת את היומן {calendar}",
@@ -29,19 +28,8 @@
     "{actor} updated event {event} in calendar {calendar}" : "האירוע {event} עודכן בלוח השנה {calendar} על ידי {actor}",
     "You updated event {event} in calendar {calendar}" : "עדכנת את האירוע {event} בלוח השנה {calendar}",
     "Busy" : "עסוק",
-    "{actor} created todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נוצרה על ידי {actor}",
-    "You created todo {todo} in list {calendar}" : "יצרת את המשימה לביצוע {todo} ברשימה {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "המשימה לביצוע {todo} מהרשימה {calendar} נמחקה על ידי {actor}",
-    "You deleted todo {todo} from list {calendar}" : "מחקת את המשימה לביצוע {todo} מהרשימה {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} עודכנה על ידי {actor}",
-    "You updated todo {todo} in list {calendar}" : "עדכנת את המשימה לביצוע {todo} ברשימה {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נפתרה על ידי {actor}",
-    "You solved todo {todo} in list {calendar}" : "פתרת משימה לביצוע {todo} ברשימה {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נפתחה מחדש על ידי {actor}",
-    "You reopened todo {todo} in list {calendar}" : "פתחת מחדש את המשימה לביצוע {todo} ברשימה {calendar}",
     "A <strong>calendar</strong> was modified" : " <strong>יומן</strong> נערך",
     "A calendar <strong>event</strong> was modified" : "<strong>אירוע</strong> ביומן נערך",
-    "A calendar <strong>todo</strong> was modified" : "נערכה <strong>מטלה</strong> בלוח שנה",
     "Contact birthdays" : "ימי הולדת של אנשי קשר",
     "Death of %s" : "הפטירה של %s",
     "Calendar:" : "לוח שנה:",
@@ -109,6 +97,18 @@
     "Are you accepting the invitation?" : "האם להיענות להזמנה?",
     "Tentative" : "טנטטיבית",
     "Comment" : "הערה",
-    "Your attendance was updated successfully." : "ההשתתפות שלך עודכנה בהצלחה."
+    "Your attendance was updated successfully." : "ההשתתפות שלך עודכנה בהצלחה.",
+    "Todos" : "משימות מטלות",
+    "{actor} created todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נוצרה על ידי {actor}",
+    "You created todo {todo} in list {calendar}" : "יצרת את המשימה לביצוע {todo} ברשימה {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "המשימה לביצוע {todo} מהרשימה {calendar} נמחקה על ידי {actor}",
+    "You deleted todo {todo} from list {calendar}" : "מחקת את המשימה לביצוע {todo} מהרשימה {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} עודכנה על ידי {actor}",
+    "You updated todo {todo} in list {calendar}" : "עדכנת את המשימה לביצוע {todo} ברשימה {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נפתרה על ידי {actor}",
+    "You solved todo {todo} in list {calendar}" : "פתרת משימה לביצוע {todo} ברשימה {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "המשימה לביצוע {todo} ברשימה {calendar} נפתחה מחדש על ידי {actor}",
+    "You reopened todo {todo} in list {calendar}" : "פתחת מחדש את המשימה לביצוע {todo} ברשימה {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "נערכה <strong>מטלה</strong> בלוח שנה"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/hr.js b/apps/dav/l10n/hr.js
index fcb376918ff..8a47e10ae50 100644
--- a/apps/dav/l10n/hr.js
+++ b/apps/dav/l10n/hr.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalendar",
-    "Todos" : "Zadaci",
     "Personal" : "Osobno",
     "{actor} created calendar {calendar}" : "{actor} je stvorio kalendar {calendar}",
     "You created calendar {calendar}" : "Stvorili ste kalendar {calendar}",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} je vratio događaj {event} kalendara {calendar}",
     "You restored event {event} of calendar {calendar}" : "Vratili ste događaj {event} kalendara {calendar}",
     "Busy" : "Zauzeto",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} je stvorio zadatak {todo} u popisu {calendar}",
-    "You created todo {todo} in list {calendar}" : "Stvorili ste zadatak {todo} u popisu {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} je izbrisao zadatak {todo} s popisa {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Izbrisali ste zadatak {todo} s popisa {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} je ažurirao zadatak {todo} u popisu {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Ažurirali ste zadatak {todo} u popisu {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} je izvršio zadatak {todo} u popisu {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Izvršili ste zadatak {todo} u popisu {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} je ponovno otvorio zadatak {todo} u popisu {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Ponovno ste otvorili zadatak {todo} u popisu {calendar}",
     "Calendar, contacts and tasks" : "Kalendar, kontakti i zadaci",
     "A <strong>calendar</strong> was modified" : "Izmijenjen je <strong>kalendar</strong>",
     "A calendar <strong>event</strong> was modified" : "Izmijenjen je <strong>događaj</strong> u kalendaru",
-    "A calendar <strong>todo</strong> was modified" : "Izmijenjen je <strong>zadatak</strong> u kalendaru",
     "Contact birthdays" : "Rođendani kontakata",
     "Death of %s" : "Smrt %s",
     "Calendar:" : "Kalendar:",
@@ -151,6 +139,18 @@ OC.L10N.register(
     "Tentative" : "Uvjetno",
     "Number of guests" : "Broj gostiju",
     "Comment" : "Komentar",
-    "Your attendance was updated successfully." : "Vaša je prisutnost uspješno ažurirana."
+    "Your attendance was updated successfully." : "Vaša je prisutnost uspješno ažurirana.",
+    "Todos" : "Zadaci",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} je stvorio zadatak {todo} u popisu {calendar}",
+    "You created todo {todo} in list {calendar}" : "Stvorili ste zadatak {todo} u popisu {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} je izbrisao zadatak {todo} s popisa {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Izbrisali ste zadatak {todo} s popisa {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} je ažurirao zadatak {todo} u popisu {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ažurirali ste zadatak {todo} u popisu {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} je izvršio zadatak {todo} u popisu {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Izvršili ste zadatak {todo} u popisu {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} je ponovno otvorio zadatak {todo} u popisu {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Ponovno ste otvorili zadatak {todo} u popisu {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Izmijenjen je <strong>zadatak</strong> u kalendaru"
 },
 "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/apps/dav/l10n/hr.json b/apps/dav/l10n/hr.json
index 0956dcb6afb..51da26b10bc 100644
--- a/apps/dav/l10n/hr.json
+++ b/apps/dav/l10n/hr.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalendar",
-    "Todos" : "Zadaci",
     "Personal" : "Osobno",
     "{actor} created calendar {calendar}" : "{actor} je stvorio kalendar {calendar}",
     "You created calendar {calendar}" : "Stvorili ste kalendar {calendar}",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} je vratio događaj {event} kalendara {calendar}",
     "You restored event {event} of calendar {calendar}" : "Vratili ste događaj {event} kalendara {calendar}",
     "Busy" : "Zauzeto",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} je stvorio zadatak {todo} u popisu {calendar}",
-    "You created todo {todo} in list {calendar}" : "Stvorili ste zadatak {todo} u popisu {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} je izbrisao zadatak {todo} s popisa {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Izbrisali ste zadatak {todo} s popisa {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} je ažurirao zadatak {todo} u popisu {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Ažurirali ste zadatak {todo} u popisu {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} je izvršio zadatak {todo} u popisu {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Izvršili ste zadatak {todo} u popisu {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} je ponovno otvorio zadatak {todo} u popisu {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Ponovno ste otvorili zadatak {todo} u popisu {calendar}",
     "Calendar, contacts and tasks" : "Kalendar, kontakti i zadaci",
     "A <strong>calendar</strong> was modified" : "Izmijenjen je <strong>kalendar</strong>",
     "A calendar <strong>event</strong> was modified" : "Izmijenjen je <strong>događaj</strong> u kalendaru",
-    "A calendar <strong>todo</strong> was modified" : "Izmijenjen je <strong>zadatak</strong> u kalendaru",
     "Contact birthdays" : "Rođendani kontakata",
     "Death of %s" : "Smrt %s",
     "Calendar:" : "Kalendar:",
@@ -149,6 +137,18 @@
     "Tentative" : "Uvjetno",
     "Number of guests" : "Broj gostiju",
     "Comment" : "Komentar",
-    "Your attendance was updated successfully." : "Vaša je prisutnost uspješno ažurirana."
+    "Your attendance was updated successfully." : "Vaša je prisutnost uspješno ažurirana.",
+    "Todos" : "Zadaci",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} je stvorio zadatak {todo} u popisu {calendar}",
+    "You created todo {todo} in list {calendar}" : "Stvorili ste zadatak {todo} u popisu {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} je izbrisao zadatak {todo} s popisa {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Izbrisali ste zadatak {todo} s popisa {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} je ažurirao zadatak {todo} u popisu {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ažurirali ste zadatak {todo} u popisu {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} je izvršio zadatak {todo} u popisu {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Izvršili ste zadatak {todo} u popisu {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} je ponovno otvorio zadatak {todo} u popisu {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Ponovno ste otvorili zadatak {todo} u popisu {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Izmijenjen je <strong>zadatak</strong> u kalendaru"
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/hu.js b/apps/dav/l10n/hu.js
index 2966e5327d8..8cfe3e1fadd 100644
--- a/apps/dav/l10n/hu.js
+++ b/apps/dav/l10n/hu.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Naptár",
-    "Todos" : "Teendők",
     "Personal" : "Személyes",
     "{actor} created calendar {calendar}" : "{actor} létrehozta a naptárt: {calendar}",
     "You created calendar {calendar}" : "Létrehozta a naptárt: {calendar}",
@@ -37,22 +36,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} helyreállította a(z) {calendar} naptár következő eseményét: {event}",
     "You restored event {event} of calendar {calendar}" : "Helyreállította a(z) {calendar} naptár következő eseményét: {event}",
     "Busy" : "Foglalt",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} létrehozta a(z) {todo} teendőt a következő listában: {calendar}",
-    "You created todo {todo} in list {calendar}" : "Létrehozta a(z) {todo} teendőt a következő listában: {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} törölte a(z) {todo} teendőt a következő listából: {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Törölte a(z) {todo} teendőt a következő listából: {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} frissítette a(z) {todo} teendőt a következő listában: {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Frissítette a(z) {todo} teendőt a következő listában: {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} elintézte a(z) {todo} teendőt a következő listában: {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Elintézte a(z) {todo} teendőt a következő listában: {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} újranyitotta a(z) {todo} teendőt a következő listában: {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Újranyitotta a(z) {todo} teendőt a következő listában: {calendar}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} áthelyezte a(z) {todo} teendőt a(z) {sourceCalendar} listából a(z) {targetCalendar} listába",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Áthelyezte a(z) {todo} teendőt a(z) {sourceCalendar} listából a(z) {targetCalendar} listába",
     "Calendar, contacts and tasks" : "Naptár, címjegyzék és feladatok",
     "A <strong>calendar</strong> was modified" : "Egy <strong>naptár</strong> megváltozott",
     "A calendar <strong>event</strong> was modified" : "Egy <strong>naptáresemény</strong> megváltozott",
-    "A calendar <strong>todo</strong> was modified" : "Egy <strong>naptárteendő</strong> megváltozott",
     "Contact birthdays" : "Névjegyek születésnapjai",
     "Death of %s" : "%s halála",
     "Calendar:" : "Naptár:",
@@ -181,6 +167,18 @@ OC.L10N.register(
     "Tentative" : "Feltételes",
     "Number of guests" : "Vendégek száma",
     "Comment" : "Megjegyzés",
-    "Your attendance was updated successfully." : "A részvétele frissítése sikeres."
+    "Your attendance was updated successfully." : "A részvétele frissítése sikeres.",
+    "Todos" : "Teendők",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} létrehozta a(z) {todo} teendőt a következő listában: {calendar}",
+    "You created todo {todo} in list {calendar}" : "Létrehozta a(z) {todo} teendőt a következő listában: {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} törölte a(z) {todo} teendőt a következő listából: {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Törölte a(z) {todo} teendőt a következő listából: {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} frissítette a(z) {todo} teendőt a következő listában: {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Frissítette a(z) {todo} teendőt a következő listában: {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} elintézte a(z) {todo} teendőt a következő listában: {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Elintézte a(z) {todo} teendőt a következő listában: {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} újranyitotta a(z) {todo} teendőt a következő listában: {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Újranyitotta a(z) {todo} teendőt a következő listában: {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Egy <strong>naptárteendő</strong> megváltozott"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/hu.json b/apps/dav/l10n/hu.json
index 98fada9e9c0..9dc28f2d4e8 100644
--- a/apps/dav/l10n/hu.json
+++ b/apps/dav/l10n/hu.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Naptár",
-    "Todos" : "Teendők",
     "Personal" : "Személyes",
     "{actor} created calendar {calendar}" : "{actor} létrehozta a naptárt: {calendar}",
     "You created calendar {calendar}" : "Létrehozta a naptárt: {calendar}",
@@ -35,22 +34,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} helyreállította a(z) {calendar} naptár következő eseményét: {event}",
     "You restored event {event} of calendar {calendar}" : "Helyreállította a(z) {calendar} naptár következő eseményét: {event}",
     "Busy" : "Foglalt",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} létrehozta a(z) {todo} teendőt a következő listában: {calendar}",
-    "You created todo {todo} in list {calendar}" : "Létrehozta a(z) {todo} teendőt a következő listában: {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} törölte a(z) {todo} teendőt a következő listából: {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Törölte a(z) {todo} teendőt a következő listából: {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} frissítette a(z) {todo} teendőt a következő listában: {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Frissítette a(z) {todo} teendőt a következő listában: {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} elintézte a(z) {todo} teendőt a következő listában: {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Elintézte a(z) {todo} teendőt a következő listában: {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} újranyitotta a(z) {todo} teendőt a következő listában: {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Újranyitotta a(z) {todo} teendőt a következő listában: {calendar}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} áthelyezte a(z) {todo} teendőt a(z) {sourceCalendar} listából a(z) {targetCalendar} listába",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Áthelyezte a(z) {todo} teendőt a(z) {sourceCalendar} listából a(z) {targetCalendar} listába",
     "Calendar, contacts and tasks" : "Naptár, címjegyzék és feladatok",
     "A <strong>calendar</strong> was modified" : "Egy <strong>naptár</strong> megváltozott",
     "A calendar <strong>event</strong> was modified" : "Egy <strong>naptáresemény</strong> megváltozott",
-    "A calendar <strong>todo</strong> was modified" : "Egy <strong>naptárteendő</strong> megváltozott",
     "Contact birthdays" : "Névjegyek születésnapjai",
     "Death of %s" : "%s halála",
     "Calendar:" : "Naptár:",
@@ -179,6 +165,18 @@
     "Tentative" : "Feltételes",
     "Number of guests" : "Vendégek száma",
     "Comment" : "Megjegyzés",
-    "Your attendance was updated successfully." : "A részvétele frissítése sikeres."
+    "Your attendance was updated successfully." : "A részvétele frissítése sikeres.",
+    "Todos" : "Teendők",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} létrehozta a(z) {todo} teendőt a következő listában: {calendar}",
+    "You created todo {todo} in list {calendar}" : "Létrehozta a(z) {todo} teendőt a következő listában: {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} törölte a(z) {todo} teendőt a következő listából: {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Törölte a(z) {todo} teendőt a következő listából: {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} frissítette a(z) {todo} teendőt a következő listában: {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Frissítette a(z) {todo} teendőt a következő listában: {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} elintézte a(z) {todo} teendőt a következő listában: {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Elintézte a(z) {todo} teendőt a következő listában: {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} újranyitotta a(z) {todo} teendőt a következő listában: {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Újranyitotta a(z) {todo} teendőt a következő listában: {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Egy <strong>naptárteendő</strong> megváltozott"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/is.js b/apps/dav/l10n/is.js
index 6e03824ae14..9d16ae97f91 100644
--- a/apps/dav/l10n/is.js
+++ b/apps/dav/l10n/is.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Dagatal",
-    "Todos" : "Verkþættir",
     "Personal" : "Einka",
     "{actor} created calendar {calendar}" : "{actor} bjó til dagatalið {calendar}",
     "You created calendar {calendar}" : "Þú bjóst til dagatalið {calendar}",
@@ -31,19 +30,8 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "{actor} uppfærði atburðinn {event} í dagatalinu {calendar}",
     "You updated event {event} in calendar {calendar}" : "Þú uppfærðir atburðinn {event} í dagatalinu {calendar}",
     "Busy" : "Upptekið",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} bjó til verkefnið {todo} á listanum {calendar}",
-    "You created todo {todo} in list {calendar}" : "Þú bjóst til verkefnið {todo} á listanum {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eyddi verkefninu {todo} af listanum {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Þú eyddir verkefninu {todo} af listanum {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} uppfærði verkefnið {todo} á listanum {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Þú uppfærðir verkefnið {todo} á listanum {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} leysti verkefnið {todo} á listanum {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Þú leystir verkefnið {todo} á listanum {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} opnaði aftur verkefnið {todo} á listanum {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Þú opnaðir aftur verkefnið {todo} á listanum {calendar}",
     "A <strong>calendar</strong> was modified" : "<strong>Dagatali</strong> var breytt",
     "A calendar <strong>event</strong> was modified" : "<strong>Atburði</strong> dagatals var breytt",
-    "A calendar <strong>todo</strong> was modified" : "<strong>Verkefnalista</strong> dagatals var breytt",
     "Contact birthdays" : "Afmælisdagar tengiliðar",
     "Calendar:" : "Dagatal:",
     "Date:" : "Dagsetning:",
@@ -98,6 +86,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Ætlar þú að samþykkja boðið?",
     "Tentative" : "Bráðabirgða",
     "Comment" : "Athugasemd",
-    "Your attendance was updated successfully." : "Mætingarstaða þín var uppfærð."
+    "Your attendance was updated successfully." : "Mætingarstaða þín var uppfærð.",
+    "Todos" : "Verkþættir",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} bjó til verkefnið {todo} á listanum {calendar}",
+    "You created todo {todo} in list {calendar}" : "Þú bjóst til verkefnið {todo} á listanum {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eyddi verkefninu {todo} af listanum {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Þú eyddir verkefninu {todo} af listanum {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} uppfærði verkefnið {todo} á listanum {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Þú uppfærðir verkefnið {todo} á listanum {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} leysti verkefnið {todo} á listanum {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Þú leystir verkefnið {todo} á listanum {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} opnaði aftur verkefnið {todo} á listanum {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Þú opnaðir aftur verkefnið {todo} á listanum {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "<strong>Verkefnalista</strong> dagatals var breytt"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/dav/l10n/is.json b/apps/dav/l10n/is.json
index d7b6bda37f6..29ba35dc18c 100644
--- a/apps/dav/l10n/is.json
+++ b/apps/dav/l10n/is.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Dagatal",
-    "Todos" : "Verkþættir",
     "Personal" : "Einka",
     "{actor} created calendar {calendar}" : "{actor} bjó til dagatalið {calendar}",
     "You created calendar {calendar}" : "Þú bjóst til dagatalið {calendar}",
@@ -29,19 +28,8 @@
     "{actor} updated event {event} in calendar {calendar}" : "{actor} uppfærði atburðinn {event} í dagatalinu {calendar}",
     "You updated event {event} in calendar {calendar}" : "Þú uppfærðir atburðinn {event} í dagatalinu {calendar}",
     "Busy" : "Upptekið",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} bjó til verkefnið {todo} á listanum {calendar}",
-    "You created todo {todo} in list {calendar}" : "Þú bjóst til verkefnið {todo} á listanum {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eyddi verkefninu {todo} af listanum {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Þú eyddir verkefninu {todo} af listanum {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} uppfærði verkefnið {todo} á listanum {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Þú uppfærðir verkefnið {todo} á listanum {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} leysti verkefnið {todo} á listanum {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Þú leystir verkefnið {todo} á listanum {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} opnaði aftur verkefnið {todo} á listanum {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Þú opnaðir aftur verkefnið {todo} á listanum {calendar}",
     "A <strong>calendar</strong> was modified" : "<strong>Dagatali</strong> var breytt",
     "A calendar <strong>event</strong> was modified" : "<strong>Atburði</strong> dagatals var breytt",
-    "A calendar <strong>todo</strong> was modified" : "<strong>Verkefnalista</strong> dagatals var breytt",
     "Contact birthdays" : "Afmælisdagar tengiliðar",
     "Calendar:" : "Dagatal:",
     "Date:" : "Dagsetning:",
@@ -96,6 +84,18 @@
     "Are you accepting the invitation?" : "Ætlar þú að samþykkja boðið?",
     "Tentative" : "Bráðabirgða",
     "Comment" : "Athugasemd",
-    "Your attendance was updated successfully." : "Mætingarstaða þín var uppfærð."
+    "Your attendance was updated successfully." : "Mætingarstaða þín var uppfærð.",
+    "Todos" : "Verkþættir",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} bjó til verkefnið {todo} á listanum {calendar}",
+    "You created todo {todo} in list {calendar}" : "Þú bjóst til verkefnið {todo} á listanum {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eyddi verkefninu {todo} af listanum {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Þú eyddir verkefninu {todo} af listanum {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} uppfærði verkefnið {todo} á listanum {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Þú uppfærðir verkefnið {todo} á listanum {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} leysti verkefnið {todo} á listanum {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Þú leystir verkefnið {todo} á listanum {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} opnaði aftur verkefnið {todo} á listanum {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Þú opnaðir aftur verkefnið {todo} á listanum {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "<strong>Verkefnalista</strong> dagatals var breytt"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/it.js b/apps/dav/l10n/it.js
index 1d90a506fe8..bdc929df478 100644
--- a/apps/dav/l10n/it.js
+++ b/apps/dav/l10n/it.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Calendario",
-    "Todos" : "Cose da fare",
     "Personal" : "Personale",
     "{actor} created calendar {calendar}" : "{actor} ha creato il calendario {calendar}",
     "You created calendar {calendar}" : "Hai creato il calendario {calendar}",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} ha ripristinato l'evento {event} del calendario {calendar}",
     "You restored event {event} of calendar {calendar}" : "Hai ripristinato l'evento {event} del calendario {calendar}",
     "Busy" : "Occupato",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} ha creato la cosa da fare {todo} nell'elenco {calendar}",
-    "You created todo {todo} in list {calendar}" : "Hai creato la cosa da fare {todo} nell'elenco {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha eliminato la cosa da fare {todo} dall'elenco {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Hai eliminato la cosa da fare {todo} dall'elenco {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} ha aggiornato la cosa da fare {todo} nell'elenco {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Hai aggiornato la cosa da fare {todo} nell'elenco {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} ha risolto la cosa da fare {todo} nell'elenco {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Hai risolto la cosa da fare {todo} nell'elenco {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ha riaperto la cosa da fare {todo} nell'elenco {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Hai riaperto la cosa da fare {todo} nell'elenco {calendar}",
     "Calendar, contacts and tasks" : "Calendario, contatti e attività",
     "A <strong>calendar</strong> was modified" : "Un <strong>calendario</strong> è stato modificato",
     "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> del calendario è stato modificato",
-    "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa da fare</strong> del calendario è stata modificata",
     "Contact birthdays" : "Date di nascita dei contatti",
     "Death of %s" : "Morte di %s",
     "Calendar:" : "Calendario:",
@@ -171,6 +159,18 @@ OC.L10N.register(
     "Tentative" : "Provvisorio",
     "Number of guests" : "Numero di ospiti",
     "Comment" : "Commento",
-    "Your attendance was updated successfully." : "La tua partecipazione è stata aggiornata correttamente."
+    "Your attendance was updated successfully." : "La tua partecipazione è stata aggiornata correttamente.",
+    "Todos" : "Cose da fare",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} ha creato la cosa da fare {todo} nell'elenco {calendar}",
+    "You created todo {todo} in list {calendar}" : "Hai creato la cosa da fare {todo} nell'elenco {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha eliminato la cosa da fare {todo} dall'elenco {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Hai eliminato la cosa da fare {todo} dall'elenco {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ha aggiornato la cosa da fare {todo} nell'elenco {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Hai aggiornato la cosa da fare {todo} nell'elenco {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} ha risolto la cosa da fare {todo} nell'elenco {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Hai risolto la cosa da fare {todo} nell'elenco {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ha riaperto la cosa da fare {todo} nell'elenco {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Hai riaperto la cosa da fare {todo} nell'elenco {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa da fare</strong> del calendario è stata modificata"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/dav/l10n/it.json b/apps/dav/l10n/it.json
index 5bbdb84d88f..c1d27701463 100644
--- a/apps/dav/l10n/it.json
+++ b/apps/dav/l10n/it.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Calendario",
-    "Todos" : "Cose da fare",
     "Personal" : "Personale",
     "{actor} created calendar {calendar}" : "{actor} ha creato il calendario {calendar}",
     "You created calendar {calendar}" : "Hai creato il calendario {calendar}",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} ha ripristinato l'evento {event} del calendario {calendar}",
     "You restored event {event} of calendar {calendar}" : "Hai ripristinato l'evento {event} del calendario {calendar}",
     "Busy" : "Occupato",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} ha creato la cosa da fare {todo} nell'elenco {calendar}",
-    "You created todo {todo} in list {calendar}" : "Hai creato la cosa da fare {todo} nell'elenco {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha eliminato la cosa da fare {todo} dall'elenco {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Hai eliminato la cosa da fare {todo} dall'elenco {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} ha aggiornato la cosa da fare {todo} nell'elenco {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Hai aggiornato la cosa da fare {todo} nell'elenco {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} ha risolto la cosa da fare {todo} nell'elenco {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Hai risolto la cosa da fare {todo} nell'elenco {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ha riaperto la cosa da fare {todo} nell'elenco {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Hai riaperto la cosa da fare {todo} nell'elenco {calendar}",
     "Calendar, contacts and tasks" : "Calendario, contatti e attività",
     "A <strong>calendar</strong> was modified" : "Un <strong>calendario</strong> è stato modificato",
     "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> del calendario è stato modificato",
-    "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa da fare</strong> del calendario è stata modificata",
     "Contact birthdays" : "Date di nascita dei contatti",
     "Death of %s" : "Morte di %s",
     "Calendar:" : "Calendario:",
@@ -169,6 +157,18 @@
     "Tentative" : "Provvisorio",
     "Number of guests" : "Numero di ospiti",
     "Comment" : "Commento",
-    "Your attendance was updated successfully." : "La tua partecipazione è stata aggiornata correttamente."
+    "Your attendance was updated successfully." : "La tua partecipazione è stata aggiornata correttamente.",
+    "Todos" : "Cose da fare",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} ha creato la cosa da fare {todo} nell'elenco {calendar}",
+    "You created todo {todo} in list {calendar}" : "Hai creato la cosa da fare {todo} nell'elenco {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha eliminato la cosa da fare {todo} dall'elenco {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Hai eliminato la cosa da fare {todo} dall'elenco {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ha aggiornato la cosa da fare {todo} nell'elenco {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Hai aggiornato la cosa da fare {todo} nell'elenco {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} ha risolto la cosa da fare {todo} nell'elenco {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Hai risolto la cosa da fare {todo} nell'elenco {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ha riaperto la cosa da fare {todo} nell'elenco {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Hai riaperto la cosa da fare {todo} nell'elenco {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa da fare</strong> del calendario è stata modificata"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/ja.js b/apps/dav/l10n/ja.js
index c9dc9b8fbd3..a9cbf7e6b94 100644
--- a/apps/dav/l10n/ja.js
+++ b/apps/dav/l10n/ja.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "カレンダー",
-    "Todos" : "ToDo",
     "Personal" : "個人",
     "{actor} created calendar {calendar}" : "{actor}はカレンダー {calendar} を作成しました",
     "You created calendar {calendar}" : "カレンダー {calendar} を作成しました",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor}はカレンダー {calendar}のイベント {event}を復元しました",
     "You restored event {event} of calendar {calendar}" : "カレンダー {calendar} のイベント {event}を復元しました",
     "Busy" : "ビジー",
-    "{actor} created todo {todo} in list {calendar}" : "{actor}はリスト{calendar}のtodo {todo}を作成しました",
-    "You created todo {todo} in list {calendar}" : "リスト {calendar} にtodo {todo} を作成しました",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor}リスト{カレンダー}からtodo {todo}を削除しました",
-    "You deleted todo {todo} from list {calendar}" : "あなたはtodo {todo}を{calendar}のリストから削除しました。",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor}リスト{calendar}のtodo {todo}を更新しました",
-    "You updated todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を更新しました。",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor}リスト{calendar}のtodo {todo}を解決しました",
-    "You solved todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を解決しました。",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor}リスト{calendar}のToDo {todo}を再開しました",
-    "You reopened todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を再開しました",
     "Calendar, contacts and tasks" : "カレンダー、連絡帳とタスク",
     "A <strong>calendar</strong> was modified" : "<strong>カレンダー</strong>が変更されたとき",
     "A calendar <strong>event</strong> was modified" : "カレンダーの<strong>イベント</strong>が変更されたとき",
-    "A calendar <strong>todo</strong> was modified" : "カレンダーの<strong>ToDo</strong>が変更されたとき",
     "Contact birthdays" : "誕生日",
     "Death of %s" : "%sの命日",
     "Calendar:" : "カレンダー:",
@@ -177,6 +165,18 @@ OC.L10N.register(
     "Tentative" : "暫定的",
     "Number of guests" : "ゲスト数",
     "Comment" : "コメント",
-    "Your attendance was updated successfully." : "出席は正常に更新されました。"
+    "Your attendance was updated successfully." : "出席は正常に更新されました。",
+    "Todos" : "ToDo",
+    "{actor} created todo {todo} in list {calendar}" : "{actor}はリスト{calendar}のtodo {todo}を作成しました",
+    "You created todo {todo} in list {calendar}" : "リスト {calendar} にtodo {todo} を作成しました",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor}リスト{カレンダー}からtodo {todo}を削除しました",
+    "You deleted todo {todo} from list {calendar}" : "あなたはtodo {todo}を{calendar}のリストから削除しました。",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor}リスト{calendar}のtodo {todo}を更新しました",
+    "You updated todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を更新しました。",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor}リスト{calendar}のtodo {todo}を解決しました",
+    "You solved todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を解決しました。",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor}リスト{calendar}のToDo {todo}を再開しました",
+    "You reopened todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を再開しました",
+    "A calendar <strong>todo</strong> was modified" : "カレンダーの<strong>ToDo</strong>が変更されたとき"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/dav/l10n/ja.json b/apps/dav/l10n/ja.json
index 010eff1a1cc..e5ec8aeb504 100644
--- a/apps/dav/l10n/ja.json
+++ b/apps/dav/l10n/ja.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "カレンダー",
-    "Todos" : "ToDo",
     "Personal" : "個人",
     "{actor} created calendar {calendar}" : "{actor}はカレンダー {calendar} を作成しました",
     "You created calendar {calendar}" : "カレンダー {calendar} を作成しました",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor}はカレンダー {calendar}のイベント {event}を復元しました",
     "You restored event {event} of calendar {calendar}" : "カレンダー {calendar} のイベント {event}を復元しました",
     "Busy" : "ビジー",
-    "{actor} created todo {todo} in list {calendar}" : "{actor}はリスト{calendar}のtodo {todo}を作成しました",
-    "You created todo {todo} in list {calendar}" : "リスト {calendar} にtodo {todo} を作成しました",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor}リスト{カレンダー}からtodo {todo}を削除しました",
-    "You deleted todo {todo} from list {calendar}" : "あなたはtodo {todo}を{calendar}のリストから削除しました。",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor}リスト{calendar}のtodo {todo}を更新しました",
-    "You updated todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を更新しました。",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor}リスト{calendar}のtodo {todo}を解決しました",
-    "You solved todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を解決しました。",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor}リスト{calendar}のToDo {todo}を再開しました",
-    "You reopened todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を再開しました",
     "Calendar, contacts and tasks" : "カレンダー、連絡帳とタスク",
     "A <strong>calendar</strong> was modified" : "<strong>カレンダー</strong>が変更されたとき",
     "A calendar <strong>event</strong> was modified" : "カレンダーの<strong>イベント</strong>が変更されたとき",
-    "A calendar <strong>todo</strong> was modified" : "カレンダーの<strong>ToDo</strong>が変更されたとき",
     "Contact birthdays" : "誕生日",
     "Death of %s" : "%sの命日",
     "Calendar:" : "カレンダー:",
@@ -175,6 +163,18 @@
     "Tentative" : "暫定的",
     "Number of guests" : "ゲスト数",
     "Comment" : "コメント",
-    "Your attendance was updated successfully." : "出席は正常に更新されました。"
+    "Your attendance was updated successfully." : "出席は正常に更新されました。",
+    "Todos" : "ToDo",
+    "{actor} created todo {todo} in list {calendar}" : "{actor}はリスト{calendar}のtodo {todo}を作成しました",
+    "You created todo {todo} in list {calendar}" : "リスト {calendar} にtodo {todo} を作成しました",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor}リスト{カレンダー}からtodo {todo}を削除しました",
+    "You deleted todo {todo} from list {calendar}" : "あなたはtodo {todo}を{calendar}のリストから削除しました。",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor}リスト{calendar}のtodo {todo}を更新しました",
+    "You updated todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を更新しました。",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor}リスト{calendar}のtodo {todo}を解決しました",
+    "You solved todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を解決しました。",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor}リスト{calendar}のToDo {todo}を再開しました",
+    "You reopened todo {todo} in list {calendar}" : "リスト{calendar}のtodo {todo}を再開しました",
+    "A calendar <strong>todo</strong> was modified" : "カレンダーの<strong>ToDo</strong>が変更されたとき"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/ko.js b/apps/dav/l10n/ko.js
index 9bb56bd1782..2e844e8248f 100644
--- a/apps/dav/l10n/ko.js
+++ b/apps/dav/l10n/ko.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "달력",
-    "Todos" : "할 일",
     "Personal" : "개인",
     "{actor} created calendar {calendar}" : "{actor} 님이 달력 {calendar}을(를) 생성함",
     "You created calendar {calendar}" : "달력 {calendar}을(를) 생성함",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} 님이 행사 {event}을(를) 달력 {calendar}에 복구함",
     "You restored event {event} of calendar {calendar}" : "행사 {event}을(를) 달력 {calendar}에 복구함",
     "Busy" : "바쁨",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}에 할 일 {todo}을(를) 생성함",
-    "You created todo {todo} in list {calendar}" : "목록 {calendar}에 할 일 {todo}을(를) 생성함",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 님이 목록 {calendar}에서 할 일 {todo}을(를) 삭제함",
-    "You deleted todo {todo} from list {calendar}" : "목록 {calendar}에서 할 일 {todo}을(를) 삭제함",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 업데이트함",
-    "You updated todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 업데이트함",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 끝냄",
-    "You solved todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 끝냄",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 다시 염",
-    "You reopened todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 다시 염",
     "Calendar, contacts and tasks" : "달력, 연락처 및 작업",
     "A <strong>calendar</strong> was modified" : "<strong>달력</strong>이 수정됨",
     "A calendar <strong>event</strong> was modified" : "달력 <strong>행사</strong>가 수정됨",
-    "A calendar <strong>todo</strong> was modified" : "달력의 <strong>할 일</strong>이 수정됨",
     "Contact birthdays" : "연락처에 등록된 생일",
     "Death of %s" : "%s의 사망",
     "Calendar:" : "달력:",
@@ -144,6 +132,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "초대를 수락하시겠습니까?",
     "Tentative" : "예정됨",
     "Comment" : "설명",
-    "Your attendance was updated successfully." : "참석 정보를 업데이트했습니다."
+    "Your attendance was updated successfully." : "참석 정보를 업데이트했습니다.",
+    "Todos" : "할 일",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}에 할 일 {todo}을(를) 생성함",
+    "You created todo {todo} in list {calendar}" : "목록 {calendar}에 할 일 {todo}을(를) 생성함",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 님이 목록 {calendar}에서 할 일 {todo}을(를) 삭제함",
+    "You deleted todo {todo} from list {calendar}" : "목록 {calendar}에서 할 일 {todo}을(를) 삭제함",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 업데이트함",
+    "You updated todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 업데이트함",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 끝냄",
+    "You solved todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 끝냄",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 다시 염",
+    "You reopened todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 다시 염",
+    "A calendar <strong>todo</strong> was modified" : "달력의 <strong>할 일</strong>이 수정됨"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/dav/l10n/ko.json b/apps/dav/l10n/ko.json
index e4ee28abcbc..f233edf0881 100644
--- a/apps/dav/l10n/ko.json
+++ b/apps/dav/l10n/ko.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "달력",
-    "Todos" : "할 일",
     "Personal" : "개인",
     "{actor} created calendar {calendar}" : "{actor} 님이 달력 {calendar}을(를) 생성함",
     "You created calendar {calendar}" : "달력 {calendar}을(를) 생성함",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} 님이 행사 {event}을(를) 달력 {calendar}에 복구함",
     "You restored event {event} of calendar {calendar}" : "행사 {event}을(를) 달력 {calendar}에 복구함",
     "Busy" : "바쁨",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}에 할 일 {todo}을(를) 생성함",
-    "You created todo {todo} in list {calendar}" : "목록 {calendar}에 할 일 {todo}을(를) 생성함",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 님이 목록 {calendar}에서 할 일 {todo}을(를) 삭제함",
-    "You deleted todo {todo} from list {calendar}" : "목록 {calendar}에서 할 일 {todo}을(를) 삭제함",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 업데이트함",
-    "You updated todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 업데이트함",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 끝냄",
-    "You solved todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 끝냄",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 다시 염",
-    "You reopened todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 다시 염",
     "Calendar, contacts and tasks" : "달력, 연락처 및 작업",
     "A <strong>calendar</strong> was modified" : "<strong>달력</strong>이 수정됨",
     "A calendar <strong>event</strong> was modified" : "달력 <strong>행사</strong>가 수정됨",
-    "A calendar <strong>todo</strong> was modified" : "달력의 <strong>할 일</strong>이 수정됨",
     "Contact birthdays" : "연락처에 등록된 생일",
     "Death of %s" : "%s의 사망",
     "Calendar:" : "달력:",
@@ -142,6 +130,18 @@
     "Are you accepting the invitation?" : "초대를 수락하시겠습니까?",
     "Tentative" : "예정됨",
     "Comment" : "설명",
-    "Your attendance was updated successfully." : "참석 정보를 업데이트했습니다."
+    "Your attendance was updated successfully." : "참석 정보를 업데이트했습니다.",
+    "Todos" : "할 일",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}에 할 일 {todo}을(를) 생성함",
+    "You created todo {todo} in list {calendar}" : "목록 {calendar}에 할 일 {todo}을(를) 생성함",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 님이 목록 {calendar}에서 할 일 {todo}을(를) 삭제함",
+    "You deleted todo {todo} from list {calendar}" : "목록 {calendar}에서 할 일 {todo}을(를) 삭제함",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 업데이트함",
+    "You updated todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 업데이트함",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 끝냄",
+    "You solved todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 끝냄",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 님이 목록 {calendar}의 할 일 {todo}을(를) 다시 염",
+    "You reopened todo {todo} in list {calendar}" : "목록 {calendar}의 할 일 {todo}을(를) 다시 염",
+    "A calendar <strong>todo</strong> was modified" : "달력의 <strong>할 일</strong>이 수정됨"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/lt_LT.js b/apps/dav/l10n/lt_LT.js
index 1b060dbd492..f1462487e40 100644
--- a/apps/dav/l10n/lt_LT.js
+++ b/apps/dav/l10n/lt_LT.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalendorius",
-    "Todos" : "Užduotys",
     "Personal" : "Asmeniniai",
     "{actor} created calendar {calendar}" : "{actor} sukūrė kalendorių {calendar}",
     "You created calendar {calendar}" : "Jūs sukūrėte kalendorių {calendar}",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} kalendoriuje {calendar} atkūrė įvykį {event}",
     "You restored event {event} of calendar {calendar}" : "Jūs kalendoriuje {calendar} atkūrėte įvykį {event}",
     "Busy" : "Užimtas laikas",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} sąraše {calendar} sukūrė užduotį {todo}",
-    "You created todo {todo} in list {calendar}" : "Jūs sąraše {calendar} sukūrėte užduotį {todo}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} iš sąrašo {calendar} ištrynė užduotį {todo}",
-    "You deleted todo {todo} from list {calendar}" : "Jūs iš sąrašo {calendar} ištrynėte užduotį {todo}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} sąraše {calendar} atnaujino užduotį {todo}",
-    "You updated todo {todo} in list {calendar}" : "Jūs sąraše {calendar} atnaujinote užduotį {todo}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} sąraše {calendar} išsprendė užduotį {todo}",
-    "You solved todo {todo} in list {calendar}" : "Jūs sąraše {calendar} išsprendėte užduotį {todo}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} sąraše {calendar} vėl pradėjo užduotį {todo}",
-    "You reopened todo {todo} in list {calendar}" : "Jūs sąraše {calendar} vėl pradėjote užduotį {todo}",
     "Calendar, contacts and tasks" : "Kalendorius, adresatai ir užduotys",
     "A <strong>calendar</strong> was modified" : "<strong>Kalendorius</strong> buvo modifikuotas",
     "A calendar <strong>event</strong> was modified" : "Kalendoriaus <strong>įvykis</strong> buvo modifikuotas",
-    "A calendar <strong>todo</strong> was modified" : "Kalendoriaus <strong>užduotis</strong> buvo modifikuota",
     "Contact birthdays" : "Adresatų gimtadieniai",
     "Calendar:" : "Kalendorius:",
     "Date:" : "Data:",
@@ -121,6 +109,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Ar priimate pakvietimą?",
     "Tentative" : "Preliminarus",
     "Number of guests" : "Svečių skaičius",
-    "Comment" : "Komentaras"
+    "Comment" : "Komentaras",
+    "Todos" : "Užduotys",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} sąraše {calendar} sukūrė užduotį {todo}",
+    "You created todo {todo} in list {calendar}" : "Jūs sąraše {calendar} sukūrėte užduotį {todo}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} iš sąrašo {calendar} ištrynė užduotį {todo}",
+    "You deleted todo {todo} from list {calendar}" : "Jūs iš sąrašo {calendar} ištrynėte užduotį {todo}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} sąraše {calendar} atnaujino užduotį {todo}",
+    "You updated todo {todo} in list {calendar}" : "Jūs sąraše {calendar} atnaujinote užduotį {todo}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} sąraše {calendar} išsprendė užduotį {todo}",
+    "You solved todo {todo} in list {calendar}" : "Jūs sąraše {calendar} išsprendėte užduotį {todo}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} sąraše {calendar} vėl pradėjo užduotį {todo}",
+    "You reopened todo {todo} in list {calendar}" : "Jūs sąraše {calendar} vėl pradėjote užduotį {todo}",
+    "A calendar <strong>todo</strong> was modified" : "Kalendoriaus <strong>užduotis</strong> buvo modifikuota"
 },
 "nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/apps/dav/l10n/lt_LT.json b/apps/dav/l10n/lt_LT.json
index 0b6d8f25c1c..0407e342c5c 100644
--- a/apps/dav/l10n/lt_LT.json
+++ b/apps/dav/l10n/lt_LT.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalendorius",
-    "Todos" : "Užduotys",
     "Personal" : "Asmeniniai",
     "{actor} created calendar {calendar}" : "{actor} sukūrė kalendorių {calendar}",
     "You created calendar {calendar}" : "Jūs sukūrėte kalendorių {calendar}",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} kalendoriuje {calendar} atkūrė įvykį {event}",
     "You restored event {event} of calendar {calendar}" : "Jūs kalendoriuje {calendar} atkūrėte įvykį {event}",
     "Busy" : "Užimtas laikas",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} sąraše {calendar} sukūrė užduotį {todo}",
-    "You created todo {todo} in list {calendar}" : "Jūs sąraše {calendar} sukūrėte užduotį {todo}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} iš sąrašo {calendar} ištrynė užduotį {todo}",
-    "You deleted todo {todo} from list {calendar}" : "Jūs iš sąrašo {calendar} ištrynėte užduotį {todo}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} sąraše {calendar} atnaujino užduotį {todo}",
-    "You updated todo {todo} in list {calendar}" : "Jūs sąraše {calendar} atnaujinote užduotį {todo}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} sąraše {calendar} išsprendė užduotį {todo}",
-    "You solved todo {todo} in list {calendar}" : "Jūs sąraše {calendar} išsprendėte užduotį {todo}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} sąraše {calendar} vėl pradėjo užduotį {todo}",
-    "You reopened todo {todo} in list {calendar}" : "Jūs sąraše {calendar} vėl pradėjote užduotį {todo}",
     "Calendar, contacts and tasks" : "Kalendorius, adresatai ir užduotys",
     "A <strong>calendar</strong> was modified" : "<strong>Kalendorius</strong> buvo modifikuotas",
     "A calendar <strong>event</strong> was modified" : "Kalendoriaus <strong>įvykis</strong> buvo modifikuotas",
-    "A calendar <strong>todo</strong> was modified" : "Kalendoriaus <strong>užduotis</strong> buvo modifikuota",
     "Contact birthdays" : "Adresatų gimtadieniai",
     "Calendar:" : "Kalendorius:",
     "Date:" : "Data:",
@@ -119,6 +107,18 @@
     "Are you accepting the invitation?" : "Ar priimate pakvietimą?",
     "Tentative" : "Preliminarus",
     "Number of guests" : "Svečių skaičius",
-    "Comment" : "Komentaras"
+    "Comment" : "Komentaras",
+    "Todos" : "Užduotys",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} sąraše {calendar} sukūrė užduotį {todo}",
+    "You created todo {todo} in list {calendar}" : "Jūs sąraše {calendar} sukūrėte užduotį {todo}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} iš sąrašo {calendar} ištrynė užduotį {todo}",
+    "You deleted todo {todo} from list {calendar}" : "Jūs iš sąrašo {calendar} ištrynėte užduotį {todo}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} sąraše {calendar} atnaujino užduotį {todo}",
+    "You updated todo {todo} in list {calendar}" : "Jūs sąraše {calendar} atnaujinote užduotį {todo}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} sąraše {calendar} išsprendė užduotį {todo}",
+    "You solved todo {todo} in list {calendar}" : "Jūs sąraše {calendar} išsprendėte užduotį {todo}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} sąraše {calendar} vėl pradėjo užduotį {todo}",
+    "You reopened todo {todo} in list {calendar}" : "Jūs sąraše {calendar} vėl pradėjote užduotį {todo}",
+    "A calendar <strong>todo</strong> was modified" : "Kalendoriaus <strong>užduotis</strong> buvo modifikuota"
 },"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/mk.js b/apps/dav/l10n/mk.js
index d7f9310f519..687b6bac7b1 100644
--- a/apps/dav/l10n/mk.js
+++ b/apps/dav/l10n/mk.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Календар",
-    "Todos" : "Задачи",
     "Personal" : "Лично",
     "{actor} created calendar {calendar}" : "{actor} креираше календар {calendar}",
     "You created calendar {calendar}" : "Креиравте календар {calendar}",
@@ -33,20 +32,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} врати настан {event} во календарот {calendar}",
     "You restored event {event} of calendar {calendar}" : "Вративте настан {event} во календарот {calendar}",
     "Busy" : "Зафатен",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} креираше задолжение {todo} во листата {calendar}",
-    "You created todo {todo} in list {calendar}" : "Креиравте задолжение {todo} во листата {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} избриша задолжение {todo} од листата {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Избришавте задолжение {todo} од листата {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} ажурираше задолжение {todo} во листата {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Ажуриравте задолжение {todo} во листата {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} го реши задолжението {todo} во листата {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Го решивте задолжението {todo} во листата {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно го отвори задолжението {todo} во листата {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Повторно го отворивте задолжението {todo} во листата {calendar}",
     "Calendar, contacts and tasks" : "Календар, контакти и задачи",
     "A <strong>calendar</strong> was modified" : "<strong>Календарот</strong> е променет",
     "A calendar <strong>event</strong> was modified" : "Изменет е <strong>настан</strong> во календарот",
-    "A calendar <strong>todo</strong> was modified" : "Изменета е <strong>задача</strong> во календарот",
     "Contact birthdays" : "Родендени на контактите",
     "Death of %s" : "Смрт на %s",
     "Calendar:" : "Календар:",
@@ -124,6 +112,18 @@ OC.L10N.register(
     "Tentative" : "Прелиминарно",
     "Number of guests" : "Број на гости",
     "Comment" : "Коментар",
-    "Your attendance was updated successfully." : "Вашето присуство е успешно ажурирано."
+    "Your attendance was updated successfully." : "Вашето присуство е успешно ажурирано.",
+    "Todos" : "Задачи",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} креираше задолжение {todo} во листата {calendar}",
+    "You created todo {todo} in list {calendar}" : "Креиравте задолжение {todo} во листата {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} избриша задолжение {todo} од листата {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Избришавте задолжение {todo} од листата {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ажурираше задолжение {todo} во листата {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ажуриравте задолжение {todo} во листата {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} го реши задолжението {todo} во листата {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Го решивте задолжението {todo} во листата {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно го отвори задолжението {todo} во листата {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Повторно го отворивте задолжението {todo} во листата {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Изменета е <strong>задача</strong> во календарот"
 },
 "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/dav/l10n/mk.json b/apps/dav/l10n/mk.json
index f37a3724984..1b3ceaba38a 100644
--- a/apps/dav/l10n/mk.json
+++ b/apps/dav/l10n/mk.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Календар",
-    "Todos" : "Задачи",
     "Personal" : "Лично",
     "{actor} created calendar {calendar}" : "{actor} креираше календар {calendar}",
     "You created calendar {calendar}" : "Креиравте календар {calendar}",
@@ -31,20 +30,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} врати настан {event} во календарот {calendar}",
     "You restored event {event} of calendar {calendar}" : "Вративте настан {event} во календарот {calendar}",
     "Busy" : "Зафатен",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} креираше задолжение {todo} во листата {calendar}",
-    "You created todo {todo} in list {calendar}" : "Креиравте задолжение {todo} во листата {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} избриша задолжение {todo} од листата {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Избришавте задолжение {todo} од листата {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} ажурираше задолжение {todo} во листата {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Ажуриравте задолжение {todo} во листата {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} го реши задолжението {todo} во листата {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Го решивте задолжението {todo} во листата {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно го отвори задолжението {todo} во листата {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Повторно го отворивте задолжението {todo} во листата {calendar}",
     "Calendar, contacts and tasks" : "Календар, контакти и задачи",
     "A <strong>calendar</strong> was modified" : "<strong>Календарот</strong> е променет",
     "A calendar <strong>event</strong> was modified" : "Изменет е <strong>настан</strong> во календарот",
-    "A calendar <strong>todo</strong> was modified" : "Изменета е <strong>задача</strong> во календарот",
     "Contact birthdays" : "Родендени на контактите",
     "Death of %s" : "Смрт на %s",
     "Calendar:" : "Календар:",
@@ -122,6 +110,18 @@
     "Tentative" : "Прелиминарно",
     "Number of guests" : "Број на гости",
     "Comment" : "Коментар",
-    "Your attendance was updated successfully." : "Вашето присуство е успешно ажурирано."
+    "Your attendance was updated successfully." : "Вашето присуство е успешно ажурирано.",
+    "Todos" : "Задачи",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} креираше задолжение {todo} во листата {calendar}",
+    "You created todo {todo} in list {calendar}" : "Креиравте задолжение {todo} во листата {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} избриша задолжение {todo} од листата {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Избришавте задолжение {todo} од листата {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ажурираше задолжение {todo} во листата {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ажуриравте задолжение {todo} во листата {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} го реши задолжението {todo} во листата {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Го решивте задолжението {todo} во листата {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно го отвори задолжението {todo} во листата {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Повторно го отворивте задолжението {todo} во листата {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Изменета е <strong>задача</strong> во календарот"
 },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/nb.js b/apps/dav/l10n/nb.js
index b2169406345..06279d90460 100644
--- a/apps/dav/l10n/nb.js
+++ b/apps/dav/l10n/nb.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalender",
-    "Todos" : "Gjøremål",
     "Personal" : "Personlig",
     "{actor} created calendar {calendar}" : "{actor} opprettet kalenderen {calendar}",
     "You created calendar {calendar}" : "Du opprettet kalenderen {calendar}",
@@ -31,19 +30,8 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "{actor} oppdaterte hendelsen {event} i kalenderen {calendar}",
     "You updated event {event} in calendar {calendar}" : "Du oppdaterte hendelsen {event} i kalenderen {calendar}",
     "Busy" : "Opptatt",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} opprettet en oppgaven {todo} i listen {calendar}",
-    "You created todo {todo} in list {calendar}" : "Du opprettet en oppgave {todo} i listen {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} slettet gjøremålet {todo} fra listen {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Du slettet gjøremålet {todo} fra listen {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} oppdaterte gjøremålet {todo} i listen {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Du oppdaterte gjøremålet {todo} i listen {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} ferdigstilte gjøremålet {todo} i listen {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Du ferdigstilte gjøremålet {todo} i listen {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} gjenåpnet gjøremålet {todo} i listen {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Du gjenåpnet oppgaven {todo} i listen {calendar}",
     "A <strong>calendar</strong> was modified" : "En <strong>kalender</strong> ble endret",
     "A calendar <strong>event</strong> was modified" : "En kalender <strong>hendelse</strong> ble endret",
-    "A calendar <strong>todo</strong> was modified" : "En kalende <strong>gjøremål</strong> ble endret",
     "Contact birthdays" : "Kontakters fødelsdag",
     "Death of %s" : "Død av %s",
     "Calendar:" : "Kalender:",
@@ -112,6 +100,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Aksepterer du invitasjonen?",
     "Tentative" : "Foreløpig",
     "Comment" : "Kommentar",
-    "Your attendance was updated successfully." : "Deltakelsen din ble oppdatert."
+    "Your attendance was updated successfully." : "Deltakelsen din ble oppdatert.",
+    "Todos" : "Gjøremål",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} opprettet en oppgaven {todo} i listen {calendar}",
+    "You created todo {todo} in list {calendar}" : "Du opprettet en oppgave {todo} i listen {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} slettet gjøremålet {todo} fra listen {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Du slettet gjøremålet {todo} fra listen {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} oppdaterte gjøremålet {todo} i listen {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Du oppdaterte gjøremålet {todo} i listen {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} ferdigstilte gjøremålet {todo} i listen {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Du ferdigstilte gjøremålet {todo} i listen {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} gjenåpnet gjøremålet {todo} i listen {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Du gjenåpnet oppgaven {todo} i listen {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "En kalende <strong>gjøremål</strong> ble endret"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/nb.json b/apps/dav/l10n/nb.json
index 9998d2be238..9e8f78bddac 100644
--- a/apps/dav/l10n/nb.json
+++ b/apps/dav/l10n/nb.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalender",
-    "Todos" : "Gjøremål",
     "Personal" : "Personlig",
     "{actor} created calendar {calendar}" : "{actor} opprettet kalenderen {calendar}",
     "You created calendar {calendar}" : "Du opprettet kalenderen {calendar}",
@@ -29,19 +28,8 @@
     "{actor} updated event {event} in calendar {calendar}" : "{actor} oppdaterte hendelsen {event} i kalenderen {calendar}",
     "You updated event {event} in calendar {calendar}" : "Du oppdaterte hendelsen {event} i kalenderen {calendar}",
     "Busy" : "Opptatt",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} opprettet en oppgaven {todo} i listen {calendar}",
-    "You created todo {todo} in list {calendar}" : "Du opprettet en oppgave {todo} i listen {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} slettet gjøremålet {todo} fra listen {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Du slettet gjøremålet {todo} fra listen {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} oppdaterte gjøremålet {todo} i listen {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Du oppdaterte gjøremålet {todo} i listen {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} ferdigstilte gjøremålet {todo} i listen {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Du ferdigstilte gjøremålet {todo} i listen {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} gjenåpnet gjøremålet {todo} i listen {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Du gjenåpnet oppgaven {todo} i listen {calendar}",
     "A <strong>calendar</strong> was modified" : "En <strong>kalender</strong> ble endret",
     "A calendar <strong>event</strong> was modified" : "En kalender <strong>hendelse</strong> ble endret",
-    "A calendar <strong>todo</strong> was modified" : "En kalende <strong>gjøremål</strong> ble endret",
     "Contact birthdays" : "Kontakters fødelsdag",
     "Death of %s" : "Død av %s",
     "Calendar:" : "Kalender:",
@@ -110,6 +98,18 @@
     "Are you accepting the invitation?" : "Aksepterer du invitasjonen?",
     "Tentative" : "Foreløpig",
     "Comment" : "Kommentar",
-    "Your attendance was updated successfully." : "Deltakelsen din ble oppdatert."
+    "Your attendance was updated successfully." : "Deltakelsen din ble oppdatert.",
+    "Todos" : "Gjøremål",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} opprettet en oppgaven {todo} i listen {calendar}",
+    "You created todo {todo} in list {calendar}" : "Du opprettet en oppgave {todo} i listen {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} slettet gjøremålet {todo} fra listen {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Du slettet gjøremålet {todo} fra listen {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} oppdaterte gjøremålet {todo} i listen {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Du oppdaterte gjøremålet {todo} i listen {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} ferdigstilte gjøremålet {todo} i listen {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Du ferdigstilte gjøremålet {todo} i listen {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} gjenåpnet gjøremålet {todo} i listen {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Du gjenåpnet oppgaven {todo} i listen {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "En kalende <strong>gjøremål</strong> ble endret"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/nl.js b/apps/dav/l10n/nl.js
index 6a1f9ee6efd..1aef3e58c15 100644
--- a/apps/dav/l10n/nl.js
+++ b/apps/dav/l10n/nl.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Agenda",
-    "Todos" : "Te doen",
     "Personal" : "Persoonlijk",
     "{actor} created calendar {calendar}" : "{actor} creëerde agenda {calendar}",
     "You created calendar {calendar}" : "Jij creëerde agenda {calendar}",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} herstelde afspraak {event} in agenda {calendar}",
     "You restored event {event} of calendar {calendar}" : "Je herstelde afspraak {event} in agenda {calendar}",
     "Busy" : "Bezig",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} creëerde taak {todo} in lijst {calendar}",
-    "You created todo {todo} in list {calendar}" : "Jij creëerde taak {todo} in lijst {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} heeft de taak {todo} uit lijst {calendar} verwijderd",
-    "You deleted todo {todo} from list {calendar}" : "Je verwijderde taak {todo} uit lijst {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} heeft taak {todo} bijgewerkt in lijst {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Je hebt taak {todo} bijgewerkt in lijst {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} heeft taak {todo} in lijst {calendar} afgewerkt",
-    "You solved todo {todo} in list {calendar}" : "Je hebt taak {todo} in lijst {calendar} afgewerkt",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} heropende taak {todo} in lijst {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Je heropende taak {todo} in lijst {calendar}",
     "Calendar, contacts and tasks" : "Agenda, contactpersonen en taken",
     "A <strong>calendar</strong> was modified" : "Een <strong>agenda</strong> is aangepast",
     "A calendar <strong>event</strong> was modified" : "Een agenda <strong>gebeurtenis</strong> is aangepast",
-    "A calendar <strong>todo</strong> was modified" : "Een agenda <strong>Te doen</strong> was aangepast",
     "Contact birthdays" : "Verjaardagen",
     "Death of %s" : "Sterfdatum van %s",
     "Calendar:" : "Agenda",
@@ -157,6 +145,18 @@ OC.L10N.register(
     "Tentative" : "Onder voorbehoud",
     "Number of guests" : "Aantal gasten",
     "Comment" : "Notitie",
-    "Your attendance was updated successfully." : "Je deelname is succesvol bijgewerkt."
+    "Your attendance was updated successfully." : "Je deelname is succesvol bijgewerkt.",
+    "Todos" : "Te doen",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} creëerde taak {todo} in lijst {calendar}",
+    "You created todo {todo} in list {calendar}" : "Jij creëerde taak {todo} in lijst {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} heeft de taak {todo} uit lijst {calendar} verwijderd",
+    "You deleted todo {todo} from list {calendar}" : "Je verwijderde taak {todo} uit lijst {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} heeft taak {todo} bijgewerkt in lijst {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Je hebt taak {todo} bijgewerkt in lijst {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} heeft taak {todo} in lijst {calendar} afgewerkt",
+    "You solved todo {todo} in list {calendar}" : "Je hebt taak {todo} in lijst {calendar} afgewerkt",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} heropende taak {todo} in lijst {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Je heropende taak {todo} in lijst {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Een agenda <strong>Te doen</strong> was aangepast"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/nl.json b/apps/dav/l10n/nl.json
index 6ef31be82d9..2b78505a9c2 100644
--- a/apps/dav/l10n/nl.json
+++ b/apps/dav/l10n/nl.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Agenda",
-    "Todos" : "Te doen",
     "Personal" : "Persoonlijk",
     "{actor} created calendar {calendar}" : "{actor} creëerde agenda {calendar}",
     "You created calendar {calendar}" : "Jij creëerde agenda {calendar}",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} herstelde afspraak {event} in agenda {calendar}",
     "You restored event {event} of calendar {calendar}" : "Je herstelde afspraak {event} in agenda {calendar}",
     "Busy" : "Bezig",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} creëerde taak {todo} in lijst {calendar}",
-    "You created todo {todo} in list {calendar}" : "Jij creëerde taak {todo} in lijst {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} heeft de taak {todo} uit lijst {calendar} verwijderd",
-    "You deleted todo {todo} from list {calendar}" : "Je verwijderde taak {todo} uit lijst {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} heeft taak {todo} bijgewerkt in lijst {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Je hebt taak {todo} bijgewerkt in lijst {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} heeft taak {todo} in lijst {calendar} afgewerkt",
-    "You solved todo {todo} in list {calendar}" : "Je hebt taak {todo} in lijst {calendar} afgewerkt",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} heropende taak {todo} in lijst {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Je heropende taak {todo} in lijst {calendar}",
     "Calendar, contacts and tasks" : "Agenda, contactpersonen en taken",
     "A <strong>calendar</strong> was modified" : "Een <strong>agenda</strong> is aangepast",
     "A calendar <strong>event</strong> was modified" : "Een agenda <strong>gebeurtenis</strong> is aangepast",
-    "A calendar <strong>todo</strong> was modified" : "Een agenda <strong>Te doen</strong> was aangepast",
     "Contact birthdays" : "Verjaardagen",
     "Death of %s" : "Sterfdatum van %s",
     "Calendar:" : "Agenda",
@@ -155,6 +143,18 @@
     "Tentative" : "Onder voorbehoud",
     "Number of guests" : "Aantal gasten",
     "Comment" : "Notitie",
-    "Your attendance was updated successfully." : "Je deelname is succesvol bijgewerkt."
+    "Your attendance was updated successfully." : "Je deelname is succesvol bijgewerkt.",
+    "Todos" : "Te doen",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} creëerde taak {todo} in lijst {calendar}",
+    "You created todo {todo} in list {calendar}" : "Jij creëerde taak {todo} in lijst {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} heeft de taak {todo} uit lijst {calendar} verwijderd",
+    "You deleted todo {todo} from list {calendar}" : "Je verwijderde taak {todo} uit lijst {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} heeft taak {todo} bijgewerkt in lijst {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Je hebt taak {todo} bijgewerkt in lijst {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} heeft taak {todo} in lijst {calendar} afgewerkt",
+    "You solved todo {todo} in list {calendar}" : "Je hebt taak {todo} in lijst {calendar} afgewerkt",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} heropende taak {todo} in lijst {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Je heropende taak {todo} in lijst {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Een agenda <strong>Te doen</strong> was aangepast"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/pl.js b/apps/dav/l10n/pl.js
index 25088b26f37..65bf52496aa 100644
--- a/apps/dav/l10n/pl.js
+++ b/apps/dav/l10n/pl.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalendarz",
-    "Todos" : "Zadania",
     "Personal" : "Osobiste",
     "{actor} created calendar {calendar}" : "{actor} utworzył kalendarz {calendar}",
     "You created calendar {calendar}" : "Utworzyłeś kalendarz {calendar}",
@@ -37,22 +36,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} przywrócił wydarzenie {event} z kalendarza {calendar}",
     "You restored event {event} of calendar {calendar}" : "Przywróciłeś wydarzenie {event} z kalendarza {calendar}",
     "Busy" : "Czekaj",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} utworzył zadanie {todo} na liście {calendar}",
-    "You created todo {todo} in list {calendar}" : "Utworzyłeś zadanie {todo} na liście {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} usunął zadanie {todo} z listy {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Usunąłeś zadanie {todo} z listy {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} zaktualizował zadanie {todo} na liście {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Zaktualizowałeś zadanie {todo} na liście {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} zakończył zadanie {todo} na liście {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Zakończyłeś zadanie {todo} na liście {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} otworzył ponownie zadanie {todo} na liście {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Otworzyłeś ponownie zadanie {todo} na liście {calendar}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} przeniósł zadanie {todo} z listy {sourceCalendar} na listę {targetCalendar}",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Przeniosłeś zadanie {todo} z listy {sourceCalendar} na listę {targetCalendar}",
     "Calendar, contacts and tasks" : "Kalendarz, kontakty i zadania",
     "A <strong>calendar</strong> was modified" : "<strong>Kalendarz</strong> został zmodyfikowany",
     "A calendar <strong>event</strong> was modified" : "<strong>Zdarzenie</strong> kalendarza zostało zmodyfikowane",
-    "A calendar <strong>todo</strong> was modified" : "Kalendarz <strong>zadań</strong> został zmieniony",
     "Contact birthdays" : "Urodziny kontaktu",
     "Death of %s" : "Śmierć %s",
     "Calendar:" : "Kalendarz:",
@@ -181,6 +167,18 @@ OC.L10N.register(
     "Tentative" : "Niepewne",
     "Number of guests" : "Liczba gości",
     "Comment" : "Komentarz",
-    "Your attendance was updated successfully." : "Twoja obecność została pomyślnie zaktualizowana."
+    "Your attendance was updated successfully." : "Twoja obecność została pomyślnie zaktualizowana.",
+    "Todos" : "Zadania",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} utworzył zadanie {todo} na liście {calendar}",
+    "You created todo {todo} in list {calendar}" : "Utworzyłeś zadanie {todo} na liście {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} usunął zadanie {todo} z listy {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Usunąłeś zadanie {todo} z listy {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} zaktualizował zadanie {todo} na liście {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Zaktualizowałeś zadanie {todo} na liście {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} zakończył zadanie {todo} na liście {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Zakończyłeś zadanie {todo} na liście {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} otworzył ponownie zadanie {todo} na liście {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Otworzyłeś ponownie zadanie {todo} na liście {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Kalendarz <strong>zadań</strong> został zmieniony"
 },
 "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");
diff --git a/apps/dav/l10n/pl.json b/apps/dav/l10n/pl.json
index 474f29b596a..f2895b02e54 100644
--- a/apps/dav/l10n/pl.json
+++ b/apps/dav/l10n/pl.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalendarz",
-    "Todos" : "Zadania",
     "Personal" : "Osobiste",
     "{actor} created calendar {calendar}" : "{actor} utworzył kalendarz {calendar}",
     "You created calendar {calendar}" : "Utworzyłeś kalendarz {calendar}",
@@ -35,22 +34,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} przywrócił wydarzenie {event} z kalendarza {calendar}",
     "You restored event {event} of calendar {calendar}" : "Przywróciłeś wydarzenie {event} z kalendarza {calendar}",
     "Busy" : "Czekaj",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} utworzył zadanie {todo} na liście {calendar}",
-    "You created todo {todo} in list {calendar}" : "Utworzyłeś zadanie {todo} na liście {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} usunął zadanie {todo} z listy {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Usunąłeś zadanie {todo} z listy {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} zaktualizował zadanie {todo} na liście {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Zaktualizowałeś zadanie {todo} na liście {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} zakończył zadanie {todo} na liście {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Zakończyłeś zadanie {todo} na liście {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} otworzył ponownie zadanie {todo} na liście {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Otworzyłeś ponownie zadanie {todo} na liście {calendar}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} przeniósł zadanie {todo} z listy {sourceCalendar} na listę {targetCalendar}",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Przeniosłeś zadanie {todo} z listy {sourceCalendar} na listę {targetCalendar}",
     "Calendar, contacts and tasks" : "Kalendarz, kontakty i zadania",
     "A <strong>calendar</strong> was modified" : "<strong>Kalendarz</strong> został zmodyfikowany",
     "A calendar <strong>event</strong> was modified" : "<strong>Zdarzenie</strong> kalendarza zostało zmodyfikowane",
-    "A calendar <strong>todo</strong> was modified" : "Kalendarz <strong>zadań</strong> został zmieniony",
     "Contact birthdays" : "Urodziny kontaktu",
     "Death of %s" : "Śmierć %s",
     "Calendar:" : "Kalendarz:",
@@ -179,6 +165,18 @@
     "Tentative" : "Niepewne",
     "Number of guests" : "Liczba gości",
     "Comment" : "Komentarz",
-    "Your attendance was updated successfully." : "Twoja obecność została pomyślnie zaktualizowana."
+    "Your attendance was updated successfully." : "Twoja obecność została pomyślnie zaktualizowana.",
+    "Todos" : "Zadania",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} utworzył zadanie {todo} na liście {calendar}",
+    "You created todo {todo} in list {calendar}" : "Utworzyłeś zadanie {todo} na liście {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} usunął zadanie {todo} z listy {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Usunąłeś zadanie {todo} z listy {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} zaktualizował zadanie {todo} na liście {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Zaktualizowałeś zadanie {todo} na liście {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} zakończył zadanie {todo} na liście {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Zakończyłeś zadanie {todo} na liście {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} otworzył ponownie zadanie {todo} na liście {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Otworzyłeś ponownie zadanie {todo} na liście {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Kalendarz <strong>zadań</strong> został zmieniony"
 },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/pt_BR.js b/apps/dav/l10n/pt_BR.js
index 1c666f68757..969cd3e66ab 100644
--- a/apps/dav/l10n/pt_BR.js
+++ b/apps/dav/l10n/pt_BR.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Calendário",
-    "Todos" : "Tarefas",
     "Personal" : "Pessoal",
     "{actor} created calendar {calendar}" : "{actor} criou o calendário {calendar}",
     "You created calendar {calendar}" : "Você criou o calendário {calendar}",
@@ -37,22 +36,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} restaurou o evento {event} do calendário {calendar}",
     "You restored event {event} of calendar {calendar}" : "Você restaurou o evento {event} do calendário {calendar}",
     "Busy" : "Ocupado",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} criou a tarefa {todo} na lista {calendar}",
-    "You created todo {todo} in list {calendar}" : "Você criou a tarefa {todo} na lista {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} excluiu a tarefa {todo} da lista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Você excluiu a tarefa {todo} da lista {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} atualizou a tarefa {todo} na lista {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Você atualizou a tarefa {todo} na lista {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} tarefa resolvida {todo} na lista {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Você terminou a tarefa  {todo} na lista {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabriu tarefa {todo} na lista {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Você reabriu a terefa {todo} na lista {calendar}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} moveu a tarefa {todo} da lista {sourceCalendar} para a  lista {targetCalendar}",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Você moveu a tarefa {todo} da lista {sourceCalendar} para a lista {targetCalendar}",
     "Calendar, contacts and tasks" : "Calendário, contatos e tarefas",
     "A <strong>calendar</strong> was modified" : "Um <strong>calendário</strong> foi modificado",
     "A calendar <strong>event</strong> was modified" : "Um <strong>evento</strong> do calendário foi modificado",
-    "A calendar <strong>todo</strong> was modified" : "Uma <strong>tarefa</strong> do calendário foi modificada",
     "Contact birthdays" : "Aniversário dos contatos",
     "Death of %s" : "Morte de %s",
     "Calendar:" : "Calendário:",
@@ -181,6 +167,18 @@ OC.L10N.register(
     "Tentative" : "Tentativa",
     "Number of guests" : "Número de convidados",
     "Comment" : "Comentário",
-    "Your attendance was updated successfully." : "Sua presença foi atualizada com sucesso."
+    "Your attendance was updated successfully." : "Sua presença foi atualizada com sucesso.",
+    "Todos" : "Tarefas",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} criou a tarefa {todo} na lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Você criou a tarefa {todo} na lista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} excluiu a tarefa {todo} da lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Você excluiu a tarefa {todo} da lista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} atualizou a tarefa {todo} na lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Você atualizou a tarefa {todo} na lista {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} tarefa resolvida {todo} na lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Você terminou a tarefa  {todo} na lista {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabriu tarefa {todo} na lista {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Você reabriu a terefa {todo} na lista {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Uma <strong>tarefa</strong> do calendário foi modificada"
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/dav/l10n/pt_BR.json b/apps/dav/l10n/pt_BR.json
index 66e9450a167..ff3ace30737 100644
--- a/apps/dav/l10n/pt_BR.json
+++ b/apps/dav/l10n/pt_BR.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Calendário",
-    "Todos" : "Tarefas",
     "Personal" : "Pessoal",
     "{actor} created calendar {calendar}" : "{actor} criou o calendário {calendar}",
     "You created calendar {calendar}" : "Você criou o calendário {calendar}",
@@ -35,22 +34,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} restaurou o evento {event} do calendário {calendar}",
     "You restored event {event} of calendar {calendar}" : "Você restaurou o evento {event} do calendário {calendar}",
     "Busy" : "Ocupado",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} criou a tarefa {todo} na lista {calendar}",
-    "You created todo {todo} in list {calendar}" : "Você criou a tarefa {todo} na lista {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} excluiu a tarefa {todo} da lista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Você excluiu a tarefa {todo} da lista {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} atualizou a tarefa {todo} na lista {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Você atualizou a tarefa {todo} na lista {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} tarefa resolvida {todo} na lista {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Você terminou a tarefa  {todo} na lista {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabriu tarefa {todo} na lista {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Você reabriu a terefa {todo} na lista {calendar}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} moveu a tarefa {todo} da lista {sourceCalendar} para a  lista {targetCalendar}",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "Você moveu a tarefa {todo} da lista {sourceCalendar} para a lista {targetCalendar}",
     "Calendar, contacts and tasks" : "Calendário, contatos e tarefas",
     "A <strong>calendar</strong> was modified" : "Um <strong>calendário</strong> foi modificado",
     "A calendar <strong>event</strong> was modified" : "Um <strong>evento</strong> do calendário foi modificado",
-    "A calendar <strong>todo</strong> was modified" : "Uma <strong>tarefa</strong> do calendário foi modificada",
     "Contact birthdays" : "Aniversário dos contatos",
     "Death of %s" : "Morte de %s",
     "Calendar:" : "Calendário:",
@@ -179,6 +165,18 @@
     "Tentative" : "Tentativa",
     "Number of guests" : "Número de convidados",
     "Comment" : "Comentário",
-    "Your attendance was updated successfully." : "Sua presença foi atualizada com sucesso."
+    "Your attendance was updated successfully." : "Sua presença foi atualizada com sucesso.",
+    "Todos" : "Tarefas",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} criou a tarefa {todo} na lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Você criou a tarefa {todo} na lista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} excluiu a tarefa {todo} da lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Você excluiu a tarefa {todo} da lista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} atualizou a tarefa {todo} na lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Você atualizou a tarefa {todo} na lista {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} tarefa resolvida {todo} na lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Você terminou a tarefa  {todo} na lista {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabriu tarefa {todo} na lista {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Você reabriu a terefa {todo} na lista {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Uma <strong>tarefa</strong> do calendário foi modificada"
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/ru.js b/apps/dav/l10n/ru.js
index a2a21aa535f..80367d469bd 100644
--- a/apps/dav/l10n/ru.js
+++ b/apps/dav/l10n/ru.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Календарь",
-    "Todos" : "Задачи",
     "Personal" : "Личное",
     "{actor} created calendar {calendar}" : "{actor} создал(а) календарь «{calendar}»",
     "You created calendar {calendar}" : "Вы создали календарь «{calendar}»",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} восстановил(а) событие {event} в календаре {calendar}",
     "You restored event {event} of calendar {calendar}" : "Вы восстановили событие {event} в календаре {calendar}",
     "Busy" : "Занято",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} создал(а) задачу «{todo}» в списке «{calendar}»",
-    "You created todo {todo} in list {calendar}" : "Вы создали задачу «{todo}» в списке «{calendar}»",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} удалил(а) задачу «{todo}» из списка «{calendar}»",
-    "You deleted todo {todo} from list {calendar}" : "Вы удалили задачу «{todo}» из списка «{calendar}»",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} обновил(а) задачу «{todo}» из списка «{calendar}»",
-    "You updated todo {todo} in list {calendar}" : "Вы обновили задачу «{todo}» из списка «{calendar}»",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} завершил(а) задачу «{todo}» из списка «{calendar}»",
-    "You solved todo {todo} in list {calendar}" : "Вы завершили задачу «{todo}» из списка «{calendar}»",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно(а) открыл задачу «{todo}» из списка «{calendar}»",
-    "You reopened todo {todo} in list {calendar}" : "Вы повторно открыли задачу «{todo}» из списка «{calendar}»",
     "Calendar, contacts and tasks" : "Календарь, контакты и задачи",
     "A <strong>calendar</strong> was modified" : "Изменения <strong>календаря</strong> ",
     "A calendar <strong>event</strong> was modified" : "В календаре изменено <strong>событие</strong>",
-    "A calendar <strong>todo</strong> was modified" : "В календаре изменена <strong>задача</strong>",
     "Contact birthdays" : "Дни рождения контакта",
     "Death of %s" : "Смерть %s",
     "Calendar:" : "Календарь:",
@@ -155,6 +143,18 @@ OC.L10N.register(
     "Tentative" : "Под вопросом",
     "Number of guests" : "Количество гостей",
     "Comment" : "Комментарий",
-    "Your attendance was updated successfully." : "Статус участия обновлён."
+    "Your attendance was updated successfully." : "Статус участия обновлён.",
+    "Todos" : "Задачи",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} создал(а) задачу «{todo}» в списке «{calendar}»",
+    "You created todo {todo} in list {calendar}" : "Вы создали задачу «{todo}» в списке «{calendar}»",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} удалил(а) задачу «{todo}» из списка «{calendar}»",
+    "You deleted todo {todo} from list {calendar}" : "Вы удалили задачу «{todo}» из списка «{calendar}»",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} обновил(а) задачу «{todo}» из списка «{calendar}»",
+    "You updated todo {todo} in list {calendar}" : "Вы обновили задачу «{todo}» из списка «{calendar}»",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} завершил(а) задачу «{todo}» из списка «{calendar}»",
+    "You solved todo {todo} in list {calendar}" : "Вы завершили задачу «{todo}» из списка «{calendar}»",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно(а) открыл задачу «{todo}» из списка «{calendar}»",
+    "You reopened todo {todo} in list {calendar}" : "Вы повторно открыли задачу «{todo}» из списка «{calendar}»",
+    "A calendar <strong>todo</strong> was modified" : "В календаре изменена <strong>задача</strong>"
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/apps/dav/l10n/ru.json b/apps/dav/l10n/ru.json
index ef6fd3e653a..7104a421e71 100644
--- a/apps/dav/l10n/ru.json
+++ b/apps/dav/l10n/ru.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Календарь",
-    "Todos" : "Задачи",
     "Personal" : "Личное",
     "{actor} created calendar {calendar}" : "{actor} создал(а) календарь «{calendar}»",
     "You created calendar {calendar}" : "Вы создали календарь «{calendar}»",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} восстановил(а) событие {event} в календаре {calendar}",
     "You restored event {event} of calendar {calendar}" : "Вы восстановили событие {event} в календаре {calendar}",
     "Busy" : "Занято",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} создал(а) задачу «{todo}» в списке «{calendar}»",
-    "You created todo {todo} in list {calendar}" : "Вы создали задачу «{todo}» в списке «{calendar}»",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} удалил(а) задачу «{todo}» из списка «{calendar}»",
-    "You deleted todo {todo} from list {calendar}" : "Вы удалили задачу «{todo}» из списка «{calendar}»",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} обновил(а) задачу «{todo}» из списка «{calendar}»",
-    "You updated todo {todo} in list {calendar}" : "Вы обновили задачу «{todo}» из списка «{calendar}»",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} завершил(а) задачу «{todo}» из списка «{calendar}»",
-    "You solved todo {todo} in list {calendar}" : "Вы завершили задачу «{todo}» из списка «{calendar}»",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно(а) открыл задачу «{todo}» из списка «{calendar}»",
-    "You reopened todo {todo} in list {calendar}" : "Вы повторно открыли задачу «{todo}» из списка «{calendar}»",
     "Calendar, contacts and tasks" : "Календарь, контакты и задачи",
     "A <strong>calendar</strong> was modified" : "Изменения <strong>календаря</strong> ",
     "A calendar <strong>event</strong> was modified" : "В календаре изменено <strong>событие</strong>",
-    "A calendar <strong>todo</strong> was modified" : "В календаре изменена <strong>задача</strong>",
     "Contact birthdays" : "Дни рождения контакта",
     "Death of %s" : "Смерть %s",
     "Calendar:" : "Календарь:",
@@ -153,6 +141,18 @@
     "Tentative" : "Под вопросом",
     "Number of guests" : "Количество гостей",
     "Comment" : "Комментарий",
-    "Your attendance was updated successfully." : "Статус участия обновлён."
+    "Your attendance was updated successfully." : "Статус участия обновлён.",
+    "Todos" : "Задачи",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} создал(а) задачу «{todo}» в списке «{calendar}»",
+    "You created todo {todo} in list {calendar}" : "Вы создали задачу «{todo}» в списке «{calendar}»",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} удалил(а) задачу «{todo}» из списка «{calendar}»",
+    "You deleted todo {todo} from list {calendar}" : "Вы удалили задачу «{todo}» из списка «{calendar}»",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} обновил(а) задачу «{todo}» из списка «{calendar}»",
+    "You updated todo {todo} in list {calendar}" : "Вы обновили задачу «{todo}» из списка «{calendar}»",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} завершил(а) задачу «{todo}» из списка «{calendar}»",
+    "You solved todo {todo} in list {calendar}" : "Вы завершили задачу «{todo}» из списка «{calendar}»",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно(а) открыл задачу «{todo}» из списка «{calendar}»",
+    "You reopened todo {todo} in list {calendar}" : "Вы повторно открыли задачу «{todo}» из списка «{calendar}»",
+    "A calendar <strong>todo</strong> was modified" : "В календаре изменена <strong>задача</strong>"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/sc.js b/apps/dav/l10n/sc.js
index caeaa8654aa..f2e2b3c6343 100644
--- a/apps/dav/l10n/sc.js
+++ b/apps/dav/l10n/sc.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Calendàriu",
-    "Todos" : "Cosas de fàghere",
     "Personal" : "Personale",
     "{actor} created calendar {calendar}" : "{actor} at creadu su calendàriu {calendar}",
     "You created calendar {calendar}" : "As creadu su calendàriu {calendar}",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} at ripristinadu s'eventu {event} in su calendàriu {calendar}",
     "You restored event {event} of calendar {calendar}" : "As ripristinadu s'eventu {event} in su calendàriu {calendar}",
     "Busy" : "Impinnadu",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} at creadu sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "You created todo {todo} in list {calendar}" : "As creadu una cosa de fàghere {todo} in s'elencu {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} at cantzelladu sa cosa de fàghere {todo} dae s'elencu {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "As eliminadu sa cosa de fàghere {todo} dae s'elencu {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} at agiornadu sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "You updated todo {todo} in list {calendar}" : "As agiornadu sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} at isortu sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "You solved todo {todo} in list {calendar}" : "As isortu sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} at torradu a abèrrere sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "As torradu a abèrrere sa cosa de fàghere {todo} in s'elecu {calendar}",
     "Calendar, contacts and tasks" : "Calendàriu, cuntatos e fainas",
     "A <strong>calendar</strong> was modified" : "Unu <strong>calendàriu</strong> est istadu modificadu",
     "A calendar <strong>event</strong> was modified" : "Un'<strong>eventu</strong> de su calendàriu est istadu modificadu",
-    "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa de fàghere</strong> de su calendàriu est istada modificada",
     "Contact birthdays" : "Data de nàschida de is cuntatos",
     "Death of %s" : "Morte de %s",
     "Calendar:" : "Calendàriu:",
@@ -145,6 +133,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Cheres atzetare s'invitu?",
     "Tentative" : "Intentu",
     "Comment" : "Cummentu",
-    "Your attendance was updated successfully." : "Sa partetzipatzione tua est istada agiornada in manera curreta."
+    "Your attendance was updated successfully." : "Sa partetzipatzione tua est istada agiornada in manera curreta.",
+    "Todos" : "Cosas de fàghere",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} at creadu sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "You created todo {todo} in list {calendar}" : "As creadu una cosa de fàghere {todo} in s'elencu {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} at cantzelladu sa cosa de fàghere {todo} dae s'elencu {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "As eliminadu sa cosa de fàghere {todo} dae s'elencu {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} at agiornadu sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "You updated todo {todo} in list {calendar}" : "As agiornadu sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} at isortu sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "You solved todo {todo} in list {calendar}" : "As isortu sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} at torradu a abèrrere sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "As torradu a abèrrere sa cosa de fàghere {todo} in s'elecu {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa de fàghere</strong> de su calendàriu est istada modificada"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/sc.json b/apps/dav/l10n/sc.json
index 77c14b27fa2..4ed2e95896f 100644
--- a/apps/dav/l10n/sc.json
+++ b/apps/dav/l10n/sc.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Calendàriu",
-    "Todos" : "Cosas de fàghere",
     "Personal" : "Personale",
     "{actor} created calendar {calendar}" : "{actor} at creadu su calendàriu {calendar}",
     "You created calendar {calendar}" : "As creadu su calendàriu {calendar}",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} at ripristinadu s'eventu {event} in su calendàriu {calendar}",
     "You restored event {event} of calendar {calendar}" : "As ripristinadu s'eventu {event} in su calendàriu {calendar}",
     "Busy" : "Impinnadu",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} at creadu sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "You created todo {todo} in list {calendar}" : "As creadu una cosa de fàghere {todo} in s'elencu {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} at cantzelladu sa cosa de fàghere {todo} dae s'elencu {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "As eliminadu sa cosa de fàghere {todo} dae s'elencu {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} at agiornadu sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "You updated todo {todo} in list {calendar}" : "As agiornadu sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} at isortu sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "You solved todo {todo} in list {calendar}" : "As isortu sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} at torradu a abèrrere sa cosa de fàghere {todo} in s'elencu {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "As torradu a abèrrere sa cosa de fàghere {todo} in s'elecu {calendar}",
     "Calendar, contacts and tasks" : "Calendàriu, cuntatos e fainas",
     "A <strong>calendar</strong> was modified" : "Unu <strong>calendàriu</strong> est istadu modificadu",
     "A calendar <strong>event</strong> was modified" : "Un'<strong>eventu</strong> de su calendàriu est istadu modificadu",
-    "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa de fàghere</strong> de su calendàriu est istada modificada",
     "Contact birthdays" : "Data de nàschida de is cuntatos",
     "Death of %s" : "Morte de %s",
     "Calendar:" : "Calendàriu:",
@@ -143,6 +131,18 @@
     "Are you accepting the invitation?" : "Cheres atzetare s'invitu?",
     "Tentative" : "Intentu",
     "Comment" : "Cummentu",
-    "Your attendance was updated successfully." : "Sa partetzipatzione tua est istada agiornada in manera curreta."
+    "Your attendance was updated successfully." : "Sa partetzipatzione tua est istada agiornada in manera curreta.",
+    "Todos" : "Cosas de fàghere",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} at creadu sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "You created todo {todo} in list {calendar}" : "As creadu una cosa de fàghere {todo} in s'elencu {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} at cantzelladu sa cosa de fàghere {todo} dae s'elencu {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "As eliminadu sa cosa de fàghere {todo} dae s'elencu {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} at agiornadu sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "You updated todo {todo} in list {calendar}" : "As agiornadu sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} at isortu sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "You solved todo {todo} in list {calendar}" : "As isortu sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} at torradu a abèrrere sa cosa de fàghere {todo} in s'elencu {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "As torradu a abèrrere sa cosa de fàghere {todo} in s'elecu {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa de fàghere</strong> de su calendàriu est istada modificada"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/sk.js b/apps/dav/l10n/sk.js
index 127a328d249..1c62436025e 100644
--- a/apps/dav/l10n/sk.js
+++ b/apps/dav/l10n/sk.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalendár",
-    "Todos" : "Úlohy",
     "Personal" : "Osobné",
     "{actor} created calendar {calendar}" : "[actor] vytvoril kalendár [calendar]",
     "You created calendar {calendar}" : "Vytvorili ste kalendár {calendar}",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} obnovil udalosť {event} v kalendári {calendar}",
     "You restored event {event} of calendar {calendar}" : "Obnovili ste udalosť {event} v kalendári {calendar}",
     "Busy" : "Zaneprázdnený",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} vytvoril úlohu {todo} v {calendar}",
-    "You created todo {todo} in list {calendar}" : "Vytvorili ste úlohu {todo} v {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} zmazal úlohu {todo} z {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Zmazali ste úlohu {todo} z {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} upravil úlohu {todo} v {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Upravili ste úlohu {todo} v {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} vyriešil úlohu {todo} v {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Vyriešili ste úlohu {todo} v {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} znovu otvoril úlohu {todo} v {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Otvorili ste znovu úlohu {todo} v {calendar}",
     "Calendar, contacts and tasks" : "Kalendár, kontakty a úlohy",
     "A <strong>calendar</strong> was modified" : "<strong>kalendár</strong> bol upravený",
     "A calendar <strong>event</strong> was modified" : "<strong>Udalosť</strong> v kalendári bola upravená",
-    "A calendar <strong>todo</strong> was modified" : "<strong>Pripomienka</strong> v kalendári bola upravená",
     "Contact birthdays" : "Narodeniny kontaktu",
     "Death of %s" : "Dátum úmrtia %s",
     "Calendar:" : "Kalendár:",
@@ -177,6 +165,18 @@ OC.L10N.register(
     "Tentative" : "Neistý",
     "Number of guests" : "Počet návštevníkov",
     "Comment" : "Komentár",
-    "Your attendance was updated successfully." : "Vaša účasť bola aktualizovaná úspešne."
+    "Your attendance was updated successfully." : "Vaša účasť bola aktualizovaná úspešne.",
+    "Todos" : "Úlohy",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} vytvoril úlohu {todo} v {calendar}",
+    "You created todo {todo} in list {calendar}" : "Vytvorili ste úlohu {todo} v {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} zmazal úlohu {todo} z {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Zmazali ste úlohu {todo} z {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} upravil úlohu {todo} v {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Upravili ste úlohu {todo} v {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} vyriešil úlohu {todo} v {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vyriešili ste úlohu {todo} v {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} znovu otvoril úlohu {todo} v {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Otvorili ste znovu úlohu {todo} v {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "<strong>Pripomienka</strong> v kalendári bola upravená"
 },
 "nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/apps/dav/l10n/sk.json b/apps/dav/l10n/sk.json
index 731f7b72d0a..2b2ce1b30fb 100644
--- a/apps/dav/l10n/sk.json
+++ b/apps/dav/l10n/sk.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalendár",
-    "Todos" : "Úlohy",
     "Personal" : "Osobné",
     "{actor} created calendar {calendar}" : "[actor] vytvoril kalendár [calendar]",
     "You created calendar {calendar}" : "Vytvorili ste kalendár {calendar}",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} obnovil udalosť {event} v kalendári {calendar}",
     "You restored event {event} of calendar {calendar}" : "Obnovili ste udalosť {event} v kalendári {calendar}",
     "Busy" : "Zaneprázdnený",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} vytvoril úlohu {todo} v {calendar}",
-    "You created todo {todo} in list {calendar}" : "Vytvorili ste úlohu {todo} v {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} zmazal úlohu {todo} z {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Zmazali ste úlohu {todo} z {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} upravil úlohu {todo} v {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Upravili ste úlohu {todo} v {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} vyriešil úlohu {todo} v {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Vyriešili ste úlohu {todo} v {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} znovu otvoril úlohu {todo} v {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Otvorili ste znovu úlohu {todo} v {calendar}",
     "Calendar, contacts and tasks" : "Kalendár, kontakty a úlohy",
     "A <strong>calendar</strong> was modified" : "<strong>kalendár</strong> bol upravený",
     "A calendar <strong>event</strong> was modified" : "<strong>Udalosť</strong> v kalendári bola upravená",
-    "A calendar <strong>todo</strong> was modified" : "<strong>Pripomienka</strong> v kalendári bola upravená",
     "Contact birthdays" : "Narodeniny kontaktu",
     "Death of %s" : "Dátum úmrtia %s",
     "Calendar:" : "Kalendár:",
@@ -175,6 +163,18 @@
     "Tentative" : "Neistý",
     "Number of guests" : "Počet návštevníkov",
     "Comment" : "Komentár",
-    "Your attendance was updated successfully." : "Vaša účasť bola aktualizovaná úspešne."
+    "Your attendance was updated successfully." : "Vaša účasť bola aktualizovaná úspešne.",
+    "Todos" : "Úlohy",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} vytvoril úlohu {todo} v {calendar}",
+    "You created todo {todo} in list {calendar}" : "Vytvorili ste úlohu {todo} v {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} zmazal úlohu {todo} z {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Zmazali ste úlohu {todo} z {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} upravil úlohu {todo} v {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Upravili ste úlohu {todo} v {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} vyriešil úlohu {todo} v {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vyriešili ste úlohu {todo} v {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} znovu otvoril úlohu {todo} v {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Otvorili ste znovu úlohu {todo} v {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "<strong>Pripomienka</strong> v kalendári bola upravená"
 },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/sl.js b/apps/dav/l10n/sl.js
index bb07ed9b9f0..0eaabf7e2cd 100644
--- a/apps/dav/l10n/sl.js
+++ b/apps/dav/l10n/sl.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Koledar",
-    "Todos" : "Naloge",
     "Personal" : "Osebno",
     "{actor} created calendar {calendar}" : "{actor} ustvari koledar {calendar}",
     "You created calendar {calendar}" : "Ustvarim koledar {calendar}",
@@ -31,20 +30,9 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "{actor} posodobi dogodek {event} v koledarju {calendar}",
     "You updated event {event} in calendar {calendar}" : "Posodobite dogodek {event} v koledarju {calendar}",
     "Busy" : "Zasedeno",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} ustvari nalogo {todo} v koledarju {calendar}",
-    "You created todo {todo} in list {calendar}" : "Ustvarite nalogo {todo} v koledarju {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} izbriše nalogo {todo} iz koledara {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Izbrišete nalogo {todo} iz koledarja {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} posodobi nalogo {todo} v koledarju {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Posodobite nalogo {todo} v seznamu {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} razreši nalogo {todo} v koledarju {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Razrešite nalogo {todo} v seznamu {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ponovno odpre nalogo {todo} v koledarju {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Ponovno odprete nalogo {todo} v seznamu {calendar}",
     "Calendar, contacts and tasks" : "Koledar, stiki in naloge",
     "A <strong>calendar</strong> was modified" : "V <strong>koledar</strong> je vpisana sprememba",
     "A calendar <strong>event</strong> was modified" : "Spremenjen je <strong>dogodek</strong> v koledarju",
-    "A calendar <strong>todo</strong> was modified" : "Spremenjena je <strong>naloga</strong> koledarja",
     "Contact birthdays" : "Obletnice stikov",
     "Death of %s" : "%s (obletnica smrti)",
     "Calendar:" : "Koledar:",
@@ -127,6 +115,18 @@ OC.L10N.register(
     "Tentative" : "Začasno",
     "Number of guests" : "Število gostov",
     "Comment" : "Opomba",
-    "Your attendance was updated successfully." : "Vaša prisotnost je uspešno posodobljena."
+    "Your attendance was updated successfully." : "Vaša prisotnost je uspešno posodobljena.",
+    "Todos" : "Naloge",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} ustvari nalogo {todo} v koledarju {calendar}",
+    "You created todo {todo} in list {calendar}" : "Ustvarite nalogo {todo} v koledarju {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} izbriše nalogo {todo} iz koledara {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Izbrišete nalogo {todo} iz koledarja {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} posodobi nalogo {todo} v koledarju {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Posodobite nalogo {todo} v seznamu {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} razreši nalogo {todo} v koledarju {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Razrešite nalogo {todo} v seznamu {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ponovno odpre nalogo {todo} v koledarju {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Ponovno odprete nalogo {todo} v seznamu {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Spremenjena je <strong>naloga</strong> koledarja"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/dav/l10n/sl.json b/apps/dav/l10n/sl.json
index cecfc2cb0c4..4df1e51d2a5 100644
--- a/apps/dav/l10n/sl.json
+++ b/apps/dav/l10n/sl.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Koledar",
-    "Todos" : "Naloge",
     "Personal" : "Osebno",
     "{actor} created calendar {calendar}" : "{actor} ustvari koledar {calendar}",
     "You created calendar {calendar}" : "Ustvarim koledar {calendar}",
@@ -29,20 +28,9 @@
     "{actor} updated event {event} in calendar {calendar}" : "{actor} posodobi dogodek {event} v koledarju {calendar}",
     "You updated event {event} in calendar {calendar}" : "Posodobite dogodek {event} v koledarju {calendar}",
     "Busy" : "Zasedeno",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} ustvari nalogo {todo} v koledarju {calendar}",
-    "You created todo {todo} in list {calendar}" : "Ustvarite nalogo {todo} v koledarju {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} izbriše nalogo {todo} iz koledara {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Izbrišete nalogo {todo} iz koledarja {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} posodobi nalogo {todo} v koledarju {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Posodobite nalogo {todo} v seznamu {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} razreši nalogo {todo} v koledarju {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Razrešite nalogo {todo} v seznamu {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ponovno odpre nalogo {todo} v koledarju {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Ponovno odprete nalogo {todo} v seznamu {calendar}",
     "Calendar, contacts and tasks" : "Koledar, stiki in naloge",
     "A <strong>calendar</strong> was modified" : "V <strong>koledar</strong> je vpisana sprememba",
     "A calendar <strong>event</strong> was modified" : "Spremenjen je <strong>dogodek</strong> v koledarju",
-    "A calendar <strong>todo</strong> was modified" : "Spremenjena je <strong>naloga</strong> koledarja",
     "Contact birthdays" : "Obletnice stikov",
     "Death of %s" : "%s (obletnica smrti)",
     "Calendar:" : "Koledar:",
@@ -125,6 +113,18 @@
     "Tentative" : "Začasno",
     "Number of guests" : "Število gostov",
     "Comment" : "Opomba",
-    "Your attendance was updated successfully." : "Vaša prisotnost je uspešno posodobljena."
+    "Your attendance was updated successfully." : "Vaša prisotnost je uspešno posodobljena.",
+    "Todos" : "Naloge",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} ustvari nalogo {todo} v koledarju {calendar}",
+    "You created todo {todo} in list {calendar}" : "Ustvarite nalogo {todo} v koledarju {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} izbriše nalogo {todo} iz koledara {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Izbrišete nalogo {todo} iz koledarja {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} posodobi nalogo {todo} v koledarju {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Posodobite nalogo {todo} v seznamu {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} razreši nalogo {todo} v koledarju {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Razrešite nalogo {todo} v seznamu {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} ponovno odpre nalogo {todo} v koledarju {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Ponovno odprete nalogo {todo} v seznamu {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Spremenjena je <strong>naloga</strong> koledarja"
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/sr.js b/apps/dav/l10n/sr.js
index 4412a3999bf..fb78bee1f27 100644
--- a/apps/dav/l10n/sr.js
+++ b/apps/dav/l10n/sr.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Календар",
-    "Todos" : "Подсетници",
     "Personal" : "Лично",
     "{actor} created calendar {calendar}" : "{actor} направи календар {calendar}",
     "You created calendar {calendar}" : "Направили сте календар {calendar}",
@@ -31,19 +30,8 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "{actor} је ажурирао догађај {event} у календару {calendar}",
     "You updated event {event} in calendar {calendar}" : "Ажурирали сте догађај {event} у календару {calendar}",
     "Busy" : "Заузет/а",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} је направио подсетник {todo} у листи {calendar}",
-    "You created todo {todo} in list {calendar}" : "Креирали сте подсетник {todo}  у листи {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} је обрисао подсетник {todo} из листе {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Обрисали сте подсетник {todo} из листе {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} је ажурирао подсетник {todo}  у листи {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Ажурирали сте подсетник {todo} у листи {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} је обрисао подсетник {todo} из листе {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Маркирали сте подсетник {todo} као готов у листи {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} је поново отворио подсетник {todo} у листи {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Поново сте отворили подсетник {todo}  у листи {calendar}",
     "A <strong>calendar</strong> was modified" : "<strong>Календар</strong> је измењен",
     "A calendar <strong>event</strong> was modified" : "<strong>Догађај</strong> из календара је измењен",
-    "A calendar <strong>todo</strong> was modified" : "<strong>Подсетник</strong> из календара је измењен",
     "Contact birthdays" : "Рођендани контаката",
     "Death of %s" : " %s смрт",
     "Calendar:" : "Календар:",
@@ -112,6 +100,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Да ли прихватате позивницу?",
     "Tentative" : "Условна потврда",
     "Comment" : "Коментар",
-    "Your attendance was updated successfully." : "Ваше присуство је успешно ажурирано."
+    "Your attendance was updated successfully." : "Ваше присуство је успешно ажурирано.",
+    "Todos" : "Подсетници",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} је направио подсетник {todo} у листи {calendar}",
+    "You created todo {todo} in list {calendar}" : "Креирали сте подсетник {todo}  у листи {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} је обрисао подсетник {todo} из листе {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Обрисали сте подсетник {todo} из листе {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} је ажурирао подсетник {todo}  у листи {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ажурирали сте подсетник {todo} у листи {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} је обрисао подсетник {todo} из листе {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Маркирали сте подсетник {todo} као готов у листи {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} је поново отворио подсетник {todo} у листи {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Поново сте отворили подсетник {todo}  у листи {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "<strong>Подсетник</strong> из календара је измењен"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/dav/l10n/sr.json b/apps/dav/l10n/sr.json
index b0d59d93232..9fd5276b852 100644
--- a/apps/dav/l10n/sr.json
+++ b/apps/dav/l10n/sr.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Календар",
-    "Todos" : "Подсетници",
     "Personal" : "Лично",
     "{actor} created calendar {calendar}" : "{actor} направи календар {calendar}",
     "You created calendar {calendar}" : "Направили сте календар {calendar}",
@@ -29,19 +28,8 @@
     "{actor} updated event {event} in calendar {calendar}" : "{actor} је ажурирао догађај {event} у календару {calendar}",
     "You updated event {event} in calendar {calendar}" : "Ажурирали сте догађај {event} у календару {calendar}",
     "Busy" : "Заузет/а",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} је направио подсетник {todo} у листи {calendar}",
-    "You created todo {todo} in list {calendar}" : "Креирали сте подсетник {todo}  у листи {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} је обрисао подсетник {todo} из листе {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Обрисали сте подсетник {todo} из листе {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} је ажурирао подсетник {todo}  у листи {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Ажурирали сте подсетник {todo} у листи {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} је обрисао подсетник {todo} из листе {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Маркирали сте подсетник {todo} као готов у листи {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} је поново отворио подсетник {todo} у листи {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Поново сте отворили подсетник {todo}  у листи {calendar}",
     "A <strong>calendar</strong> was modified" : "<strong>Календар</strong> је измењен",
     "A calendar <strong>event</strong> was modified" : "<strong>Догађај</strong> из календара је измењен",
-    "A calendar <strong>todo</strong> was modified" : "<strong>Подсетник</strong> из календара је измењен",
     "Contact birthdays" : "Рођендани контаката",
     "Death of %s" : " %s смрт",
     "Calendar:" : "Календар:",
@@ -110,6 +98,18 @@
     "Are you accepting the invitation?" : "Да ли прихватате позивницу?",
     "Tentative" : "Условна потврда",
     "Comment" : "Коментар",
-    "Your attendance was updated successfully." : "Ваше присуство је успешно ажурирано."
+    "Your attendance was updated successfully." : "Ваше присуство је успешно ажурирано.",
+    "Todos" : "Подсетници",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} је направио подсетник {todo} у листи {calendar}",
+    "You created todo {todo} in list {calendar}" : "Креирали сте подсетник {todo}  у листи {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} је обрисао подсетник {todo} из листе {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Обрисали сте подсетник {todo} из листе {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} је ажурирао подсетник {todo}  у листи {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ажурирали сте подсетник {todo} у листи {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} је обрисао подсетник {todo} из листе {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Маркирали сте подсетник {todo} као готов у листи {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} је поново отворио подсетник {todo} у листи {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Поново сте отворили подсетник {todo}  у листи {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "<strong>Подсетник</strong> из календара је измењен"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/sv.js b/apps/dav/l10n/sv.js
index 6508c8fc33b..5bcc0d621ae 100644
--- a/apps/dav/l10n/sv.js
+++ b/apps/dav/l10n/sv.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Kalender",
-    "Todos" : "Uppgifter",
     "Personal" : "Privat",
     "{actor} created calendar {calendar}" : "{actor} skapade kalender {calendar}",
     "You created calendar {calendar}" : "Du skapade kalender {calendar}",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} återställde händelsen {event} i kalendern {calendar}",
     "You restored event {event} of calendar {calendar}" : "Du återställde händelsen {event} i kalendern {calendar}",
     "Busy" : "Upptagen",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} skapade uppgift {todo} i listan {calendar}",
-    "You created todo {todo} in list {calendar}" : "Du skapade uppgift {todo} i listan {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} tog bort uppgift {todo} från listan {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Du tog bort uppgift {todo} från listan {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} uppdaterade uppgift {todo} i listan {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Du uppdaterade uppgift {todo} i listan {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} löste uppgift {todo} i listan {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Du löste uppgift {todo} i listan {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} återupptog uppgift {todo} i listan {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Du återupptog uppgift {todo} i listan {calendar}",
     "Calendar, contacts and tasks" : "Kalender, kontakter och uppgifter",
     "A <strong>calendar</strong> was modified" : "En <strong>kalender</strong> modifierades",
     "A calendar <strong>event</strong> was modified" : "En kalender-<strong>händelse</strong> modifierades",
-    "A calendar <strong>todo</strong> was modified" : "En kalender <strong>uppgift</strong> modifierades",
     "Contact birthdays" : "Födelsedagar",
     "Death of %s" : "Död av %s",
     "Calendar:" : "Kalender:",
@@ -151,6 +139,18 @@ OC.L10N.register(
     "Tentative" : "Preliminärt",
     "Number of guests" : "Antal gäster",
     "Comment" : "Kommentar",
-    "Your attendance was updated successfully." : "Dina närvaro uppdaterades."
+    "Your attendance was updated successfully." : "Dina närvaro uppdaterades.",
+    "Todos" : "Uppgifter",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} skapade uppgift {todo} i listan {calendar}",
+    "You created todo {todo} in list {calendar}" : "Du skapade uppgift {todo} i listan {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} tog bort uppgift {todo} från listan {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Du tog bort uppgift {todo} från listan {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} uppdaterade uppgift {todo} i listan {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Du uppdaterade uppgift {todo} i listan {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} löste uppgift {todo} i listan {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Du löste uppgift {todo} i listan {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} återupptog uppgift {todo} i listan {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Du återupptog uppgift {todo} i listan {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "En kalender <strong>uppgift</strong> modifierades"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/sv.json b/apps/dav/l10n/sv.json
index 8040b5f3f34..e4bbb46e490 100644
--- a/apps/dav/l10n/sv.json
+++ b/apps/dav/l10n/sv.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Kalender",
-    "Todos" : "Uppgifter",
     "Personal" : "Privat",
     "{actor} created calendar {calendar}" : "{actor} skapade kalender {calendar}",
     "You created calendar {calendar}" : "Du skapade kalender {calendar}",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} återställde händelsen {event} i kalendern {calendar}",
     "You restored event {event} of calendar {calendar}" : "Du återställde händelsen {event} i kalendern {calendar}",
     "Busy" : "Upptagen",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} skapade uppgift {todo} i listan {calendar}",
-    "You created todo {todo} in list {calendar}" : "Du skapade uppgift {todo} i listan {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} tog bort uppgift {todo} från listan {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Du tog bort uppgift {todo} från listan {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} uppdaterade uppgift {todo} i listan {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Du uppdaterade uppgift {todo} i listan {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} löste uppgift {todo} i listan {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Du löste uppgift {todo} i listan {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} återupptog uppgift {todo} i listan {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Du återupptog uppgift {todo} i listan {calendar}",
     "Calendar, contacts and tasks" : "Kalender, kontakter och uppgifter",
     "A <strong>calendar</strong> was modified" : "En <strong>kalender</strong> modifierades",
     "A calendar <strong>event</strong> was modified" : "En kalender-<strong>händelse</strong> modifierades",
-    "A calendar <strong>todo</strong> was modified" : "En kalender <strong>uppgift</strong> modifierades",
     "Contact birthdays" : "Födelsedagar",
     "Death of %s" : "Död av %s",
     "Calendar:" : "Kalender:",
@@ -149,6 +137,18 @@
     "Tentative" : "Preliminärt",
     "Number of guests" : "Antal gäster",
     "Comment" : "Kommentar",
-    "Your attendance was updated successfully." : "Dina närvaro uppdaterades."
+    "Your attendance was updated successfully." : "Dina närvaro uppdaterades.",
+    "Todos" : "Uppgifter",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} skapade uppgift {todo} i listan {calendar}",
+    "You created todo {todo} in list {calendar}" : "Du skapade uppgift {todo} i listan {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} tog bort uppgift {todo} från listan {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Du tog bort uppgift {todo} från listan {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} uppdaterade uppgift {todo} i listan {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Du uppdaterade uppgift {todo} i listan {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} löste uppgift {todo} i listan {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Du löste uppgift {todo} i listan {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} återupptog uppgift {todo} i listan {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Du återupptog uppgift {todo} i listan {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "En kalender <strong>uppgift</strong> modifierades"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/tr.js b/apps/dav/l10n/tr.js
index 3d6f2891505..e68fd0a1c9f 100644
--- a/apps/dav/l10n/tr.js
+++ b/apps/dav/l10n/tr.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Takvim",
-    "Todos" : "Yapılacak işler",
     "Personal" : "Kişisel",
     "{actor} created calendar {calendar}" : "{actor}, {calendar} takvimini ekledi",
     "You created calendar {calendar}" : "{calendar} takvimini eklediniz",
@@ -37,22 +36,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor}, {calendar} takvimindeki {event} etkinliğini geri yükledi",
     "You restored event {event} of calendar {calendar}" : "{calendar} takvimindeki {event} etkinliğini geri yüklediniz",
     "Busy" : "Meşgul",
-    "{actor} created todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesine {todo} yapılacak işini ekledi",
-    "You created todo {todo} in list {calendar}" : "{calendar} takvimi listesine {todo} yapılacak işini eklediniz",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor}, {calendar} takvimi listesinden {todo} yapılacak işini sildi",
-    "You deleted todo {todo} from list {calendar}" : "{calendar} takvimi listesinden {todo} yapılacak işini sildiniz",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini güncelledi",
-    "You updated todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini güncellediniz",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini tamamladı",
-    "You solved todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini tamamladınız",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini yeniden başlattı",
-    "You reopened todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini yeniden başlattınız",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor}, {todo} görevini {sourceCalendar} listesinden {targetCalendar} listesine taşıdı",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{todo} görevini {sourceCalendar} listesinden {targetCalendar} listesine taşıdınız",
     "Calendar, contacts and tasks" : "Takvim, kişiler ve görevler",
     "A <strong>calendar</strong> was modified" : "Bir <strong>takvim</strong> düzenlendi",
     "A calendar <strong>event</strong> was modified" : "Bir takvim <strong>etkinliği</strong> düzenlendi",
-    "A calendar <strong>todo</strong> was modified" : "Bir takvim <strong>yapılacak işi</strong> düzenlendi",
     "Contact birthdays" : "Kişi doğum günleri",
     "Death of %s" : "%s ölümü",
     "Calendar:" : "Takvim:",
@@ -181,6 +167,18 @@ OC.L10N.register(
     "Tentative" : "Kesin değil",
     "Number of guests" : "Konuk sayısı",
     "Comment" : "Yorum",
-    "Your attendance was updated successfully." : "Katılımınız güncellendi."
+    "Your attendance was updated successfully." : "Katılımınız güncellendi.",
+    "Todos" : "Yapılacak işler",
+    "{actor} created todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesine {todo} yapılacak işini ekledi",
+    "You created todo {todo} in list {calendar}" : "{calendar} takvimi listesine {todo} yapılacak işini eklediniz",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor}, {calendar} takvimi listesinden {todo} yapılacak işini sildi",
+    "You deleted todo {todo} from list {calendar}" : "{calendar} takvimi listesinden {todo} yapılacak işini sildiniz",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini güncelledi",
+    "You updated todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini güncellediniz",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini tamamladı",
+    "You solved todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini tamamladınız",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini yeniden başlattı",
+    "You reopened todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini yeniden başlattınız",
+    "A calendar <strong>todo</strong> was modified" : "Bir takvim <strong>yapılacak işi</strong> düzenlendi"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/dav/l10n/tr.json b/apps/dav/l10n/tr.json
index 7da1f637fc2..b470635f500 100644
--- a/apps/dav/l10n/tr.json
+++ b/apps/dav/l10n/tr.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Takvim",
-    "Todos" : "Yapılacak işler",
     "Personal" : "Kişisel",
     "{actor} created calendar {calendar}" : "{actor}, {calendar} takvimini ekledi",
     "You created calendar {calendar}" : "{calendar} takvimini eklediniz",
@@ -35,22 +34,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor}, {calendar} takvimindeki {event} etkinliğini geri yükledi",
     "You restored event {event} of calendar {calendar}" : "{calendar} takvimindeki {event} etkinliğini geri yüklediniz",
     "Busy" : "Meşgul",
-    "{actor} created todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesine {todo} yapılacak işini ekledi",
-    "You created todo {todo} in list {calendar}" : "{calendar} takvimi listesine {todo} yapılacak işini eklediniz",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor}, {calendar} takvimi listesinden {todo} yapılacak işini sildi",
-    "You deleted todo {todo} from list {calendar}" : "{calendar} takvimi listesinden {todo} yapılacak işini sildiniz",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini güncelledi",
-    "You updated todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini güncellediniz",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini tamamladı",
-    "You solved todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini tamamladınız",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini yeniden başlattı",
-    "You reopened todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini yeniden başlattınız",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor}, {todo} görevini {sourceCalendar} listesinden {targetCalendar} listesine taşıdı",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{todo} görevini {sourceCalendar} listesinden {targetCalendar} listesine taşıdınız",
     "Calendar, contacts and tasks" : "Takvim, kişiler ve görevler",
     "A <strong>calendar</strong> was modified" : "Bir <strong>takvim</strong> düzenlendi",
     "A calendar <strong>event</strong> was modified" : "Bir takvim <strong>etkinliği</strong> düzenlendi",
-    "A calendar <strong>todo</strong> was modified" : "Bir takvim <strong>yapılacak işi</strong> düzenlendi",
     "Contact birthdays" : "Kişi doğum günleri",
     "Death of %s" : "%s ölümü",
     "Calendar:" : "Takvim:",
@@ -179,6 +165,18 @@
     "Tentative" : "Kesin değil",
     "Number of guests" : "Konuk sayısı",
     "Comment" : "Yorum",
-    "Your attendance was updated successfully." : "Katılımınız güncellendi."
+    "Your attendance was updated successfully." : "Katılımınız güncellendi.",
+    "Todos" : "Yapılacak işler",
+    "{actor} created todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesine {todo} yapılacak işini ekledi",
+    "You created todo {todo} in list {calendar}" : "{calendar} takvimi listesine {todo} yapılacak işini eklediniz",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor}, {calendar} takvimi listesinden {todo} yapılacak işini sildi",
+    "You deleted todo {todo} from list {calendar}" : "{calendar} takvimi listesinden {todo} yapılacak işini sildiniz",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini güncelledi",
+    "You updated todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini güncellediniz",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini tamamladı",
+    "You solved todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini tamamladınız",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor}, {calendar} takvimi listesindeki {todo} yapılacak işini yeniden başlattı",
+    "You reopened todo {todo} in list {calendar}" : "{calendar} takvimi listesindeki {todo} yapılacak işini yeniden başlattınız",
+    "A calendar <strong>todo</strong> was modified" : "Bir takvim <strong>yapılacak işi</strong> düzenlendi"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/uk.js b/apps/dav/l10n/uk.js
index 22de431e2e0..a4e95881167 100644
--- a/apps/dav/l10n/uk.js
+++ b/apps/dav/l10n/uk.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Календар",
-    "Todos" : "До роботи",
     "Personal" : "Особисте",
     "{actor} created calendar {calendar}" : "{actor} створив календар {calendar}",
     "You created calendar {calendar}" : "Ви створили календар {calendar}",
@@ -31,19 +30,8 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "{actor} оновив подію {event} у календарі {calendar}",
     "You updated event {event} in calendar {calendar}" : "Ви оновили подію {event} у календарі {calendar}",
     "Busy" : "Зайнято",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} створив завдання {todo} у списку {calendar}",
-    "You created todo {todo} in list {calendar}" : "Ви створили завдання {todo} у списку {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} вилучили завдання {todo} зі списку {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Ви вилучили завдання {todo} зі списку {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} оновив завдання {todo} у списку {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Ви оновили завдання {todo} у списку {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} виконав завдання {todo} зі списку {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Ви виконали завдання {todo} зі списку {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно відкрив завдання {todo} у списку {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Ви повторно відкрили завдання {todo} у списку {calendar}",
     "A <strong>calendar</strong> was modified" : "<strong>Календар</strong> був змінений",
     "A calendar <strong>event</strong> was modified" : "Календарна <strong>подія</strong> була змінена",
-    "A calendar <strong>todo</strong> was modified" : "Календарне <strong>завдання</strong> було змінене",
     "Contact birthdays" : "Дні народження контактів",
     "Death of %s" : "Смерть %s",
     "Calendar:" : "Календар:",
@@ -103,6 +91,18 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Чи приймаєте ви запрошення?",
     "Tentative" : "Попередній",
     "Comment" : "Коментар",
-    "Your attendance was updated successfully." : "Ваша участь успішно оновлена."
+    "Your attendance was updated successfully." : "Ваша участь успішно оновлена.",
+    "Todos" : "До роботи",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} створив завдання {todo} у списку {calendar}",
+    "You created todo {todo} in list {calendar}" : "Ви створили завдання {todo} у списку {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} вилучили завдання {todo} зі списку {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Ви вилучили завдання {todo} зі списку {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} оновив завдання {todo} у списку {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ви оновили завдання {todo} у списку {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} виконав завдання {todo} зі списку {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Ви виконали завдання {todo} зі списку {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно відкрив завдання {todo} у списку {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Ви повторно відкрили завдання {todo} у списку {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Календарне <strong>завдання</strong> було змінене"
 },
 "nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);");
diff --git a/apps/dav/l10n/uk.json b/apps/dav/l10n/uk.json
index f1ec48b299b..a422698345e 100644
--- a/apps/dav/l10n/uk.json
+++ b/apps/dav/l10n/uk.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "Календар",
-    "Todos" : "До роботи",
     "Personal" : "Особисте",
     "{actor} created calendar {calendar}" : "{actor} створив календар {calendar}",
     "You created calendar {calendar}" : "Ви створили календар {calendar}",
@@ -29,19 +28,8 @@
     "{actor} updated event {event} in calendar {calendar}" : "{actor} оновив подію {event} у календарі {calendar}",
     "You updated event {event} in calendar {calendar}" : "Ви оновили подію {event} у календарі {calendar}",
     "Busy" : "Зайнято",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} створив завдання {todo} у списку {calendar}",
-    "You created todo {todo} in list {calendar}" : "Ви створили завдання {todo} у списку {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} вилучили завдання {todo} зі списку {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Ви вилучили завдання {todo} зі списку {calendar}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} оновив завдання {todo} у списку {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Ви оновили завдання {todo} у списку {calendar}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} виконав завдання {todo} зі списку {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Ви виконали завдання {todo} зі списку {calendar}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно відкрив завдання {todo} у списку {calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Ви повторно відкрили завдання {todo} у списку {calendar}",
     "A <strong>calendar</strong> was modified" : "<strong>Календар</strong> був змінений",
     "A calendar <strong>event</strong> was modified" : "Календарна <strong>подія</strong> була змінена",
-    "A calendar <strong>todo</strong> was modified" : "Календарне <strong>завдання</strong> було змінене",
     "Contact birthdays" : "Дні народження контактів",
     "Death of %s" : "Смерть %s",
     "Calendar:" : "Календар:",
@@ -101,6 +89,18 @@
     "Are you accepting the invitation?" : "Чи приймаєте ви запрошення?",
     "Tentative" : "Попередній",
     "Comment" : "Коментар",
-    "Your attendance was updated successfully." : "Ваша участь успішно оновлена."
+    "Your attendance was updated successfully." : "Ваша участь успішно оновлена.",
+    "Todos" : "До роботи",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} створив завдання {todo} у списку {calendar}",
+    "You created todo {todo} in list {calendar}" : "Ви створили завдання {todo} у списку {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} вилучили завдання {todo} зі списку {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Ви вилучили завдання {todo} зі списку {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} оновив завдання {todo} у списку {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ви оновили завдання {todo} у списку {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} виконав завдання {todo} зі списку {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Ви виконали завдання {todo} зі списку {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно відкрив завдання {todo} у списку {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Ви повторно відкрили завдання {todo} у списку {calendar}",
+    "A calendar <strong>todo</strong> was modified" : "Календарне <strong>завдання</strong> було змінене"
 },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/zh_CN.js b/apps/dav/l10n/zh_CN.js
index f661cd87bf9..29a4546fe98 100644
--- a/apps/dav/l10n/zh_CN.js
+++ b/apps/dav/l10n/zh_CN.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "日历",
-    "Todos" : "待办事项",
     "Personal" : "个人",
     "{actor} created calendar {calendar}" : "{actor} 创建了日历 {calendar}",
     "You created calendar {calendar}" : "您创建的日历 {calendar}",
@@ -35,20 +34,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} 还原了事件 {event}，它位于日历 {calendar}",
     "You restored event {event} of calendar {calendar}" : "你还原了事件 {event}，它位于日历 {calendar}",
     "Busy" : "忙碌",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中创建了待办事项 {todo}",
-    "You created todo {todo} in list {calendar}" : "您在列表 {calendar} 中创建了待办事项 {todo}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 在列表 {calendar} 中删除了待办事项 {todo}",
-    "You deleted todo {todo} from list {calendar}" : "您在列表 {calendar} 中删除了待办事项 {todo}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中更新了待办事项 {todo}",
-    "You updated todo {todo} in list {calendar}" : "您在列表 {calendar} 中更新了待办事项 {todo}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中解决了待办事项 {todo}",
-    "You solved todo {todo} in list {calendar}" : "您在列表 {calendar} 中解决了待办事项 {todo}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中重新打开了待办事项 {todo}",
-    "You reopened todo {todo} in list {calendar}" : "您在列表 {calendar} 中重新打开了待办事项 {todo}",
     "Calendar, contacts and tasks" : "日历、联系人和任务",
     "A <strong>calendar</strong> was modified" : "<strong>日历</strong>已经修改",
     "A calendar <strong>event</strong> was modified" : "日历中<strong>事件</strong>已经修改",
-    "A calendar <strong>todo</strong> was modified" : "列表中<strong>待办事项</strong>已经修改",
     "Contact birthdays" : "联系人生日",
     "Death of %s" : "%s 的忌日",
     "Calendar:" : "日历：",
@@ -153,6 +141,18 @@ OC.L10N.register(
     "Tentative" : "暂定",
     "Number of guests" : "客人数目",
     "Comment" : "备注",
-    "Your attendance was updated successfully." : "您的出席状态更新成功。"
+    "Your attendance was updated successfully." : "您的出席状态更新成功。",
+    "Todos" : "待办事项",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中创建了待办事项 {todo}",
+    "You created todo {todo} in list {calendar}" : "您在列表 {calendar} 中创建了待办事项 {todo}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 在列表 {calendar} 中删除了待办事项 {todo}",
+    "You deleted todo {todo} from list {calendar}" : "您在列表 {calendar} 中删除了待办事项 {todo}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中更新了待办事项 {todo}",
+    "You updated todo {todo} in list {calendar}" : "您在列表 {calendar} 中更新了待办事项 {todo}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中解决了待办事项 {todo}",
+    "You solved todo {todo} in list {calendar}" : "您在列表 {calendar} 中解决了待办事项 {todo}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中重新打开了待办事项 {todo}",
+    "You reopened todo {todo} in list {calendar}" : "您在列表 {calendar} 中重新打开了待办事项 {todo}",
+    "A calendar <strong>todo</strong> was modified" : "列表中<strong>待办事项</strong>已经修改"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/dav/l10n/zh_CN.json b/apps/dav/l10n/zh_CN.json
index 77ddaaf5f58..e2109499ab2 100644
--- a/apps/dav/l10n/zh_CN.json
+++ b/apps/dav/l10n/zh_CN.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "日历",
-    "Todos" : "待办事项",
     "Personal" : "个人",
     "{actor} created calendar {calendar}" : "{actor} 创建了日历 {calendar}",
     "You created calendar {calendar}" : "您创建的日历 {calendar}",
@@ -33,20 +32,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} 还原了事件 {event}，它位于日历 {calendar}",
     "You restored event {event} of calendar {calendar}" : "你还原了事件 {event}，它位于日历 {calendar}",
     "Busy" : "忙碌",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中创建了待办事项 {todo}",
-    "You created todo {todo} in list {calendar}" : "您在列表 {calendar} 中创建了待办事项 {todo}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 在列表 {calendar} 中删除了待办事项 {todo}",
-    "You deleted todo {todo} from list {calendar}" : "您在列表 {calendar} 中删除了待办事项 {todo}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中更新了待办事项 {todo}",
-    "You updated todo {todo} in list {calendar}" : "您在列表 {calendar} 中更新了待办事项 {todo}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中解决了待办事项 {todo}",
-    "You solved todo {todo} in list {calendar}" : "您在列表 {calendar} 中解决了待办事项 {todo}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中重新打开了待办事项 {todo}",
-    "You reopened todo {todo} in list {calendar}" : "您在列表 {calendar} 中重新打开了待办事项 {todo}",
     "Calendar, contacts and tasks" : "日历、联系人和任务",
     "A <strong>calendar</strong> was modified" : "<strong>日历</strong>已经修改",
     "A calendar <strong>event</strong> was modified" : "日历中<strong>事件</strong>已经修改",
-    "A calendar <strong>todo</strong> was modified" : "列表中<strong>待办事项</strong>已经修改",
     "Contact birthdays" : "联系人生日",
     "Death of %s" : "%s 的忌日",
     "Calendar:" : "日历：",
@@ -151,6 +139,18 @@
     "Tentative" : "暂定",
     "Number of guests" : "客人数目",
     "Comment" : "备注",
-    "Your attendance was updated successfully." : "您的出席状态更新成功。"
+    "Your attendance was updated successfully." : "您的出席状态更新成功。",
+    "Todos" : "待办事项",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中创建了待办事项 {todo}",
+    "You created todo {todo} in list {calendar}" : "您在列表 {calendar} 中创建了待办事项 {todo}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 在列表 {calendar} 中删除了待办事项 {todo}",
+    "You deleted todo {todo} from list {calendar}" : "您在列表 {calendar} 中删除了待办事项 {todo}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中更新了待办事项 {todo}",
+    "You updated todo {todo} in list {calendar}" : "您在列表 {calendar} 中更新了待办事项 {todo}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中解决了待办事项 {todo}",
+    "You solved todo {todo} in list {calendar}" : "您在列表 {calendar} 中解决了待办事项 {todo}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中重新打开了待办事项 {todo}",
+    "You reopened todo {todo} in list {calendar}" : "您在列表 {calendar} 中重新打开了待办事项 {todo}",
+    "A calendar <strong>todo</strong> was modified" : "列表中<strong>待办事项</strong>已经修改"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/zh_HK.js b/apps/dav/l10n/zh_HK.js
index e2b9e1e3aab..40d2ac629c4 100644
--- a/apps/dav/l10n/zh_HK.js
+++ b/apps/dav/l10n/zh_HK.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "日曆",
-    "Todos" : "待辦事項",
     "Personal" : "個人",
     "{actor} created calendar {calendar}" : "{actor} 建立了日曆 {calendar}",
     "You created calendar {calendar}" : "您建立了日曆 {calendar}",
@@ -37,22 +36,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} 復原了日曆 {calendar} 的活動 {event}",
     "You restored event {event} of calendar {calendar}" : "您復原了日曆 {calendar} 的活動 {event}",
     "Busy" : "忙碌中",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} 在任務列表 {calendar} 中建立了待辦事項 {todo}",
-    "You created todo {todo} in list {calendar}" : "您在任務列表 {calendar} 中建立了待辦事項 {todo}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 從任務列表 {calendar} 中刪除了待辦事項 {todo}",
-    "You deleted todo {todo} from list {calendar}" : "您從任務列表 {calendar} 中刪除了待辦事項 {todo}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} 從任務列表 {calendar} 中更新了待辦事項 {todo}",
-    "You updated todo {todo} in list {calendar}" : "您在任務列表 {calendar} 中更新了待辦事項 {todo}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} 解决了任務列表 {calendar} 中的代辦事項 {todo}",
-    "You solved todo {todo} in list {calendar}" : "您解决了任務列表 {calendar} 中的代辦事項 {todo}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 重新開啟了任務列表 {calendar} 中的代辦事項 {todo}",
-    "You reopened todo {todo} in list {calendar}" : "你重新開啟了 {calendar} 清單中的代辦事項 {todo}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} 將待辦事項 {todo} 從清單 {sourceCalendar} 移到清單 {targetCalendar}",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "您將待辦事項 {todo} 從清單 {sourceCalendar} 移到清單 {targetCalendar}",
     "Calendar, contacts and tasks" : "日曆、聯絡人和任務",
     "A <strong>calendar</strong> was modified" : "<strong>日曆</strong>被修改",
     "A calendar <strong>event</strong> was modified" : "日曆<strong>活動</strong>被修改",
-    "A calendar <strong>todo</strong> was modified" : "日曆<strong>代辦事項</strong>被修改",
     "Contact birthdays" : "聯絡人生日",
     "Death of %s" : "%s之卒",
     "Calendar:" : "日曆：",
@@ -181,6 +167,18 @@ OC.L10N.register(
     "Tentative" : "暫定",
     "Number of guests" : "訪客数目",
     "Comment" : "留言",
-    "Your attendance was updated successfully." : "您的參與狀況成功更新"
+    "Your attendance was updated successfully." : "您的參與狀況成功更新",
+    "Todos" : "待辦事項",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} 在任務列表 {calendar} 中建立了待辦事項 {todo}",
+    "You created todo {todo} in list {calendar}" : "您在任務列表 {calendar} 中建立了待辦事項 {todo}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 從任務列表 {calendar} 中刪除了待辦事項 {todo}",
+    "You deleted todo {todo} from list {calendar}" : "您從任務列表 {calendar} 中刪除了待辦事項 {todo}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} 從任務列表 {calendar} 中更新了待辦事項 {todo}",
+    "You updated todo {todo} in list {calendar}" : "您在任務列表 {calendar} 中更新了待辦事項 {todo}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} 解决了任務列表 {calendar} 中的代辦事項 {todo}",
+    "You solved todo {todo} in list {calendar}" : "您解决了任務列表 {calendar} 中的代辦事項 {todo}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 重新開啟了任務列表 {calendar} 中的代辦事項 {todo}",
+    "You reopened todo {todo} in list {calendar}" : "你重新開啟了 {calendar} 清單中的代辦事項 {todo}",
+    "A calendar <strong>todo</strong> was modified" : "日曆<strong>代辦事項</strong>被修改"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/dav/l10n/zh_HK.json b/apps/dav/l10n/zh_HK.json
index 2ba437a798e..6f74dfb0e13 100644
--- a/apps/dav/l10n/zh_HK.json
+++ b/apps/dav/l10n/zh_HK.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "日曆",
-    "Todos" : "待辦事項",
     "Personal" : "個人",
     "{actor} created calendar {calendar}" : "{actor} 建立了日曆 {calendar}",
     "You created calendar {calendar}" : "您建立了日曆 {calendar}",
@@ -35,22 +34,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} 復原了日曆 {calendar} 的活動 {event}",
     "You restored event {event} of calendar {calendar}" : "您復原了日曆 {calendar} 的活動 {event}",
     "Busy" : "忙碌中",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} 在任務列表 {calendar} 中建立了待辦事項 {todo}",
-    "You created todo {todo} in list {calendar}" : "您在任務列表 {calendar} 中建立了待辦事項 {todo}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 從任務列表 {calendar} 中刪除了待辦事項 {todo}",
-    "You deleted todo {todo} from list {calendar}" : "您從任務列表 {calendar} 中刪除了待辦事項 {todo}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} 從任務列表 {calendar} 中更新了待辦事項 {todo}",
-    "You updated todo {todo} in list {calendar}" : "您在任務列表 {calendar} 中更新了待辦事項 {todo}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} 解决了任務列表 {calendar} 中的代辦事項 {todo}",
-    "You solved todo {todo} in list {calendar}" : "您解决了任務列表 {calendar} 中的代辦事項 {todo}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 重新開啟了任務列表 {calendar} 中的代辦事項 {todo}",
-    "You reopened todo {todo} in list {calendar}" : "你重新開啟了 {calendar} 清單中的代辦事項 {todo}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} 將待辦事項 {todo} 從清單 {sourceCalendar} 移到清單 {targetCalendar}",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "您將待辦事項 {todo} 從清單 {sourceCalendar} 移到清單 {targetCalendar}",
     "Calendar, contacts and tasks" : "日曆、聯絡人和任務",
     "A <strong>calendar</strong> was modified" : "<strong>日曆</strong>被修改",
     "A calendar <strong>event</strong> was modified" : "日曆<strong>活動</strong>被修改",
-    "A calendar <strong>todo</strong> was modified" : "日曆<strong>代辦事項</strong>被修改",
     "Contact birthdays" : "聯絡人生日",
     "Death of %s" : "%s之卒",
     "Calendar:" : "日曆：",
@@ -179,6 +165,18 @@
     "Tentative" : "暫定",
     "Number of guests" : "訪客数目",
     "Comment" : "留言",
-    "Your attendance was updated successfully." : "您的參與狀況成功更新"
+    "Your attendance was updated successfully." : "您的參與狀況成功更新",
+    "Todos" : "待辦事項",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} 在任務列表 {calendar} 中建立了待辦事項 {todo}",
+    "You created todo {todo} in list {calendar}" : "您在任務列表 {calendar} 中建立了待辦事項 {todo}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 從任務列表 {calendar} 中刪除了待辦事項 {todo}",
+    "You deleted todo {todo} from list {calendar}" : "您從任務列表 {calendar} 中刪除了待辦事項 {todo}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} 從任務列表 {calendar} 中更新了待辦事項 {todo}",
+    "You updated todo {todo} in list {calendar}" : "您在任務列表 {calendar} 中更新了待辦事項 {todo}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} 解决了任務列表 {calendar} 中的代辦事項 {todo}",
+    "You solved todo {todo} in list {calendar}" : "您解决了任務列表 {calendar} 中的代辦事項 {todo}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 重新開啟了任務列表 {calendar} 中的代辦事項 {todo}",
+    "You reopened todo {todo} in list {calendar}" : "你重新開啟了 {calendar} 清單中的代辦事項 {todo}",
+    "A calendar <strong>todo</strong> was modified" : "日曆<strong>代辦事項</strong>被修改"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/dav/l10n/zh_TW.js b/apps/dav/l10n/zh_TW.js
index 2b09f9342a4..9cdc23c09f2 100644
--- a/apps/dav/l10n/zh_TW.js
+++ b/apps/dav/l10n/zh_TW.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "日曆",
-    "Todos" : "待辦事項",
     "Personal" : "個人",
     "{actor} created calendar {calendar}" : "{actor} 建立了日曆 {calendar}",
     "You created calendar {calendar}" : "您建立了日曆 {calendar}",
@@ -37,22 +36,9 @@ OC.L10N.register(
     "{actor} restored event {event} of calendar {calendar}" : "{actor} 復原了日曆 {calendar} 中的活動 {event}",
     "You restored event {event} of calendar {calendar}" : "您復原了日曆 {calendar} 中的活動 {event}",
     "Busy" : "忙碌",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中建立了待辦事項 {todo}",
-    "You created todo {todo} in list {calendar}" : "您在列表 {calendar} 中建立了待辦事項 {todo}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 在列表 {calendar} 中刪除了待辦事項 {todo}",
-    "You deleted todo {todo} from list {calendar}" : "您在列表 {calendar} 中刪除了待辦事項 {todo}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中更新了待辦事項 {todo}",
-    "You updated todo {todo} in list {calendar}" : "您在列表 {calendar} 中更新了待辦事項 {todo}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中解決了待辦事項 {todo}",
-    "You solved todo {todo} in list {calendar}" : "您在列表 {calendar} 中解決了待辦事項 {todo}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中重新開啟了待辦事項 {todo}",
-    "You reopened todo {todo} in list {calendar}" : "您在列表 {calendar} 中重新開啟了待辦事項 {todo}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} 將待辦事項 {todo} 從清單 {sourceCalendar} 移動至清單 {targetCalendar}",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "您將待辦事項 {todo} 從清單 {sourceCalendar} 移動至清單 {targetCalendar}",
     "Calendar, contacts and tasks" : "日曆、通訊錄與工作項目",
     "A <strong>calendar</strong> was modified" : "一個<strong>日曆</strong>被更動",
     "A calendar <strong>event</strong> was modified" : "一個日曆<strong>活動</strong>被更動",
-    "A calendar <strong>todo</strong> was modified" : "一個日曆<strong>待辦事項</strong>被更動",
     "Contact birthdays" : "聯絡人生日",
     "Death of %s" : "%s 逝世",
     "Calendar:" : "日曆：",
@@ -181,6 +167,18 @@ OC.L10N.register(
     "Tentative" : "暫定",
     "Number of guests" : "訪客數量",
     "Comment" : "留言",
-    "Your attendance was updated successfully." : "您的參與狀態成功更新。"
+    "Your attendance was updated successfully." : "您的參與狀態成功更新。",
+    "Todos" : "待辦事項",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中建立了待辦事項 {todo}",
+    "You created todo {todo} in list {calendar}" : "您在列表 {calendar} 中建立了待辦事項 {todo}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 在列表 {calendar} 中刪除了待辦事項 {todo}",
+    "You deleted todo {todo} from list {calendar}" : "您在列表 {calendar} 中刪除了待辦事項 {todo}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中更新了待辦事項 {todo}",
+    "You updated todo {todo} in list {calendar}" : "您在列表 {calendar} 中更新了待辦事項 {todo}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中解決了待辦事項 {todo}",
+    "You solved todo {todo} in list {calendar}" : "您在列表 {calendar} 中解決了待辦事項 {todo}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中重新開啟了待辦事項 {todo}",
+    "You reopened todo {todo} in list {calendar}" : "您在列表 {calendar} 中重新開啟了待辦事項 {todo}",
+    "A calendar <strong>todo</strong> was modified" : "一個日曆<strong>待辦事項</strong>被更動"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/dav/l10n/zh_TW.json b/apps/dav/l10n/zh_TW.json
index 2aeab43559d..26f8911bfff 100644
--- a/apps/dav/l10n/zh_TW.json
+++ b/apps/dav/l10n/zh_TW.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Calendar" : "日曆",
-    "Todos" : "待辦事項",
     "Personal" : "個人",
     "{actor} created calendar {calendar}" : "{actor} 建立了日曆 {calendar}",
     "You created calendar {calendar}" : "您建立了日曆 {calendar}",
@@ -35,22 +34,9 @@
     "{actor} restored event {event} of calendar {calendar}" : "{actor} 復原了日曆 {calendar} 中的活動 {event}",
     "You restored event {event} of calendar {calendar}" : "您復原了日曆 {calendar} 中的活動 {event}",
     "Busy" : "忙碌",
-    "{actor} created todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中建立了待辦事項 {todo}",
-    "You created todo {todo} in list {calendar}" : "您在列表 {calendar} 中建立了待辦事項 {todo}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 在列表 {calendar} 中刪除了待辦事項 {todo}",
-    "You deleted todo {todo} from list {calendar}" : "您在列表 {calendar} 中刪除了待辦事項 {todo}",
-    "{actor} updated todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中更新了待辦事項 {todo}",
-    "You updated todo {todo} in list {calendar}" : "您在列表 {calendar} 中更新了待辦事項 {todo}",
-    "{actor} solved todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中解決了待辦事項 {todo}",
-    "You solved todo {todo} in list {calendar}" : "您在列表 {calendar} 中解決了待辦事項 {todo}",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中重新開啟了待辦事項 {todo}",
-    "You reopened todo {todo} in list {calendar}" : "您在列表 {calendar} 中重新開啟了待辦事項 {todo}",
-    "{actor} moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "{actor} 將待辦事項 {todo} 從清單 {sourceCalendar} 移動至清單 {targetCalendar}",
-    "You moved todo {todo} from list {sourceCalendar} to list {targetCalendar}" : "您將待辦事項 {todo} 從清單 {sourceCalendar} 移動至清單 {targetCalendar}",
     "Calendar, contacts and tasks" : "日曆、通訊錄與工作項目",
     "A <strong>calendar</strong> was modified" : "一個<strong>日曆</strong>被更動",
     "A calendar <strong>event</strong> was modified" : "一個日曆<strong>活動</strong>被更動",
-    "A calendar <strong>todo</strong> was modified" : "一個日曆<strong>待辦事項</strong>被更動",
     "Contact birthdays" : "聯絡人生日",
     "Death of %s" : "%s 逝世",
     "Calendar:" : "日曆：",
@@ -179,6 +165,18 @@
     "Tentative" : "暫定",
     "Number of guests" : "訪客數量",
     "Comment" : "留言",
-    "Your attendance was updated successfully." : "您的參與狀態成功更新。"
+    "Your attendance was updated successfully." : "您的參與狀態成功更新。",
+    "Todos" : "待辦事項",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中建立了待辦事項 {todo}",
+    "You created todo {todo} in list {calendar}" : "您在列表 {calendar} 中建立了待辦事項 {todo}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} 在列表 {calendar} 中刪除了待辦事項 {todo}",
+    "You deleted todo {todo} from list {calendar}" : "您在列表 {calendar} 中刪除了待辦事項 {todo}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中更新了待辦事項 {todo}",
+    "You updated todo {todo} in list {calendar}" : "您在列表 {calendar} 中更新了待辦事項 {todo}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中解決了待辦事項 {todo}",
+    "You solved todo {todo} in list {calendar}" : "您在列表 {calendar} 中解決了待辦事項 {todo}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} 在列表 {calendar} 中重新開啟了待辦事項 {todo}",
+    "You reopened todo {todo} in list {calendar}" : "您在列表 {calendar} 中重新開啟了待辦事項 {todo}",
+    "A calendar <strong>todo</strong> was modified" : "一個日曆<strong>待辦事項</strong>被更動"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file