diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index afd88010..d828251b 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -91,8 +91,8 @@
"autoFillInfo": {
"message": "There are no logins available to auto-fill for the current browser tab."
},
- "addLogin": {
- "message": "Add a Login"
+ "addItem": {
+ "message": "Add an Item"
},
"passwordHint": {
"message": "Password Hint"
@@ -191,26 +191,25 @@
"message": "bitwarden Web Vault"
},
"bitWebVaultInfo": {
- "message": "Manage your logins from any web browser with the bitwarden web vault."
+ "message": "Manage your items from any web browser with the bitwarden web vault."
},
"bitIosVault": {
"message": "bitwarden iOS Vault"
},
"bitIosVaultInfo": {
- "message": "Manage your logins from your mobile devices with the bitwarden iOS vault."
+ "message": "Manage your items from your mobile devices with the bitwarden iOS vault."
},
"bitAndrVault": {
"message": "bitwarden Android Vault"
},
"bitAndrVaultInfo": {
- "message": "Manage your logins from your mobile devices with the bitwarden Android vault."
+ "message": "Manage your items from your mobile devices with the bitwarden Android vault."
},
- "importLogins": {
- "message": "Import Logins",
- "description": "Import Logins"
+ "importItems": {
+ "message": "Import Items"
},
- "importLoginsInfo": {
- "message": "Quickly bulk import your logins from other password management applications."
+ "importItemsInfo": {
+ "message": "Quickly bulk import your items from other password management applications."
},
"select": {
"message": "Select"
@@ -248,8 +247,8 @@
"noItemsInList": {
"message": "There are no items to list."
},
- "loginInformation": {
- "message": "Login Information"
+ "itemInformation": {
+ "message": "Item Information"
},
"username": {
"message": "Username"
@@ -263,17 +262,17 @@
"notes": {
"message": "Notes"
},
- "editLogin": {
- "message": "Edit Login"
+ "editItem": {
+ "message": "Edit Item"
},
"folder": {
"message": "Folder"
},
- "deleteLogin": {
- "message": "Delete Login"
+ "deleteItem": {
+ "message": "Delete Item"
},
- "viewLogin": {
- "message": "View Login"
+ "viewItem": {
+ "message": "View Item"
},
"launchWebsite": {
"message": "Launch Website"
@@ -379,7 +378,7 @@
"description": "' copied'. This is part of a sentence so be sure to leave the space prefix. For example: 'Password copied'"
},
"autofillError": {
- "message": "Unable to auto-fill the selected login on this page. Copy/paste your username and/or password instead."
+ "message": "Unable to auto-fill the selected item on this page. Copy and paste the information instead."
},
"loggedOut": {
"message": "Logged out"
@@ -444,8 +443,8 @@
"syncingFailed": {
"message": "Syncing failed"
},
- "importLoginsConfirmation": {
- "message": "You can bulk import logins from the bitwarden.com web vault. Do you want to visit the website now?"
+ "importItemsConfirmation": {
+ "message": "You can bulk import items from the bitwarden.com web vault. Do you want to visit the website now?"
},
"passwordCopied": {
"message": "Password copied"
@@ -453,17 +452,17 @@
"uri": {
"message": "URI"
},
- "addedLogin": {
- "message": "Added login"
+ "addedItem": {
+ "message": "Added item"
},
- "editedLogin": {
- "message": "Edited login"
+ "editedItem": {
+ "message": "Edited item"
},
- "deleteLoginConfirmation": {
- "message": "Are you sure you want to delete this login?"
+ "deleteItemConfirmation": {
+ "message": "Are you sure you want to delete this item?"
},
- "deletedLogin": {
- "message": "Deleted login"
+ "deletedItem": {
+ "message": "Deleted item"
},
"overwritePassword": {
"message": "Overwrite Password"
@@ -485,7 +484,7 @@
},
"noneFolder": {
"message": "No Folder",
- "description": "This is the folder for uncategorized logins"
+ "description": "This is the folder for uncategorized items"
},
"features": {
"message": "Features"
@@ -537,7 +536,7 @@
"message": "Share Your Vault"
},
"shareVaultInfo": {
- "message": "Create an organization to securely share your logins with other users."
+ "message": "Create an organization to securely share your items with other users."
},
"contribute": {
"message": "You can contribute too!"
diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index ce0f687f..c4ef4fbe 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -22,7 +22,7 @@
{{i18n.autoFillInfo}}
-
+
diff --git a/src/popup/app/tools/toolsController.js b/src/popup/app/tools/toolsController.js
index 798c96b3..c40f71e4 100644
--- a/src/popup/app/tools/toolsController.js
+++ b/src/popup/app/tools/toolsController.js
@@ -21,8 +21,8 @@
$scope.launchImport = function () {
SweetAlert.swal({
- title: i18nService.importLogins,
- text: i18nService.importLoginsConfirmation,
+ title: i18nService.importItems,
+ text: i18nService.importItemsConfirmation,
showCancelButton: true,
confirmButtonText: i18nService.yes,
cancelButtonText: i18nService.cancel
diff --git a/src/popup/app/tools/views/tools.html b/src/popup/app/tools/views/tools.html
index 291fa22c..cbe0acbb 100644
--- a/src/popup/app/tools/views/tools.html
+++ b/src/popup/app/tools/views/tools.html
@@ -35,8 +35,8 @@
- {{i18n.importLogins}}
- {{i18n.importLoginsInfo}}
+ {{i18n.importItems}}
+ {{i18n.importItemsInfo}}
diff --git a/src/popup/app/vault/vaultAddCipherController.js b/src/popup/app/vault/vaultAddCipherController.js
index ddcd9e3f..40609174 100644
--- a/src/popup/app/vault/vaultAddCipherController.js
+++ b/src/popup/app/vault/vaultAddCipherController.js
@@ -56,7 +56,7 @@
return cipherService.saveWithServer(cipher);
}).then(function (c) {
$analytics.eventTrack('Added Cipher');
- toastr.success(i18nService.addedLogin);
+ toastr.success(i18nService.addedItem);
$scope.close();
});
};
diff --git a/src/popup/app/vault/vaultAttachmentsController.js b/src/popup/app/vault/vaultAttachmentsController.js
index 456b3129..40384803 100644
--- a/src/popup/app/vault/vaultAttachmentsController.js
+++ b/src/popup/app/vault/vaultAttachmentsController.js
@@ -113,7 +113,7 @@ angular
};
$scope.close = function () {
- $state.go('editLogin', {
+ $state.go('editCipher', {
loginId: $stateParams.id,
animation: 'out-slide-down',
from: $stateParams.from,
diff --git a/src/popup/app/vault/vaultEditCipherController.js b/src/popup/app/vault/vaultEditCipherController.js
index bd1da80e..ea31d3b0 100644
--- a/src/popup/app/vault/vaultEditCipherController.js
+++ b/src/popup/app/vault/vaultEditCipherController.js
@@ -50,7 +50,7 @@ angular
var cipher = new Cipher(cipherModel, true);
return cipherService.saveWithServer(cipher).then(function (c) {
$analytics.eventTrack('Edited Cipher');
- toastr.success(i18nService.editedLogin);
+ toastr.success(i18nService.editedItem);
$scope.close();
});
});
@@ -58,8 +58,8 @@ angular
$scope.delete = function () {
SweetAlert.swal({
- title: i18nService.deleteLogin,
- text: i18nService.deleteLoginConfirmation,
+ title: i18nService.deleteItem,
+ text: i18nService.deleteItemConfirmation,
showCancelButton: true,
confirmButtonText: i18nService.yes,
cancelButtonText: i18nService.no
@@ -67,7 +67,7 @@ angular
if (confirmed) {
cipherService.deleteWithServer(cipherId).then(function () {
$analytics.eventTrack('Deleted Cipher');
- toastr.success(i18nService.deletedLogin);
+ toastr.success(i18nService.deletedItem);
$state.go('tabs.vault', {
animation: 'out-slide-down'
});
diff --git a/src/popup/app/vault/vaultViewFolderController.js b/src/popup/app/vault/vaultViewFolderController.js
index f3261add..b09e135c 100644
--- a/src/popup/app/vault/vaultViewFolderController.js
+++ b/src/popup/app/vault/vaultViewFolderController.js
@@ -151,7 +151,7 @@
$scope.addCipher = function () {
storeState();
- $state.go('addLogin', {
+ $state.go('addCipher', {
animation: 'in-slide-up',
from: 'folder',
folderId: $scope.folder.id
@@ -175,7 +175,7 @@
}
storeState();
- $state.go('viewLogin', {
+ $state.go('viewCipher', {
cipherId: cipher.id,
animation: 'in-slide-up',
from: 'folder'
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index e8ee92ff..86dea1fd 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -76,7 +76,7 @@
{{i18n.noItemsInList}}
-
+
diff --git a/src/popup/app/vault/views/vaultAddCipher.html b/src/popup/app/vault/views/vaultAddCipher.html
index 10e2d5e8..a62afd96 100644
--- a/src/popup/app/vault/views/vaultAddCipher.html
+++ b/src/popup/app/vault/views/vaultAddCipher.html
@@ -7,13 +7,13 @@
- {{i18n.addLogin}}
+ {{i18n.addItem}}
diff --git a/src/popup/app/vault/views/vaultEditCipher.html b/src/popup/app/vault/views/vaultEditCipher.html
index c04a4d54..3105803d 100644
--- a/src/popup/app/vault/views/vaultEditCipher.html
+++ b/src/popup/app/vault/views/vaultEditCipher.html
@@ -7,13 +7,13 @@
-
{{i18n.editLogin}}
+
{{i18n.editItem}}
@@ -262,7 +262,7 @@
diff --git a/src/popup/app/vault/views/vaultViewCipher.html b/src/popup/app/vault/views/vaultViewCipher.html
index 412131cd..6ad47ff9 100644
--- a/src/popup/app/vault/views/vaultViewCipher.html
+++ b/src/popup/app/vault/views/vaultViewCipher.html
@@ -5,13 +5,13 @@
-
{{i18n.viewLogin}}
+
{{i18n.viewItem}}
diff --git a/src/popup/app/vault/views/vaultViewFolder.html b/src/popup/app/vault/views/vaultViewFolder.html
index da91ed6f..7d5a846d 100644
--- a/src/popup/app/vault/views/vaultViewFolder.html
+++ b/src/popup/app/vault/views/vaultViewFolder.html
@@ -37,7 +37,7 @@
{{i18n.noItemsInList}}
-
+