From d4e93558a0b160f42577fbe599da6ba1ff7da8a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Fri, 5 Oct 2018 07:34:56 +0200
Subject: [PATCH] Npm update, cdav and translations fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 package-lock.json                               | 9 +++++----
 package.json                                    | 2 +-
 src/components/Settings/SettingsAddressbook.vue | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dda839b26..6b11c5bf7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "contacts",
-	"version": "3.0.0",
+	"version": "3.0.0-beta1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -4008,9 +4008,10 @@
 			"dev": true
 		},
 		"cdav-library": {
-			"version": "github:nextcloud/cdav-library#f2babab16d5aca301cad56bf34128a17323250d7",
-			"from": "github:nextcloud/cdav-library#develop",
+			"version": "github:nextcloud/cdav-library#9582bee0d9d26ea18bc2bae55fc6f3d1e370f8c0",
+			"from": "github:nextcloud/cdav-library",
 			"requires": {
+				"@babel/polyfill": "^7.0.0",
 				"compare-urls": "^2.0.0",
 				"davclient.js": "git+https://github.com/owncloud/davclient.js.git#0e5ef1af5d174d9ec10dbe889a415b8f481d5094",
 				"normalize-url": "^3.3.0"
@@ -4433,7 +4434,7 @@
 				},
 				"query-string": {
 					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+					"resolved": "http://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
 					"integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
 					"requires": {
 						"decode-uri-component": "^0.2.0",
diff --git a/package.json b/package.json
index f493bf8f3..040585aac 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
 	"dependencies": {
 		"@babel/polyfill": "^7.0.0",
 		"axios": "^0.18.0",
-		"cdav-library": "github:nextcloud/cdav-library#develop",
+		"cdav-library": "github:nextcloud/cdav-library",
 		"debounce": "^1.2.0",
 		"ical.js": "^1.2.2",
 		"moment": "^2.22.2",
diff --git a/src/components/Settings/SettingsAddressbook.vue b/src/components/Settings/SettingsAddressbook.vue
index d4dd72d25..cff0c24bc 100644
--- a/src/components/Settings/SettingsAddressbook.vue
+++ b/src/components/Settings/SettingsAddressbook.vue
@@ -184,7 +184,7 @@ export default {
 				} catch (err) {
 					// error handling
 					console.error(err)
-					OC.Notification.showTemporary(t('contacts', 'Delete addressbook was not successful.'))
+					OC.Notification.showTemporary(t('contacts', 'Deletion of addressbook was not successful.'))
 				} finally {
 					// stop loading status regardless of outcome
 					this.deleteAddressbookLoading = false