From 7ae43906099060d416ec78d1b1f237ed9f9cfe7f Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 29 Nov 2016 21:05:26 -0500
Subject: [PATCH] remove bad errorsHaveOccurred string from locales

---
 src/_locales/de/messages.json        | 4 ----
 src/_locales/en/messages.json        | 4 ----
 src/_locales/fi/messages.json        | 4 ----
 src/_locales/fr/messages.json        | 4 ----
 src/_locales/nl/messages.json        | 4 ----
 src/_locales/ru/messages.json        | 4 ----
 src/_locales/zh_CN/messages.json     | 4 ----
 src/popup/app/lock/lockController.js | 2 +-
 8 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json
index f31ddce2243..ef50a8e22b9 100644
--- a/src/_locales/de/messages.json
+++ b/src/_locales/de/messages.json
@@ -395,10 +395,6 @@
     "message": "Ungültiges Master-Passwort",
     "description": "Invalid master password"
   },
-  "errorsHaveOccurred": {
-    "message": "Ungültiges Master-Passwort",
-    "description": "Invalid master password"
-  },
   "lockOptions": {
     "message": "Sperroptionen",
     "description": "Lock Options"
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 4f1b297ee54..20a17c560e8 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -395,10 +395,6 @@
     "message": "Invalid master password",
     "description": "Invalid master password"
   },
-  "errorsHaveOccurred": {
-    "message": "Invalid master password",
-    "description": "Invalid master password"
-  },
   "lockOptions": {
     "message": "Lock Options",
     "description": "Lock Options"
diff --git a/src/_locales/fi/messages.json b/src/_locales/fi/messages.json
index db556008989..c948d56a46d 100644
--- a/src/_locales/fi/messages.json
+++ b/src/_locales/fi/messages.json
@@ -395,10 +395,6 @@
     "message": "Virheellinen pääsalasana",
     "description": "Invalid master password"
   },
-  "errorsHaveOccurred": {
-    "message": "Virheellinen pääsalasana",
-    "description": "Invalid master password"
-  },
   "lockOptions": {
     "message": "Lukitseminen",
     "description": "Lock Options"
diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json
index 047b7e5fc74..96343d1eee9 100644
--- a/src/_locales/fr/messages.json
+++ b/src/_locales/fr/messages.json
@@ -395,10 +395,6 @@
     "message": "Mot de passe maître invalide",
     "description": "Invalid master password"
   },
-  "errorsHaveOccurred": {
-    "message": "Mot de passe maître invalide",
-    "description": "Invalid master password"
-  },
   "lockOptions": {
     "message": "Options de verrouillage",
     "description": "Lock Options"
diff --git a/src/_locales/nl/messages.json b/src/_locales/nl/messages.json
index dd9b02cc383..59a414de4c6 100644
--- a/src/_locales/nl/messages.json
+++ b/src/_locales/nl/messages.json
@@ -395,10 +395,6 @@
     "message": "Ongeldig hoofdwachtwoord",
     "description": "Invalid master password"
   },
-  "errorsHaveOccurred": {
-    "message": "Ongeldig hoofdwachtwoord",
-    "description": "Invalid master password"
-  },
   "lockOptions": {
     "message": "Versleutelopties",
     "description": "Lock Options"
diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json
index fd1a83bc69b..7a4ea8425fb 100644
--- a/src/_locales/ru/messages.json
+++ b/src/_locales/ru/messages.json
@@ -395,10 +395,6 @@
     "message": "Неверный мастер-пароль",
     "description": "Invalid master password"
   },
-  "errorsHaveOccurred": {
-    "message": "Неверный мастер-пароль",
-    "description": "Invalid master password"
-  },
   "lockOptions": {
     "message": "Настройки блокировки",
     "description": "Lock Options"
diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json
index d3a978f80c6..6ed413fdb11 100644
--- a/src/_locales/zh_CN/messages.json
+++ b/src/_locales/zh_CN/messages.json
@@ -395,10 +395,6 @@
     "message": "无效的主密码",
     "description": "Invalid master password"
   },
-  "errorsHaveOccurred": {
-    "message": "无效的主密码",
-    "description": "Invalid master password"
-  },
   "lockOptions": {
     "message": "锁定选项",
     "description": "Lock Options"
diff --git a/src/popup/app/lock/lockController.js b/src/popup/app/lock/lockController.js
index c6204cca64e..fc77ebb5620 100644
--- a/src/popup/app/lock/lockController.js
+++ b/src/popup/app/lock/lockController.js
@@ -35,7 +35,7 @@
                             });
                         }
                         else {
-                            toastr.error(i18nService.invalidMasterPassword, i18nService.errorsHaveOccurred);
+                            toastr.error(i18nService.invalidMasterPassword, i18nService.errorsOccurred);
                         }
                     });
                 });