Merge branch 'master' of https://www.github.com/nextcloud/tasks

l10n/es.js

@@ -22,6 +22,7 @@ OC.L10N.register(
     "Deleted all completed tasks from calendar \"%s\"." : "Borrar todas las tareas completadas del calendario \"%s\".",
     "No errors" : "No hay errores",
     "Open your browser console for more details" : "Abre la consola del navegador para más detalles",
+    "_This will delete {taskCount} completed task and its subtasks from calendar \"%s\"._::_This will delete {taskCount} completed tasks and their subtasks from calendar \"%s\"._" : ["Esto eliminará {taskCount} tarea completada y sus subtareas del calendario \"%s\".","Esto eliminará {taskCount} tareas completadas y sus subtareas del calendario \"%s\"."],
     "_Could not delete {failedCount} task._::_Could not delete {failedCount} tasks._" : ["No se ha podido eliminar {failedCount} tarea.","No se han podido eliminar {failedCount} tareas."],
     "Load all completed tasks." : "Cargar todas las tareas completadas.",
     "Change sort order" : "Cambiar el orden",

l10n/es.json

@@ -20,6 +20,7 @@
     "Deleted all completed tasks from calendar \"%s\"." : "Borrar todas las tareas completadas del calendario \"%s\".",
     "No errors" : "No hay errores",
     "Open your browser console for more details" : "Abre la consola del navegador para más detalles",
+    "_This will delete {taskCount} completed task and its subtasks from calendar \"%s\"._::_This will delete {taskCount} completed tasks and their subtasks from calendar \"%s\"._" : ["Esto eliminará {taskCount} tarea completada y sus subtareas del calendario \"%s\".","Esto eliminará {taskCount} tareas completadas y sus subtareas del calendario \"%s\"."],
     "_Could not delete {failedCount} task._::_Could not delete {failedCount} tasks._" : ["No se ha podido eliminar {failedCount} tarea.","No se han podido eliminar {failedCount} tareas."],
     "Load all completed tasks." : "Cargar todas las tareas completadas.",
     "Change sort order" : "Cambiar el orden",

l10n/zh_CN.js

@@ -19,6 +19,7 @@ OC.L10N.register(
     "Cancel" : "取消",
     "Delete all completed tasks." : "删除所有已完成任务。",
     "Delete completed tasks." : "删除已完成任务。",
+    "Deleted all completed tasks from calendar \"%s\"." : "从日历 \"%s\" 中删除所有已完成任务。",
     "No errors" : "没有错误",
     "Open your browser console for more details" : "打开您的浏览器控制台以获取更多详细信息",
     "_This will delete {taskCount} completed task and its subtasks from calendar \"%s\"._::_This will delete {taskCount} completed tasks and their subtasks from calendar \"%s\"._" : ["此操作将从%s日历 \"{calendarName}\" 中删除 {taskCount} 个已完成任务及其子任务。"],
@@ -50,7 +51,12 @@ OC.L10N.register(
     "[Yesterday]" : "[昨天]",
     "[Today]" : "[今天]",
     "[Tomorrow]" : "[明天]",
+    "Add a subtask to \"%s\"…" : "添加子任务到 \"%s\" ...",
+    "Add a task to \"%s\"…" : "添加任务到 \"%s\" ...",
     "_%n Completed Task_::_%n Completed Tasks_" : ["%n 任务完成"],
+    "Add an important task to \"%s\"…" : "添加重要任务到 \"%s\" ...",
+    "Add a task due today to \"%s\"…" : "添加今天截止的任务到 \"%s\" ...",
+    "Add a current task to \"%s\"…" : "添加当前任务到 \"%s\" ...",
     "Tomorrow" : "明天",
     "Set start date" : "设置开始日期",
     "Set start time" : "设置开始时间",

l10n/zh_CN.json

@@ -17,6 +17,7 @@
     "Cancel" : "取消",
     "Delete all completed tasks." : "删除所有已完成任务。",
     "Delete completed tasks." : "删除已完成任务。",
+    "Deleted all completed tasks from calendar \"%s\"." : "从日历 \"%s\" 中删除所有已完成任务。",
     "No errors" : "没有错误",
     "Open your browser console for more details" : "打开您的浏览器控制台以获取更多详细信息",
     "_This will delete {taskCount} completed task and its subtasks from calendar \"%s\"._::_This will delete {taskCount} completed tasks and their subtasks from calendar \"%s\"._" : ["此操作将从%s日历 \"{calendarName}\" 中删除 {taskCount} 个已完成任务及其子任务。"],
@@ -48,7 +49,12 @@
     "[Yesterday]" : "[昨天]",
     "[Today]" : "[今天]",
     "[Tomorrow]" : "[明天]",
+    "Add a subtask to \"%s\"…" : "添加子任务到 \"%s\" ...",
+    "Add a task to \"%s\"…" : "添加任务到 \"%s\" ...",
     "_%n Completed Task_::_%n Completed Tasks_" : ["%n 任务完成"],
+    "Add an important task to \"%s\"…" : "添加重要任务到 \"%s\" ...",
+    "Add a task due today to \"%s\"…" : "添加今天截止的任务到 \"%s\" ...",
+    "Add a current task to \"%s\"…" : "添加当前任务到 \"%s\" ...",
     "Tomorrow" : "明天",
     "Set start date" : "设置开始日期",
     "Set start time" : "设置开始时间",

package-lock.json

@@ -10361,9 +10361,9 @@
       }
     },
     "linkify-it": {
-      "version": "2.1.0",
+      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg==",
+      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
       "requires": {
         "uc.micro": "^1.0.1"
       }
@@ -10820,9 +10820,9 @@
       "integrity": "sha512-XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw=="
     },
     "markdown-it": {
-      "version": "9.0.0",
+      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-9.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-9.0.1.tgz",
-      "integrity": "sha512-bUVTYGt/K/mYr3HlE+PBe6TOTyWghcpSZqOD9t+NFRlwJMhp9Kp6WQ8fJ26I6v1Xo71UmPYt1S4Hc9Lq8GZx2Q==",
+      "integrity": "sha512-XC9dMBHg28Xi7y5dPuLjM61upIGPJG8AiHNHYqIaXER2KNnn7eKnM5/sF0ImNnyoV224Ogn9b1Pck8VH4k0bxw==",
       "requires": {
         "argparse": "^1.0.7",
         "entities": "~1.1.1",
@@ -17066,9 +17066,9 @@
       }
     },
     "webpack-cli": {
-      "version": "3.3.5",
+      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.6.tgz",
-      "integrity": "sha512-w0j/s42c5UhchwTmV/45MLQnTVwRoaUTu9fM5LuyOd/8lFoCNCELDogFoecx5NzRUndO0yD/gF2b02XKMnmAWQ==",
+      "integrity": "sha512-0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A==",
       "dev": true,
       "requires": {
         "chalk": "2.4.2",

package.json

@@ -30,11 +30,11 @@
 		"ical.js": "~1.3.0",
 		"jstimezonedetect": "",
 		"linkifyjs": "~2.1.8",
-		"markdown-it": "~9.0.0",
+		"markdown-it": "~9.0.1",
 		"markdown-it-emoji": "~1.4.0",
 		"markdown-it-link-attributes": "~2.1.0",
 		"markdown-it-task-lists": "~2.1.1",
-		"linkify-it": "~2.1.0",
+		"linkify-it": "~2.2.0",
 		"nextcloud-vue": "^0.11.5",
 		"p-limit": "^2.2.0",
 		"p-queue": "^6.1.0",
@@ -87,7 +87,7 @@
 		"vue-loader": "^15.7.0",
 		"vue-template-compiler": "^2.6.10",
 		"webpack": "^4.35.3",
-		"webpack-cli": "^3.3.5",
+		"webpack-cli": "^3.3.6",
 		"webpack-merge": "^4.2.1"
 	},
 	"engines": {