diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 25e172a6..370f990e 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1,7 +1,6 @@
 {
   "appName": {
-    "message": "bitwarden",
-    "description": "bitwarden"
+    "message": "bitwarden"
   },
   "extName": {
     "message": "bitwarden - Free Password Manager",
@@ -12,839 +11,698 @@
     "description": "Extension description"
   },
   "loginOrCreateNewAccount": {
-    "message": "Log in or create a new account to access your secure vault.",
-    "description": "Log in or create a new account to access your secure vault."
+    "message": "Log in or create a new account to access your secure vault."
   },
   "createAccount": {
-    "message": "Create Account",
-    "description": "Create Account"
+    "message": "Create Account"
   },
   "login": {
-    "message": "Log In",
-    "description": "Log In"
+    "message": "Log In"
   },
   "cancel": {
-    "message": "Cancel",
-    "description": "Cancel"
+    "message": "Cancel"
   },
   "close": {
-    "message": "Close",
-    "description": "Close"
+    "message": "Close"
   },
   "submit": {
-    "message": "Submit",
-    "description": "Submit"
+    "message": "Submit"
   },
   "emailAddress": {
-    "message": "Email Address",
-    "description": "Email Address"
+    "message": "Email Address"
   },
   "masterPass": {
-    "message": "Master Password",
-    "description": "Master Password"
+    "message": "Master Password"
   },
   "masterPassDesc": {
-    "message": "The master password is the password you use to access your vault. It is very important that you do not forget your master password. There is no way to recover the password in the event that you forget it.",
-    "description": "The master password is the password you use to access your vault. It is very important that you do not forget your master password. There is no way to recover the password in the event that you forget it."
+    "message": "The master password is the password you use to access your vault. It is very important that you do not forget your master password. There is no way to recover the password in the event that you forget it."
   },
   "masterPassHintDesc": {
-    "message": "A master password hint can help you remember your password if you forget it.",
-    "description": "A master password hint can help you remember your password if you forget it."
+    "message": "A master password hint can help you remember your password if you forget it."
   },
   "reTypeMasterPass": {
-    "message": "Re-type Master Password",
-    "description": "Re-type Master Password"
+    "message": "Re-type Master Password"
   },
   "masterPassHint": {
-    "message": "Master Password Hint (optional)",
-    "description": "Master Password Hint (optional)"
+    "message": "Master Password Hint (optional)"
   },
   "tab": {
-    "message": "Tab",
-    "description": "Tab"
+    "message": "Tab"
   },
   "myVault": {
-    "message": "My Vault",
-    "description": "My Vault"
+    "message": "My Vault"
   },
   "tools": {
-    "message": "Tools",
-    "description": "Tools"
+    "message": "Tools"
   },
   "settings": {
-    "message": "Settings",
-    "description": "Settings"
+    "message": "Settings"
   },
   "currentTab": {
-    "message": "Current Tab",
-    "description": "Current Tab"
+    "message": "Current Tab"
   },
   "copyPassword": {
-    "message": "Copy Password",
-    "description": "Copy Password"
+    "message": "Copy Password"
   },
   "copyUsername": {
-    "message": "Copy Username",
-    "description": "Copy Username"
+    "message": "Copy Username"
   },
   "autoFill": {
-    "message": "Auto-fill",
-    "description": "Auto-fill"
+    "message": "Auto-fill"
   },
   "generatePasswordCopied": {
-    "message": "Generate Password (copied)",
-    "description": "Generate Password (copied)"
+    "message": "Generate Password (copied)"
   },
   "noMatchingLogins": {
-    "message": "No matching logins.",
-    "description": "No matching logins."
+    "message": "No matching logins."
   },
   "vaultLocked": {
-    "message": "Vault is locked.",
-    "description": "Vault is locked."
+    "message": "Vault is locked."
   },
   "autoFillInfo": {
-    "message": "There are no logins available to auto-fill for the current browser tab.",
-    "description": "There are no logins available to auto-fill for the current browser tab."
+    "message": "There are no logins available to auto-fill for the current browser tab."
   },
   "addLogin": {
-    "message": "Add a Login",
-    "description": "Add a Login"
+    "message": "Add a Login"
   },
   "passwordHint": {
-    "message": "Password Hint",
-    "description": "Password Hint"
+    "message": "Password Hint"
   },
   "enterEmailToGetHint": {
-    "message": "Enter your account email address to receive your master password hint.",
-    "description": "Enter your account email address to receive your master password hint."
+    "message": "Enter your account email address to receive your master password hint."
   },
   "getMasterPasswordHint": {
-    "message": "Get master password hint",
-    "description": "Get master password hint"
+    "message": "Get master password hint"
   },
   "continue": {
-    "message": "Continue",
-    "description": "Continue"
+    "message": "Continue"
   },
   "verificationCode": {
-    "message": "Verification Code",
-    "description": "Verification Code"
+    "message": "Verification Code"
   },
   "account": {
-    "message": "Account",
-    "description": "Account"
+    "message": "Account"
   },
   "changeMasterPassword": {
-    "message": "Change Master Password",
-    "description": "Change Master Password"
+    "message": "Change Master Password"
   },
   "changeEmail": {
-    "message": "Change Email",
-    "description": "Change Email"
+    "message": "Change Email"
   },
   "twoStepLogin": {
-    "message": "Two-step Login",
-    "description": "Two-step Login"
+    "message": "Two-step Login"
   },
   "logOut": {
-    "message": "Log Out",
-    "description": "Log Out"
+    "message": "Log Out"
   },
   "about": {
-    "message": "About",
-    "description": "About"
+    "message": "About"
   },
   "version": {
-    "message": "Version",
-    "description": "Version"
+    "message": "Version"
   },
   "save": {
-    "message": "Save",
-    "description": "Save"
+    "message": "Save"
   },
   "addFolder": {
-    "message": "Add Folder",
-    "description": "Add Folder"
+    "message": "Add Folder"
   },
   "name": {
-    "message": "Name",
-    "description": "Name"
+    "message": "Name"
   },
   "editFolder": {
-    "message": "Edit Folder",
-    "description": "Edit Folder"
+    "message": "Edit Folder"
   },
   "deleteFolder": {
-    "message": "Delete Folder",
-    "description": "Delete Folder"
+    "message": "Delete Folder"
   },
   "folders": {
-    "message": "Folders",
-    "description": "Folders"
+    "message": "Folders"
   },
   "noFolders": {
-    "message": "There are no folders to list.",
-    "description": "There are no folders to list."
+    "message": "There are no folders to list."
   },
   "helpFeedback": {
-    "message": "Help & Feedback",
-    "description": "Help & Feedback"
+    "message": "Help & Feedback"
   },
   "emailUs": {
-    "message": "Email Us",
-    "description": "Email Us"
+    "message": "Email Us"
   },
   "emailUsDirectly": {
-    "message": "Email us directly to get help or leave feedback.",
-    "description": "Email us directly to get help or leave feedback."
+    "message": "Email us directly to get help or leave feedback."
   },
   "visitOurWebsite": {
-    "message": "Visit Our Website",
-    "description": "Visit Our Website"
+    "message": "Visit Our Website"
   },
   "visitOurWebsiteDirectly": {
-    "message": "Visit our website to get help, news, email us, and/or learn more about how to use bitwarden.",
-    "description": "Visit our website to get help, news, email us, and/or learn more about how to use bitwarden."
+    "message": "Visit our website to get help, news, email us, and/or learn more about how to use bitwarden."
   },
   "fileBugReport": {
-    "message": "File a Bug Report",
-    "description": "File a Bug Report"
+    "message": "File a Bug Report"
   },
   "gitHubIssue": {
-    "message": "Open an issue at our GitHub repository.",
-    "description": "Open an issue at our GitHub repository."
+    "message": "Open an issue at our GitHub repository."
   },
   "sync": {
-    "message": "Sync",
-    "description": "Sync"
+    "message": "Sync"
   },
   "syncVaultNow": {
-    "message": "Sync Vault Now",
-    "description": "Sync Vault Now"
+    "message": "Sync Vault Now"
   },
   "lastSync": {
-    "message": "Last Sync:",
-    "description": "Last Sync:"
+    "message": "Last Sync:"
   },
   "passGen": {
-    "message": "Password Generator",
-    "description": "Password Generator"
+    "message": "Password Generator"
   },
   "passGenInfo": {
-    "message": "Automatically generate strong, unique passwords for your logins.",
-    "description": "Automatically generate strong, unique passwords for your logins."
+    "message": "Automatically generate strong, unique passwords for your logins."
   },
   "bitWebVault": {
-    "message": "bitwarden Web Vault",
-    "description": "bitwarden Web Vault"
+    "message": "bitwarden Web Vault"
   },
   "bitWebVaultInfo": {
-    "message": "Manage your logins from any web browser with the bitwarden web vault.",
-    "description": "Manage your logins from any web browser with the bitwarden web vault."
+    "message": "Manage your logins from any web browser with the bitwarden web vault."
   },
   "bitIosVault": {
-    "message": "bitwarden iOS Vault",
-    "description": "bitwarden iOS Vault"
+    "message": "bitwarden iOS Vault"
   },
   "bitIosVaultInfo": {
-    "message": "Manage your logins from your mobile devices with the bitwarden iOS vault.",
-    "description": "Manage your logins from your mobile devices with the bitwarden iOS vault."
+    "message": "Manage your logins from your mobile devices with the bitwarden iOS vault."
   },
   "bitAndrVault": {
-    "message": "bitwarden Android Vault",
-    "description": "bitwarden Android Vault"
+    "message": "bitwarden Android Vault"
   },
   "bitAndrVaultInfo": {
-    "message": "Manage your logins from your mobile devices with the bitwarden Android vault.",
-    "description": "Manage your logins from your mobile devices with the bitwarden Android vault."
+    "message": "Manage your logins from your mobile devices with the bitwarden Android vault."
   },
   "importLogins": {
     "message": "Import Logins",
     "description": "Import Logins"
   },
   "importLoginsInfo": {
-    "message": "Quickly bulk import your logins from other password management applications.",
-    "description": "Quickly bulk import your logins from other password management applications."
+    "message": "Quickly bulk import your logins from other password management applications."
   },
   "select": {
-    "message": "Select",
-    "description": "Select"
+    "message": "Select"
   },
   "generatePassword": {
-    "message": "Generate Password",
-    "description": "Generate Password"
+    "message": "Generate Password"
   },
   "regeneratePassword": {
-    "message": "Regenerate Password",
-    "description": "Regenerate Password"
+    "message": "Regenerate Password"
   },
   "options": {
-    "message": "Options",
-    "description": "Options"
+    "message": "Options"
   },
   "length": {
-    "message": "Length",
-    "description": "Length"
+    "message": "Length"
   },
   "minNumbers": {
-    "message": "Minimum Numbers",
-    "description": "Minimum Numbers"
+    "message": "Minimum Numbers"
   },
   "minSpecial": {
-    "message": "Minimum Special",
-    "description": "Minimum Special"
+    "message": "Minimum Special"
   },
   "avoidAmbChar": {
-    "message": "Avoid Ambiguous Characters",
-    "description": "Avoid Ambiguous Characters"
+    "message": "Avoid Ambiguous Characters"
   },
   "searchVault": {
-    "message": "Search vault",
-    "description": "Search vault"
+    "message": "Search vault"
   },
   "edit": {
-    "message": "Edit",
-    "description": "Edit"
+    "message": "Edit"
   },
   "noLoginsInList": {
-    "message": "There are no logins to list.",
-    "description": "There are no logins to list."
+    "message": "There are no logins to list."
   },
   "loginInformation": {
-    "message": "Login Information",
-    "description": "Login Information"
+    "message": "Login Information"
   },
   "username": {
-    "message": "Username",
-    "description": "Username"
+    "message": "Username"
   },
   "password": {
-    "message": "Password",
-    "description": "Password"
+    "message": "Password"
   },
   "favorite": {
-    "message": "Favorite",
-    "description": "Favorite"
+    "message": "Favorite"
   },
   "notes": {
-    "message": "Notes",
-    "description": "Notes"
+    "message": "Notes"
   },
   "editLogin": {
-    "message": "Edit Login",
-    "description": "Edit Login"
+    "message": "Edit Login"
   },
   "folder": {
-    "message": "Folder",
-    "description": "Folder"
+    "message": "Folder"
   },
   "deleteLogin": {
-    "message": "Delete Login",
-    "description": "Delete Login"
+    "message": "Delete Login"
   },
   "viewLogin": {
-    "message": "View Login",
-    "description": "View Login"
+    "message": "View Login"
   },
   "launchWebsite": {
-    "message": "Launch Website",
-    "description": "Launch Website"
+    "message": "Launch Website"
   },
   "website": {
-    "message": "Website",
-    "description": "Website"
+    "message": "Website"
   },
   "togglePassword": {
-    "message": "Toggle Password",
-    "description": "Toggle Password"
+    "message": "Toggle Password"
   },
   "manage": {
-    "message": "Manage",
-    "description": "Manage"
+    "message": "Manage"
   },
   "other": {
-    "message": "Other",
-    "description": "Other"
+    "message": "Other"
   },
   "disableGa": {
-    "message": "Disable Analytics",
-    "description": "Disable Analytics"
+    "message": "Disable Analytics"
   },
   "rateExtension": {
-    "message": "Rate the Extension",
-    "description": "Rate the Extension"
+    "message": "Rate the Extension"
   },
   "rateExtensionDesc": {
-    "message": "Please consider helping us out with a good review!",
-    "description": "Please consider helping us out with a good review!"
+    "message": "Please consider helping us out with a good review!"
   },
   "browserNotSupportClipboard": {
-    "message": "Your web browser does not support easy clipboard copying. Copy it manually instead.",
-    "description": "Your web browser does not support easy clipboard copying. Copy it manually instead."
+    "message": "Your web browser does not support easy clipboard copying. Copy it manually instead."
   },
   "verifyMasterPassword": {
-    "message": "Verify Master Password",
-    "description": "Verify Master Password"
+    "message": "Verify Master Password"
   },
   "invalidMasterPassword": {
-    "message": "Invalid master password",
-    "description": "Invalid master password"
+    "message": "Invalid master password"
   },
   "lockOptions": {
-    "message": "Lock Options",
-    "description": "Lock Options"
+    "message": "Lock Options"
   },
   "lockNow": {
-    "message": "Lock Now",
-    "description": "Lock Now"
+    "message": "Lock Now"
   },
   "immediately": {
-    "message": "Immediately",
-    "description": "Immediately"
+    "message": "Immediately"
   },
   "oneMinute": {
-    "message": "1 minute",
-    "description": "1 minute"
+    "message": "1 minute"
   },
   "fiveMinutes": {
-    "message": "5 minutes",
-    "description": "5 minutes"
+    "message": "5 minutes"
   },
   "fifteenMinutes": {
-    "message": "15 minutes",
-    "description": "15 minutes"
+    "message": "15 minutes"
   },
   "thirtyMinutes": {
-    "message": "30 minutes",
-    "description": "30 minutes"
+    "message": "30 minutes"
   },
   "oneHour": {
-    "message": "1 hour",
-    "description": "1 hour"
+    "message": "1 hour"
   },
   "fourHours": {
-    "message": "4 hours",
-    "description": "4 hours"
+    "message": "4 hours"
   },
   "onLocked": {
-    "message": "On Locked",
-    "description": "On Locked"
+    "message": "On Lock"
   },
   "onRestart": {
-    "message": "On Restart",
-    "description": "On Restart"
+    "message": "On Restart"
   },
   "never": {
-    "message": "Never",
-    "description": "Never"
+    "message": "Never"
   },
   "security": {
-    "message": "Security",
-    "description": "Security"
+    "message": "Security"
   },
   "errorsOccurred": {
-    "message": "Errors have occurred",
-    "description": "Errors have occurred"
+    "message": "Errors have occurred"
   },
   "emailRequired": {
-    "message": "Email address is required.",
-    "description": "Email address is required."
+    "message": "Email address is required."
   },
   "invalidEmail": {
-    "message": "Invalid email address.",
-    "description": "Invalid email address."
+    "message": "Invalid email address."
   },
   "masterPassRequired": {
-    "message": "Master password is required.",
-    "description": "Master password is required."
+    "message": "Master password is required."
   },
   "masterPassLength": {
-    "message": "Master password must be at least 8 characters long.",
-    "description": "Master password must be at least 8 characters long."
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
-    "message": "Master password confirmation does not match.",
-    "description": "Master password confirmation does not match."
+    "message": "Master password confirmation does not match."
   },
   "newAccountCreated": {
-    "message": "Your new account has been created! You may now log in.",
-    "description": "Your new account has been created! You may now log in."
+    "message": "Your new account has been created! You may now log in."
   },
   "masterPassSent": {
-    "message": "We've sent you an email with your master password hint.",
-    "description": "We've sent you an email with your master password hint."
+    "message": "We've sent you an email with your master password hint."
   },
   "verificationCodeRequired": {
-    "message": "Verification code is required.",
-    "description": "Verification code is required."
+    "message": "Verification code is required."
   },
   "valueCopied": {
     "message": " copied",
     "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.",
-    "description": "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 login on this page. Copy/paste your username and/or password instead."
   },
   "loggedOut": {
-    "message": "Logged out",
-    "description": "Logged out"
+    "message": "Logged out"
   },
   "loginExpired": {
-    "message": "Your login session has expired.",
-    "description": "Your login session has expired."
+    "message": "Your login session has expired."
   },
   "logOutConfirmation": {
-    "message": "Are you sure you want to log out?",
-    "description": "Are you sure you want to log out?"
+    "message": "Are you sure you want to log out?"
   },
   "yes": {
-    "message": "Yes",
-    "description": "Yes"
+    "message": "Yes"
   },
   "no": {
-    "message": "No",
-    "description": "No"
+    "message": "No"
   },
   "unexpectedError": {
-    "message": "An unexpected error has occured.",
-    "description": "An unexpected error has occured."
+    "message": "An unexpected error has occured."
   },
   "nameRequired": {
-    "message": "Name is required.",
-    "description": "Name is required."
+    "message": "Name is required."
   },
   "addedFolder": {
-    "message": "Added folder",
-    "description": "Added folder"
+    "message": "Added folder"
   },
   "changeMasterPass": {
-    "message": "Change Master Password",
-    "description": "Change Master Password"
+    "message": "Change Master Password"
   },
   "changeMasterPasswordConfirmation": {
-    "message": "You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?",
-    "description": "You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?"
   },
   "changeEmailConfirmation": {
-    "message": "You can change your email address on the bitwarden.com web vault. Do you want to visit the website now?",
-    "description": "You can change your email address on the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "You can change your email address on the bitwarden.com web vault. Do you want to visit the website now?"
   },
   "twoStepLoginConfirmation": {
-    "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?",
-    "description": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?"
   },
   "loggingOut": {
-    "message": "Logging out",
-    "description": "Logging out"
+    "message": "Logging out"
   },
   "loggingOutConfirmation": {
-    "message": "You've recently updated from an older version. You must re-log in to change your lock options. Do you want to log out now?",
-    "description": "You've recently updated from an older version. You must re-log in to change your lock options. Do you want to log out now?"
+    "message": "You've recently updated from an older version. You must re-log in to change your lock options. Do you want to log out now?"
   },
   "editedFolder": {
-    "message": "Edited Folder",
-    "description": "Edited Folder"
+    "message": "Edited Folder"
   },
   "deleteFolderConfirmation": {
-    "message": "Are you sure you want to delete this folder?",
-    "description": "Are you sure you want to delete this folder?"
+    "message": "Are you sure you want to delete this folder?"
   },
   "deletedFolder": {
-    "message": "Deleted folder",
-    "description": "Deleted folder"
+    "message": "Deleted folder"
   },
   "gettingStartedTutorial": {
-    "message": "Getting Started Tutorial",
-    "description": "Getting Started Tutorial"
+    "message": "Getting Started Tutorial"
   },
   "gettingStartedTutorialVideo": {
-    "message": "Watch our getting started tutorial to learn how to get the most out of the browser extension.",
-    "description": "Watch our getting started tutorial to learn how to get the most out of the browser extension."
+    "message": "Watch our getting started tutorial to learn how to get the most out of the browser extension."
   },
   "syncingComplete": {
-    "message": "Syncing complete",
-    "description": "Syncing complete"
+    "message": "Syncing complete"
   },
   "importLoginsConfirmation": {
-    "message": "You can bulk import logins from the bitwarden.com web vault. Do you want to visit the website now?",
-    "description": "You can bulk import logins from the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "You can bulk import logins from the bitwarden.com web vault. Do you want to visit the website now?"
   },
   "passwordCopied": {
-    "message": "Password copied",
-    "description": "Password copied"
+    "message": "Password copied"
   },
   "uri": {
-    "message": "URI",
-    "description": "URI"
+    "message": "URI"
   },
   "addedLogin": {
-    "message": "Added login",
-    "description": "Added login"
+    "message": "Added login"
   },
   "editedLogin": {
-    "message": "Edited login",
-    "description": "Edited login"
+    "message": "Edited login"
   },
   "deleteLoginConfirmation": {
-    "message": "Are you sure you want to delete this login?",
-    "description": "Are you sure you want to delete this login?"
+    "message": "Are you sure you want to delete this login?"
   },
   "deletedLogin": {
-    "message": "Deleted login",
-    "description": "Deleted login"
+    "message": "Deleted login"
   },
   "overwritePassword": {
-    "message": "Overwrite Password",
-    "description": "Overwrite Password"
+    "message": "Overwrite Password"
   },
   "overwritePasswordConfirmation": {
-    "message": "Are you sure you want to overwrite the current password?",
-    "description": "Are you sure you want to overwrite the current password?"
-  },
-  "lost2FAApp": {
-    "message": "Lost authenticator app?",
-    "description": "Lost authenticator app?"
+    "message": "Are you sure you want to overwrite the current password?"
   },
   "credits": {
-    "message": "Credits",
-    "description": "Credits (giving thanks to people that helped, like at the end of a movie)"
+    "message": "Credits"
   },
   "thankYou": {
-    "message": "Thank You",
-    "description": "Thank You"
+    "message": "Thank You"
   },
   "translations": {
-    "message": "Translations",
-    "description": "Translations"
+    "message": "Translations"
   },
   "searchFolder": {
-    "message": "Search folder",
-    "description": "Search folder"
+    "message": "Search folder"
   },
   "noneFolder": {
     "message": "No Folder",
-    "description": "No Folder - this is the folder for uncategorized logins"
+    "description": "This is the folder for uncategorized logins"
   },
   "features": {
-    "message": "Features",
-    "description": "Features"
+    "message": "Features"
   },
   "gaDesc": {
-    "message": "We use analytics to better learn how the extension is being used so that we can make it better. All data collection is completely anonymous.",
-    "description": "We use analytics to better learn how the extension is being used so that we can make it better. All data collection is completely anonymous."
+    "message": "We use analytics to better learn how the extension is being used so that we can make it better. All data collection is completely anonymous."
   },
   "disableAddLoginNotification": {
-    "message": "Disable Add Login Notification",
-    "description": "Disable Add Login Notification"
+    "message": "Disable Add Login Notification"
   },
   "addLoginNotificationDesc": {
-    "message": "The \"Add Login Notification\" automatically prompts you to save new logins to your vault whenever you log into them for the first time.",
-    "description": "The \"Add Login Notification\" automatically prompts you to save new logins to your vault whenever you log into them for the first time."
+    "message": "The \"Add Login Notification\" automatically prompts you to save new logins to your vault whenever you log into them for the first time."
   },
   "notificationAddDesc": {
-    "message": "Should bitwarden remember this password for you?",
-    "description": "Should bitwarden remember this password for you?"
+    "message": "Should bitwarden remember this password for you?"
   },
   "notificationAddSave": {
-    "message": "Yes, Save Now",
-    "description": "Yes, Save Now"
+    "message": "Yes, Save Now"
   },
   "notificationNeverSave": {
-    "message": "Never for this website",
-    "description": "Never for this website"
+    "message": "Never for this website"
   },
   "disableContextMenuItem": {
-    "message": "Disable Context Menu Options",
-    "description": "Disable Context Menu Options"
+    "message": "Disable Context Menu Options"
   },
   "disableContextMenuItemDesc": {
-    "message": "Context menu options provide quick access to password generation and logins for the website in your current tab.",
-    "description": "Context menu options provide quick access to password generation and logins for the website in your current tab."
+    "message": "Context menu options provide quick access to password generation and logins for the website in your current tab."
   },
   "exportVault": {
-    "message": "Export Vault",
-    "description": "Export Vault"
+    "message": "Export Vault"
   },
   "warning": {
     "message": "WARNING",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "exportWarning": {
-    "message": "This export contains your unencrypted data in .csv format. You should not store or send it over unsecure channels (such as email). Delete it immediately after your are done using it.",
-    "description": "This export contains your unencrypted data in .csv format. You should not store or send it over unsecure channels (such as email). Delete it immediately after your are done using it."
+    "message": "This export contains your unencrypted data in .csv format. You should not store or send it over unsecure channels (such as email). Delete it immediately after your are done using it."
   },
   "exportMasterPassword": {
-    "message": "Enter your master password to export your vault data.",
-    "description": "Enter your master password to export your vault data."
+    "message": "Enter your master password to export your vault data."
   },
   "exportVaultInfo": {
-    "message": "Export your vault data in .csv format so that you can easily modify it or move it elsewhere.",
-    "description": "Export your vault data in .csv format so that you can easily modify it or move it elsewhere."
+    "message": "Export your vault data in .csv format so that you can easily modify it or move it elsewhere."
   },
   "shared": {
-    "message": "Shared",
-    "description": "Shared"
+    "message": "Shared"
   },
   "shareVault": {
-    "message": "Share Your Vault",
-    "description": "Share Your Vault"
+    "message": "Share Your Vault"
   },
   "shareVaultInfo": {
-    "message": "Create an organization to securely share your logins with other users.",
-    "description": "Create an organization to securely share your logins with other users."
+    "message": "Create an organization to securely share your logins with other users."
   },
   "contribute": {
-    "message": "You can contribute too!",
-    "description": "You can contribute too!"
+    "message": "You can contribute too!"
   },
   "learnMore": {
-    "message": "Learn more",
-    "description": "Learn more"
+    "message": "Learn more"
   },
   "authenticatorKeyTotp": {
-    "message": "Authenticator Key (TOTP)",
-    "description": "Authenticator Key (TOTP)"
+    "message": "Authenticator Key (TOTP)"
   },
   "verificationCodeTotp": {
-    "message": "Verification Code (TOTP)",
-    "description": "Verification Code (TOTP)"
+    "message": "Verification Code (TOTP)"
   },
   "copyVerificationCode": {
-    "message": "Copy Verification Code",
-    "description": "Copy Verification Code"
+    "message": "Copy Verification Code"
   },
   "attachments": {
-    "message": "Attachments",
-    "description": "Attachments"
+    "message": "Attachments"
   },
   "deleteAttachment": {
-    "message": "Delete attachment",
-    "description": "Delete attachment"
+    "message": "Delete attachment"
   },
   "deleteAttachmentConfirmation": {
-    "message": "Are you sure you want to delete this attachment?",
-    "description": "Are you sure you want to delete this attachment?"
+    "message": "Are you sure you want to delete this attachment?"
   },
   "deletedAttachment": {
-    "message": "Deleted attachment",
-    "description": "Deleted attachment"
+    "message": "Deleted attachment"
   },
   "newAttachment": {
-    "message": "Add New Attachment",
-    "description": "Add New Attachment"
+    "message": "Add New Attachment"
   },
   "noAttachments": {
-    "message": "No attachments.",
-    "description": "No attachments."
+    "message": "No attachments."
   },
   "attachmentSaved": {
-    "message": "The attachment has been saved.",
-    "description": "The attachment has been saved."
+    "message": "The attachment has been saved."
   },
   "file": {
-    "message": "File",
-    "description": "File"
+    "message": "File"
   },
   "selectFile": {
-    "message": "Select a file.",
-    "description": "Select a file."
+    "message": "Select a file."
   },
   "maxFileSize": {
-    "message": "Maximum file size is 100 MB.",
-    "description": "Maximum file size is 100 MB."
+    "message": "Maximum file size is 100 MB."
   },
   "featureUnavailable": {
-    "message": "Feature Unavailable",
-    "description": "Feature Unavailable"
+    "message": "Feature Unavailable"
   },
   "updateKey": {
-    "message": "You cannot use this feature until you update your encryption key.",
-    "description": "You cannot use this feature until you update your encryption key."
+    "message": "You cannot use this feature until you update your encryption key."
   },
   "premiumMembership": {
-    "message": "Premium Membership",
-    "description": "Premium Membership"
+    "message": "Premium Membership"
   },
   "premiumManage": {
-    "message": "Manage Membership",
-    "description": "Manage Membership"
+    "message": "Manage Membership"
   },
   "premiumManageAlert": {
-    "message": "You can manage your membership on the bitwarden.com web vault. Do you want to visit the website now?",
-    "description": "You can manage your membership on the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "You can manage your membership on the bitwarden.com web vault. Do you want to visit the website now?"
   },
   "premiumRefresh": {
-    "message": "Refresh Membership",
-    "description": "Refresh Membership"
+    "message": "Refresh Membership"
   },
   "premiumNotCurrentMember": {
-    "message": "You are not currently a premium member.",
-    "description": "You are not currently a premium member."
+    "message": "You are not currently a premium member."
   },
   "premiumSignUpAndGet": {
-    "message": "Sign up for a premium membership and get:",
-    "description": "Sign up for a premium membership and get:"
+    "message": "Sign up for a premium membership and get:"
   },
   "ppremiumSignUpStorage": {
-    "message": "1 GB of encrypted file storage.",
-    "description": "1 GB of encrypted file storage."
+    "message": "1 GB of encrypted file storage."
   },
   "ppremiumSignUpTwoStep": {
-    "message": "Additional two-step login options such as YubiKey, FIDO U2F, and Duo.",
-    "description": "Additional two-step login options such as YubiKey, FIDO U2F, and Duo."
+    "message": "Additional two-step login options such as YubiKey, FIDO U2F, and Duo."
   },
   "ppremiumSignUpTotp": {
-    "message": "TOTP verification code (2FA) generator for logins in your vault.",
-    "description": "TOTP verification code (2FA) generator for logins in your vault."
+    "message": "TOTP verification code (2FA) generator for logins in your vault."
   },
   "ppremiumSignUpSupport": {
-    "message": "Priority customer support.",
-    "description": "Priority customer support."
+    "message": "Priority customer support."
   },
   "ppremiumSignUpFuture": {
-    "message": "All future premium features. More coming soon!",
-    "description": "All future premium features. More coming soon!"
+    "message": "All future premium features. More coming soon!"
   },
   "premiumPurchase": {
-    "message": "Purchase Premium",
-    "description": "Purchase Premium"
+    "message": "Purchase Premium"
   },
   "premiumPurchaseAlert": {
-    "message": "You can purchase premium membership on the bitwarden.com web vault. Do you want to visit the website now?",
-    "description": "You can purchase premium membership on the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "You can purchase premium membership on the bitwarden.com web vault. Do you want to visit the website now?"
   },
   "premiumCurrentMember": {
-    "message": "You are a premium member!",
-    "description": "You are a premium member!"
+    "message": "You are a premium member!"
   },
   "premiumCurrentMemberThanks": {
-    "message": "Thank you for supporting bitwarden.",
-    "description": "Thank you for supporting bitwarden."
+    "message": "Thank you for supporting bitwarden."
   },
   "premiumPrice": {
-    "message": "All for just %price% /year!",
-    "description": "All for just %price% /year!"
+    "message": "All for just %price% /year!"
   },
   "refreshComplete": {
-    "message": "Refresh complete",
-    "description": "Refresh complete"
+    "message": "Refresh complete"
   },
   "disableAutoTotpCopy": {
-    "message": "Disable Automatic TOTP Copy",
-    "description": "Disable Automatic TOTP Copy"
+    "message": "Disable Automatic TOTP Copy"
   },
   "disableAutoTotpCopyDesc": {
-    "message": "If your login has an authenticator key attached to it, the TOTP verification code is automatically copied to your clipboard whenever you auto-fill the login.",
-    "description": "If your login has an authenticator key attached to it, the TOTP verification code is automatically copied to your clipboard whenever you auto-fill the login."
+    "message": "If your login has an authenticator key attached to it, the TOTP verification code is automatically copied to your clipboard whenever you auto-fill the login."
   },
   "premiumRequired": {
-    "message": "Premium Required",
-    "description": "Premium Required"
+    "message": "Premium Required"
   },
   "premiumRequiredDesc": {
-    "message": "A premium membership is required to use this feature.",
-    "description": "A premium membership is required to use this feature."
+    "message": "A premium membership is required to use this feature."
+  },
+  "enterVerificationCodeApp": {
+    "message": "Enter the 6 digit verification code from your authenticator app."
+  },
+  "enterVerificationCodeEmail": {
+    "message": "Enter the 6 digit verification code that was emailed to"
+  },
+  "rememberMe": {
+    "message": "Remember me"
+  },
+  "sendVerificationCodeEmailAgain": {
+    "message": "Send verification code email again"
+  },
+  "useAnotherTwoStepMethod": {
+    "message": "Use another two-step login method"
+  },
+  "insertYubiKey": {
+    "message": "Insert your YubiKey into your computer's USB port, then touch its button."
+  },
+  "insertU2f": {
+    "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
+  },
+  "loginUnavailable": {
+    "message": "Login Unavailable"
+  },
+  "noTwoStepProviders": {
+    "message": "This account has two-step login enabled, however, none of the configured two-step providers are supported by this web browser."
+  },
+  "noTwoStepProviders2": {
+    "message": "Please use a supported web browser (such as Chrome) and/or add additional providers that are better supported across web browsers (such as an authenticator app)."
+  },
+  "twoStepOptions": {
+    "message": "Two-step Login Options"
+  },
+  "recoveryCodeDesc": {
+    "message": "Lost access to all of your two-factor providers? Use your recovery code to disable all two-factor providers from your account."
+  },
+  "recoveryCodeTitle": {
+    "message": "Recovery Code"
+  },
+  "authenticatorAppTitle": {
+    "message": "Authenticator App"
+  },
+  "authenticatorAppDesc": {
+    "message": "Use an authenticator app (such as Authy or Google Authenticator) to generate time-based verification codes."
+  },
+  "yubiKeyTitle": {
+    "message": "YubiKey OTP Security Key"
+  },
+  "yubiKeyDesc": {
+    "message": "Use a YubiKey to access your account. Works with YubiKey 4, 4 Nano, 4C, and NEO devices."
+  },
+  "duoDesc": {
+    "message": "Verify with Duo Security using the Duo Mobile app, SMS, phone call, or U2F security key.",
+    "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
+  },
+  "u2fDesc": {
+    "message": "Use any FIDO U2F enabled security key to access your account."
+  },
+  "u2fTitle": {
+    "message": "FIDO U2F Security Key"
+  },
+  "emailTitle": {
+    "message": "Email"
+  },
+  "emailDesc": {
+    "message": "Verification codes will be emailed to you."
   }
 }
diff --git a/src/background.js b/src/background.js
index 7b3f4c33..37ea7b9d 100644
--- a/src/background.js
+++ b/src/background.js
@@ -1,7 +1,7 @@
 var isBackground = true;
 var bg_loginsToAdd = [];
 var bg_i18nService = new i18nService();
-var bg_constantsService = new ConstantsService();
+var bg_constantsService = new ConstantsService(bg_i18nService);
 var bg_utilsService = new UtilsService();
 var bg_cryptoService = new CryptoService(bg_constantsService);
 var bg_tokenService = new TokenService();
diff --git a/src/popup/app/accounts/views/accountsLoginTwoFactor.html b/src/popup/app/accounts/views/accountsLoginTwoFactor.html
index 8498cc6e..03920022 100644
--- a/src/popup/app/accounts/views/accountsLoginTwoFactor.html
+++ b/src/popup/app/accounts/views/accountsLoginTwoFactor.html
@@ -13,10 +13,10 @@
     <div class="content">
         <div class="two-factor-key-page">
             <p ng-if="providerType === constantsProvider.authenticator">
-                Enter the 6 digit verification code from your authenticator app.
+                {{i18n.enterVerificationCodeApp}}
             </p>
             <p ng-if="providerType === constantsProvider.email">
-                Enter the 6 digit verification code that was emailed to <b>{{twoFactorEmail}}</b>.
+                {{i18n.enterVerificationCodeEmail}} <b>{{twoFactorEmail}}</b>.
             </p>
         </div>
         <div class="list">
@@ -28,17 +28,17 @@
                         <input id="code" type="text" name="Code" placeholder="{{i18n.verificationCode}}" ng-model="token">
                     </div>
                     <div class="list-section-item list-section-item-checkbox">
-                        <label for="remember">Remember me</label>
+                        <label for="remember">{{i18n.rememberMe}}</label>
                         <input id="remember" name="Remember" type="checkbox" ng-model="remember.checked">
                     </div>
                 </div>
             </div>
         </div>
         <p class="text-center text-accent" ng-if="providerType === constantsProvider.email">
-            <a href="#" stop-click ng-click="sendEmail(true)">Send verification code email again</a>
+            <a href="#" stop-click ng-click="sendEmail(true)">{{i18n.sendVerificationCodeEmailAgain}}</a>
         </p>
         <p class="text-center text-accent">
-            <a href="#" stop-click ng-click="anotherMethod()">Use another two-step login method</a>
+            <a href="#" stop-click ng-click="anotherMethod()">{{i18n.useAnotherTwoStepMethod}}</a>
         </p>
     </div>
 </form>
@@ -58,14 +58,14 @@
             <div class="list-section">
                 <div class="list-section-items">
                     <div class="list-section-item list-section-item-checkbox">
-                        <label for="remember">Remember me</label>
+                        <label for="remember">{{i18n.rememberMe}}</label>
                         <input id="remember" name="Remember" type="checkbox" ng-model="remember.checked">
                     </div>
                 </div>
             </div>
         </div>
         <p class="text-accent text-center">
-            <a href="#" stop-click ng-click="anotherMethod()">Use another two-step login method</a>
+            <a href="#" stop-click ng-click="anotherMethod()">{{i18n.useAnotherTwoStepMethod}}</a>
         </p>
     </div>
 </form>
@@ -83,7 +83,7 @@
     </div>
     <div class="content">
         <div class="two-factor-key-page">
-            <p>Insert your YubiKey into your computer's USB port, then touch its button.</p>
+            <p>{{i18n.insertYubiKey}}</p>
             <img src="../images/two-factor/yubikey.jpg" alt="" class="img-rounded img-responsive" />
         </div>
         <div class="list">
@@ -95,14 +95,14 @@
                         <input id="code" type="password" name="Code" ng-model="token">
                     </div>
                     <div class="list-section-item list-section-item-checkbox">
-                        <label for="remember">Remember me</label>
+                        <label for="remember">{{i18n.rememberMe}}</label>
                         <input id="remember" name="Remember" type="checkbox" ng-model="remember.checked">
                     </div>
                 </div>
             </div>
         </div>
         <p class="text-center text-accent">
-            <a href="#" stop-click ng-click="anotherMethod()">Use another two-step login method</a>
+            <a href="#" stop-click ng-click="anotherMethod()">{{i18n.useAnotherTwoStepMethod}}</a>
         </p>
     </div>
 </form>
@@ -122,9 +122,7 @@
             <iframe id="u2f_iframe" class="hide"></iframe>
             <p ng-if="!u2fReady">Loading...</p>
             <div ng-if="u2fReady">
-                <p>
-                    Insert your Security Key into your computer's USB port. If it has a button, touch it.
-                </p>
+                <p>{{i18n.insertU2f}}</p>
                 <img src="../images/two-factor/u2fkey.jpg" alt="" class="img-rounded img-responsive" />
             </div>
         </div>
@@ -132,14 +130,14 @@
             <div class="list-section">
                 <div class="list-section-items">
                     <div class="list-section-item list-section-item-checkbox">
-                        <label for="remember">Remember me</label>
+                        <label for="remember">{{i18n.rememberMe}}</label>
                         <input id="remember" name="Remember" type="checkbox" ng-model="remember.checked">
                     </div>
                 </div>
             </div>
         </div>
         <p class="text-accent text-center">
-            <a href="#" stop-click ng-click="anotherMethod()">Use another two-step login method</a>
+            <a href="#" stop-click ng-click="anotherMethod()">{{i18n.useAnotherTwoStepMethod}}</a>
         </p>
     </div>
 </form>
@@ -149,21 +147,15 @@
         <div class="left">
             <a ui-sref="login({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i> {{i18n.login}}</a>
         </div>
-        <div class="title">Login Unavailable</div>
+        <div class="title">{{i18n.loginUnavailable}}</div>
     </div>
     <div class="content">
         <div class="two-factor-key-page">
-            <p>
-                This account has two-step login enabled, however, none of the configured two-step providers are
-                supported by this web browser.
-            </p>
-            <p>
-                Please use a supported web browser (such as Chrome) and/or add additional providers that are better supported
-                across web browsers (such as an authenticator app).
-            </p>
+            <p>{{i18n.noTwoStepProviders}}</p>
+            <p>{{i18n.noTwoStepProviders2}}</p>
         </div>
         <p class="text-accent text-center">
-            <a href="#" stop-click ng-click="anotherMethod()">Use another two-step login method</a>
+            <a href="#" stop-click ng-click="anotherMethod()">{{i18n.useAnotherTwoStepMethod}}</a>
         </p>
     </div>
 </div>
diff --git a/src/popup/app/accounts/views/accountsTwoFactorMethods.html b/src/popup/app/accounts/views/accountsTwoFactorMethods.html
index d4327fd9..2698acd1 100644
--- a/src/popup/app/accounts/views/accountsTwoFactorMethods.html
+++ b/src/popup/app/accounts/views/accountsTwoFactorMethods.html
@@ -2,7 +2,7 @@
     <div class="left">
         <a href="#" ng-click="cancel()" stop-click>{{i18n.cancel}}</a>
     </div>
-    <div class="title">Two-step Login Options</div>
+    <div class="title">{{i18n.twoStepOptions}}</div>
 </div>
 <div class="content content-tabs">
     <div class="list">
@@ -14,10 +14,9 @@
                     <span class="detail">{{provider.description}}</span>
                 </a>
                 <a class="list-section-item wrap" href="#" stop-click ng-click="recover()">
-                    <span class="text">Recovery Code</span>
+                    <span class="text">{{i18n.recoveryCodeTitle}}</span>
                     <span class="detail">
-                        Lost access to all of your two-factor providers? Use your recovery code to disable
-                        all two-factor providers from your account.
+                        {{i18n.recoveryCodeDesc}}
                     </span>
                 </a>
             </div>
diff --git a/src/services/constantsService.js b/src/services/constantsService.js
index ffc5cc77..f2701b3c 100644
--- a/src/services/constantsService.js
+++ b/src/services/constantsService.js
@@ -1,4 +1,4 @@
-function ConstantsService() {
+function ConstantsService(i18nService) {
     return {
         disableGaKey: 'disableGa',
         disableAddLoginNotificationKey: 'disableAddLoginNotification',
@@ -26,9 +26,8 @@ function ConstantsService() {
         twoFactorProviderInfo: [
             {
                 type: 0,
-                name: 'Authenticator App',
-                description: 'Use an authenticator app (such as Authy or Google Authenticator) to generate time-based ' +
-                'verification codes.',
+                name: i18nService.authenticatorAppTitle,
+                description: i18nService.authenticatorAppDesc,
                 active: true,
                 free: true,
                 displayOrder: 0,
@@ -36,8 +35,8 @@ function ConstantsService() {
             },
             {
                 type: 3,
-                name: 'YubiKey OTP Security Key',
-                description: 'Use a YubiKey to access your account. Works with YubiKey 4, 4 Nano, 4C, and NEO devices.',
+                name: i18nService.yubiKeyTitle,
+                description: i18nService.yubiKeyDesc,
                 active: true,
                 displayOrder: 1,
                 priority: 3
@@ -45,23 +44,23 @@ function ConstantsService() {
             {
                 type: 2,
                 name: 'Duo',
-                description: 'Verify with Duo Security using the Duo Mobile app, SMS, phone call, or U2F security key.',
+                description: i18nService.duoDesc,
                 active: true,
                 displayOrder: 2,
                 priority: 2
             },
             {
                 type: 4,
-                name: 'FIDO U2F Security Key',
-                description: 'Use any FIDO U2F enabled security key to access your account.',
+                name: i18nService.u2fTitle,
+                description: i18nService.u2fDesc,
                 active: true,
                 displayOrder: 3,
                 priority: 4
             },
             {
                 type: 1,
-                name: 'Email',
-                description: 'Verification codes will be emailed to you.',
+                name: i18nService.emailTitle,
+                description: i18nService.emailDesc,
                 active: true,
                 displayOrder: 4,
                 priority: 0