Merge branch 'master' into datepicker-5.0-fixes

10 files changed, 53 insertions, 93 deletions

diff --git a/l10n/es.js b/l10n/es.js
index 1ebc116c..3eaf475e 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -38,6 +38,8 @@ OC.L10N.register(
     "Enabled" : "Activado",
     "Disabled" : "Desactivado",
     "Enabled toggle of addressbook was not successful." : "Activar intercambio de agenda no fue posible",
+    "This will delete the addressbook and every contacts within it" : "Esto eliminará la libreta de direcciones y todos los contactos en ella",
+    "Delete {addressbook} ?" : "¿Eliminar {addressbook}?",
     "Deletion of addressbook was not successful." : "No fue posible eliminar la agenda",
     "Renaming of addressbook was not successful." : "No fue posible renombrar la agenda",
     "Addressbook copied to clipboard" : "Agenda copiada al portapapeles",
diff --git a/l10n/es.json b/l10n/es.json
index 348baf89..0a2691b7 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -36,6 +36,8 @@
     "Enabled" : "Activado",
     "Disabled" : "Desactivado",
     "Enabled toggle of addressbook was not successful." : "Activar intercambio de agenda no fue posible",
+    "This will delete the addressbook and every contacts within it" : "Esto eliminará la libreta de direcciones y todos los contactos en ella",
+    "Delete {addressbook} ?" : "¿Eliminar {addressbook}?",
     "Deletion of addressbook was not successful." : "No fue posible eliminar la agenda",
     "Renaming of addressbook was not successful." : "No fue posible renombrar la agenda",
     "Addressbook copied to clipboard" : "Agenda copiada al portapapeles",
diff --git a/l10n/gl.js b/l10n/gl.js
index 587183ba..847f9491 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -25,7 +25,7 @@ OC.L10N.register(
     "The contact doesn't exists anymore on the server." : "O contacto xa non existe no servidor.",
     "Importing {total} contacts into" : "Importando {total} contactos en",
     "Open your browser console for more details" : "Abra a consola do navegador para obter máis detalles",
-    "failed" : "produciuse unha falla",
+    "failed" : "produciuse un fallo",
     "Select type" : "Seleccione o tipo",
     "Select Date" : "Seleccione a data",
     "Add contact in group" : "Engadir contacto en grupo",
diff --git a/l10n/gl.json b/l10n/gl.json
index baffd7c1..4ea01945 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -23,7 +23,7 @@
     "The contact doesn't exists anymore on the server." : "O contacto xa non existe no servidor.",
     "Importing {total} contacts into" : "Importando {total} contactos en",
     "Open your browser console for more details" : "Abra a consola do navegador para obter máis detalles",
-    "failed" : "produciuse unha falla",
+    "failed" : "produciuse un fallo",
     "Select type" : "Seleccione o tipo",
     "Select Date" : "Seleccione a data",
     "Add contact in group" : "Engadir contacto en grupo",
diff --git a/l10n/nl.js b/l10n/nl.js
index 72194da2..7422b18c 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -38,6 +38,8 @@ OC.L10N.register(
     "Enabled" : "Ingeschakeld",
     "Disabled" : "Uitgeschakeld",
     "Enabled toggle of addressbook was not successful." : "Geactiveerde omschakeling van adresboek is mislukt.",
+    "This will delete the addressbook and every contacts within it" : "Dit verwijdert het adresboek en alle contactpersonen daarbinnen",
+    "Delete {addressbook} ?" : "Verwijderen {addressbook} ?",
     "Deletion of addressbook was not successful." : "Verwijderen adresboek is niet gelukt.",
     "Renaming of addressbook was not successful." : "Hernoemen adresboek is niet gelukt.",
     "Addressbook copied to clipboard" : "Adresboek gekopieerd naar het klembord",
diff --git a/l10n/nl.json b/l10n/nl.json
index a3014ee5..12155c3d 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -36,6 +36,8 @@
     "Enabled" : "Ingeschakeld",
     "Disabled" : "Uitgeschakeld",
     "Enabled toggle of addressbook was not successful." : "Geactiveerde omschakeling van adresboek is mislukt.",
+    "This will delete the addressbook and every contacts within it" : "Dit verwijdert het adresboek en alle contactpersonen daarbinnen",
+    "Delete {addressbook} ?" : "Verwijderen {addressbook} ?",
     "Deletion of addressbook was not successful." : "Verwijderen adresboek is niet gelukt.",
     "Renaming of addressbook was not successful." : "Hernoemen adresboek is niet gelukt.",
     "Addressbook copied to clipboard" : "Adresboek gekopieerd naar het klembord",
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index 127252ed..ac2084e1 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -23,8 +23,8 @@ OC.L10N.register(
     "Groups" : "群组",
     "New contact" : "新建联系人",
     "The contact doesn't exists anymore on the server." : "此联系人不再存在于此服务器上。",
-    "Importing {total} contacts into" : "导入{total} 个联系人",
-    "Open your browser console for more details" : "打开浏览器控制台以获取更多详细信",
+    "Importing {total} contacts into" : "导入 {total} 个联系人",
+    "Open your browser console for more details" : "打开浏览器控制台以获取更多详细信息",
     "failed" : "失败了",
     "Select type" : "选择类型",
     "Select Date" : "选择日期",
@@ -35,16 +35,16 @@ OC.L10N.register(
     "Copied" : "已复制",
     "Can not copy" : "无法复制",
     "Rename" : "重命名",
-    "Enabled" : "已开启",
+    "Enabled" : "已启用",
     "Disabled" : "已禁用",
     "Enabled toggle of addressbook was not successful." : "启用切换地址簿未成功。",
     "This will delete the addressbook and every contacts within it" : "这将删除地址簿及其中所有联系人",
-    "Delete {addressbook} ?" : "删除 {addressbook} ?",
+    "Delete {addressbook} ?" : "删除 {addressbook} ？",
     "Deletion of addressbook was not successful." : "未能成功删除地址簿。",
     "Renaming of addressbook was not successful." : "未能成功重命名地址簿。",
     "Addressbook copied to clipboard" : "已复制地址簿到剪切板。",
     "Addressbook was not copied to clipboard." : "地址簿不能成功的复制到剪切板。",
-    "_Shared with {num} entity_::_Shared with {num} entities_" : ["与 {num}个实体共享"],
+    "_Shared with {num} entity_::_Shared with {num} entities_" : ["与 {num} 个实体共享"],
     "Share with users or groups" : "和用户或者组群共享",
     "No users or groups" : "无用户或群组",
     "can edit" : "可编辑",
@@ -52,13 +52,13 @@ OC.L10N.register(
     "Unable to change permissions." : "无法修改权限。",
     "Importing into" : "导入到",
     "Import into" : "导入到",
-    "Importing is disabled because there are no address books available" : "导入已被禁用因为没有可用的地址簿",
+    "Importing is disabled because there are no address books available" : "导入已被禁用，因为没有可用的地址簿",
     "Address book name" : "地址簿名称",
-    "An error occurred, unable to create the addressbook." : "发生了一个错误，地址簿未能成功创建。",
+    "An error occurred, unable to create the addressbook." : "发生了错误，地址簿未能成功创建。",
     "First name" : "名",
     "Last name" : "姓",
     "Display name" : "显示名称",
-    "Sort by {sorting}" : "以{sorting}排序",
+    "Sort by {sorting}" : "以 {sorting} 排序",
     "All contacts" : "全部联系人",
     "Unable to create the contact." : "未能成功创建联系人。",
     "Contact not found" : "未找到联系人",
@@ -69,7 +69,7 @@ OC.L10N.register(
     "Suffix" : "后缀",
     "Notes" : "说明",
     "Website" : "网站",
-    "Federated Cloud ID" : "联合云ID",
+    "Federated Cloud ID" : "联合云 ID",
     "Home" : "家庭",
     "Work" : "工作",
     "Other" : "其它",
@@ -99,7 +99,7 @@ OC.L10N.register(
     "Social network" : "社交网络",
     "The url of the profile. e.g. https://www.facebook.com/Nextclouders/ " : "个人资料网址。例如https://www.facebook.com/NextClouders/",
     "Relationship" : "关系",
-    "Specify a relationship between you and the entity represented by this vCard." : "请描述您和这张vCard上人员的关系",
+    "Specify a relationship between you and the entity represented by this vCard." : "请描述您和这张 vCard 上人员的关系",
     "Spouse" : "配偶",
     "Child" : "子女",
     "Mother" : "母亲",
@@ -113,7 +113,7 @@ OC.L10N.register(
     "Manager" : "经理",
     "Assistant" : "助理",
     "Related" : "相关",
-    "Specify a relationship between another entity and the entity represented by this vCard." : "请描述您和这张vCard上人员的关系",
+    "Specify a relationship between another entity and the entity represented by this vCard." : "请描述您和这张 vCard 上人员的关系。",
     "Contact" : "联系",
     "Agent" : "代理",
     "Emergency" : "紧急",
@@ -122,6 +122,6 @@ OC.L10N.register(
     "Female" : "女性",
     "Male" : "男性",
     "_{failed} contact failed to be read_::_{failed} contacts failed to be read_" : ["{failed} 联系人读取失败"],
-    "An error occurred" : "发生一个错误."
+    "An error occurred" : "发生错误"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 6ba23e9b..4f4004d3 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -21,8 +21,8 @@
     "Groups" : "群组",
     "New contact" : "新建联系人",
     "The contact doesn't exists anymore on the server." : "此联系人不再存在于此服务器上。",
-    "Importing {total} contacts into" : "导入{total} 个联系人",
-    "Open your browser console for more details" : "打开浏览器控制台以获取更多详细信",
+    "Importing {total} contacts into" : "导入 {total} 个联系人",
+    "Open your browser console for more details" : "打开浏览器控制台以获取更多详细信息",
     "failed" : "失败了",
     "Select type" : "选择类型",
     "Select Date" : "选择日期",
@@ -33,16 +33,16 @@
     "Copied" : "已复制",
     "Can not copy" : "无法复制",
     "Rename" : "重命名",
-    "Enabled" : "已开启",
+    "Enabled" : "已启用",
     "Disabled" : "已禁用",
     "Enabled toggle of addressbook was not successful." : "启用切换地址簿未成功。",
     "This will delete the addressbook and every contacts within it" : "这将删除地址簿及其中所有联系人",
-    "Delete {addressbook} ?" : "删除 {addressbook} ?",
+    "Delete {addressbook} ?" : "删除 {addressbook} ？",
     "Deletion of addressbook was not successful." : "未能成功删除地址簿。",
     "Renaming of addressbook was not successful." : "未能成功重命名地址簿。",
     "Addressbook copied to clipboard" : "已复制地址簿到剪切板。",
     "Addressbook was not copied to clipboard." : "地址簿不能成功的复制到剪切板。",
-    "_Shared with {num} entity_::_Shared with {num} entities_" : ["与 {num}个实体共享"],
+    "_Shared with {num} entity_::_Shared with {num} entities_" : ["与 {num} 个实体共享"],
     "Share with users or groups" : "和用户或者组群共享",
     "No users or groups" : "无用户或群组",
     "can edit" : "可编辑",
@@ -50,13 +50,13 @@
     "Unable to change permissions." : "无法修改权限。",
     "Importing into" : "导入到",
     "Import into" : "导入到",
-    "Importing is disabled because there are no address books available" : "导入已被禁用因为没有可用的地址簿",
+    "Importing is disabled because there are no address books available" : "导入已被禁用，因为没有可用的地址簿",
     "Address book name" : "地址簿名称",
-    "An error occurred, unable to create the addressbook." : "发生了一个错误，地址簿未能成功创建。",
+    "An error occurred, unable to create the addressbook." : "发生了错误，地址簿未能成功创建。",
     "First name" : "名",
     "Last name" : "姓",
     "Display name" : "显示名称",
-    "Sort by {sorting}" : "以{sorting}排序",
+    "Sort by {sorting}" : "以 {sorting} 排序",
     "All contacts" : "全部联系人",
     "Unable to create the contact." : "未能成功创建联系人。",
     "Contact not found" : "未找到联系人",
@@ -67,7 +67,7 @@
     "Suffix" : "后缀",
     "Notes" : "说明",
     "Website" : "网站",
-    "Federated Cloud ID" : "联合云ID",
+    "Federated Cloud ID" : "联合云 ID",
     "Home" : "家庭",
     "Work" : "工作",
     "Other" : "其它",
@@ -97,7 +97,7 @@
     "Social network" : "社交网络",
     "The url of the profile. e.g. https://www.facebook.com/Nextclouders/ " : "个人资料网址。例如https://www.facebook.com/NextClouders/",
     "Relationship" : "关系",
-    "Specify a relationship between you and the entity represented by this vCard." : "请描述您和这张vCard上人员的关系",
+    "Specify a relationship between you and the entity represented by this vCard." : "请描述您和这张 vCard 上人员的关系",
     "Spouse" : "配偶",
     "Child" : "子女",
     "Mother" : "母亲",
@@ -111,7 +111,7 @@
     "Manager" : "经理",
     "Assistant" : "助理",
     "Related" : "相关",
-    "Specify a relationship between another entity and the entity represented by this vCard." : "请描述您和这张vCard上人员的关系",
+    "Specify a relationship between another entity and the entity represented by this vCard." : "请描述您和这张 vCard 上人员的关系。",
     "Contact" : "联系",
     "Agent" : "代理",
     "Emergency" : "紧急",
@@ -120,6 +120,6 @@
     "Female" : "女性",
     "Male" : "男性",
     "_{failed} contact failed to be read_::_{failed} contacts failed to be read_" : ["{failed} 联系人读取失败"],
-    "An error occurred" : "发生一个错误."
+    "An error occurred" : "发生错误"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 1fa1ffce..7aa9aab0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9258,9 +9258,9 @@
 			}
 		},
 		"stylelint-scss": {
-			"version": "3.4.4",
-			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.4.4.tgz",
-			"integrity": "sha512-GquwsRegF2gsVRePaUN93cYf9aJDygr03X/QRiwk9O5lOe7QZHlM4Vzrb8JAu+pZ0xodPRpN6W259yA6ApM3WA==",
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.5.0.tgz",
+			"integrity": "sha512-i8YhQd7IWWEacjUGvZycQ16c9NBj+Dbir1UwfQMlK1+5hr7crtxoo4j8TS8RR5ILP6g3bHSn24a8AvKrtFDBlQ==",
 			"dev": true,
 			"requires": {
 				"lodash": "^4.17.11",
@@ -9363,9 +9363,9 @@
 			}
 		},
 		"terser": {
-			"version": "3.13.1",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-3.13.1.tgz",
-			"integrity": "sha512-ogyZye4DFqOtMzT92Y3Nxxw8OvXmL39HOALro4fc+EUYFFF9G/kk0znkvwMz6PPYgBtdKAodh3FPR70eugdaQA==",
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-3.14.1.tgz",
+			"integrity": "sha512-NSo3E99QDbYSMeJaEk9YW2lTg3qS9V0aKGlb+PlOrei1X02r1wSBHCNX/O+yeTRFSWPKPIGj6MqvvdqV4rnVGw==",
 			"dev": true,
 			"requires": {
 				"commander": "~2.17.1",
@@ -9403,54 +9403,6 @@
 				"worker-farm": "^1.5.2"
 			},
 			"dependencies": {
-				"find-cache-dir": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
-					"integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
-					"dev": true,
-					"requires": {
-						"commondir": "^1.0.1",
-						"make-dir": "^1.0.0",
-						"pkg-dir": "^3.0.0"
-					}
-				},
-				"find-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^3.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
-				},
-				"pkg-dir": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-					"dev": true,
-					"requires": {
-						"find-up": "^3.0.0"
-					}
-				},
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -10042,9 +9994,9 @@
 			}
 		},
 		"vue": {
-			"version": "2.5.21",
-			"resolved": "https://registry.npmjs.org/vue/-/vue-2.5.21.tgz",
-			"integrity": "sha512-Aejvyyfhn0zjVeLvXd70h4hrE4zZDx1wfZqia6ekkobLmUZ+vNFQer53B4fu0EjWBSiqApxPejzkO1Znt3joxQ=="
+			"version": "2.5.22",
+			"resolved": "https://registry.npmjs.org/vue/-/vue-2.5.22.tgz",
+			"integrity": "sha512-pxY3ZHlXNJMFQbkjEgGVMaMMkSV1ONpz+4qB55kZuJzyJOhn6MSy/YZdzhdnumegNzVTL/Dn3Pp4UrVBYt1j/g=="
 		},
 		"vue-click-outside": {
 			"version": "1.0.7",
@@ -10162,9 +10114,9 @@
 			}
 		},
 		"vue-template-compiler": {
-			"version": "2.5.21",
-			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.21.tgz",
-			"integrity": "sha512-Vmk5Cv7UcmI99B9nXJEkaK262IQNnHp5rJYo+EwYpe2epTAXqcVyExhV6pk8jTkxQK2vRc8v8KmZBAwdmUZvvw==",
+			"version": "2.5.22",
+			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.22.tgz",
+			"integrity": "sha512-1VTw/NPTUeHNiwhkq6NkFzO7gYLjFCueBN0FX8NEiQIemd5EUMQ5hxrF7O0zCPo5tae+U9S/scETPea+hIz8Eg==",
 			"dev": true,
 			"requires": {
 				"de-indent": "^1.0.2",
@@ -10233,9 +10185,9 @@
 			"dev": true
 		},
 		"webpack": {
-			"version": "4.28.3",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.28.3.tgz",
-			"integrity": "sha512-vLZN9k5I7Nr/XB1IDG9GbZB4yQd1sPuvufMFgJkx0b31fi2LD97KQIjwjxE7xytdruAYfu5S0FLBLjdxmwGJCg==",
+			"version": "4.28.4",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.28.4.tgz",
+			"integrity": "sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==",
 			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.7.11",
diff --git a/package.json b/package.json
index fd977b31..09fb0875 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
 		"p-limit": "^2.1.0",
 		"uuid": "^3.3.2",
 		"v-tooltip": "^2.0.0-rc.33",
-		"vue": "^2.5.21",
+		"vue": "^2.5.22",
 		"vue-click-outside": "^1.0.7",
 		"vue-clipboard2": "^0.2.1",
 		"vue-router": "^3.0.2",
@@ -86,11 +86,11 @@
 		"sass-loader": "^7.1.0",
 		"stylelint": "^8.4.0",
 		"stylelint-config-recommended-scss": "^3.2.0",
-		"stylelint-scss": "^3.4.4",
+		"stylelint-scss": "^3.5.0",
 		"stylelint-webpack-plugin": "^0.10.5",
 		"vue-loader": "^15.5.1",
-		"vue-template-compiler": "^2.5.21",
-		"webpack": "^4.28.3",
+		"vue-template-compiler": "^2.5.22",
+		"webpack": "^4.28.4",
 		"webpack-cli": "^3.2.1",
 		"webpack-merge": "^4.2.1",
 		"webpack-node-externals": "^1.7.2"