diff --git a/src/locales/et/messages.json b/src/locales/et/messages.json
index 87c838dca9..5c40c38237 100644
--- a/src/locales/et/messages.json
+++ b/src/locales/et/messages.json
@@ -589,25 +589,25 @@
     "message": "Puuduvad kirjed, mida kuvada."
   },
   "noCollectionsInList": {
-    "message": "There are no collections to list."
+    "message": "Puuduvad kollektsioonid, mida kuvada."
   },
   "noGroupsInList": {
-    "message": "There are no groups to list."
+    "message": "Puuduvad grupid, mida kuvada."
   },
   "noUsersInList": {
-    "message": "There are no users to list."
+    "message": "Puuduvad kasutajad, mida kuvada."
   },
   "noEventsInList": {
-    "message": "There are no events to list."
+    "message": "Puuduvad sündmused, mida kuvada."
   },
   "newOrganization": {
     "message": "Uus organisatsioon"
   },
   "noOrganizationsList": {
-    "message": "You do not belong to any organizations. Organizations allow you to securely share items with other users."
+    "message": "Sa ei kuulu ühessegi organisatsiooni. Organisatsioonid võimaldavad sul kirjeid teiste kasutajatega turvaliselt jagada."
   },
   "versionNumber": {
-    "message": "Version $VERSION_NUMBER$",
+    "message": "Versioon $VERSION_NUMBER$",
     "placeholders": {
       "version_number": {
         "content": "$1",
@@ -1005,19 +1005,19 @@
     "message": "Domains updated"
   },
   "twoStepLogin": {
-    "message": "Two-step Login"
+    "message": "Kaheastmeline kinnitamine"
   },
   "twoStepLoginDesc": {
-    "message": "Secure your account by requiring an additional step when logging in."
+    "message": "Kaitse oma kontot, nõudes sisselogimisel lisakinnitust."
   },
   "twoStepLoginOrganizationDesc": {
-    "message": "Require two-step login for your organization's users by configuring providers at the organization level."
+    "message": "Nõua organisatsiooni liikmetelt kaheastmelist kinnitamist, seadistades taolise teenuse pakkujad organisatsiooni tasemel."
   },
   "twoStepLoginRecoveryWarning": {
     "message": "Enabling two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (ex. you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
   "viewRecoveryCode": {
-    "message": "View Recovery Code"
+    "message": "Vaata taaastamise koodi"
   },
   "providers": {
     "message": "Pakkujad",
@@ -1049,16 +1049,16 @@
     "message": "Keela"
   },
   "twoStepLoginProviderEnabled": {
-    "message": "This two-step login provider is enabled on your account."
+    "message": "See kaheastmelise kinnitamise pakkuja on sinu kontol sisse lülitatud."
   },
   "twoStepLoginAuthDesc": {
-    "message": "Enter your master password to modify two-step login settings."
+    "message": "Kaheastmelise kinnitamise seadete muutmiseks pead sisestama ülemparooli."
   },
   "twoStepAuthenticatorDesc": {
-    "message": "Follow these steps to set up two-step login with an authenticator app:"
+    "message": "Järgnevad juhised aitavad sul kaheastmelise kinnituse äpi ära seadistada:"
   },
   "twoStepAuthenticatorDownloadApp": {
-    "message": "Download a two-step authenticator app"
+    "message": "Laadi kaheastmelise kinnitamise äpp alla"
   },
   "twoStepAuthenticatorNeedApp": {
     "message": "Need a two-step authenticator app? Download one of the following"
@@ -1091,22 +1091,22 @@
     "message": "Are you sure you want to disable this two-step login provider?"
   },
   "twoStepDisabled": {
-    "message": "Two-step login provider disabled."
+    "message": "Kaheastmelise sisselogimise pakkuja on keelatud."
   },
   "twoFactorYubikeyAdd": {
-    "message": "Add a new YubiKey to your account"
+    "message": "Lisa oma kontole uus YubiKey"
   },
   "twoFactorYubikeyPlugIn": {
-    "message": "Plug the YubiKey (NEO or 4 series) into your computer's USB port."
+    "message": "Sisesta YubiKey (NEO või 4. seeria) arvuti USB pessa."
   },
   "twoFactorYubikeySelectKey": {
     "message": "Select in the first empty YubiKey input field below."
   },
   "twoFactorYubikeyTouchButton": {
-    "message": "Touch the YubiKey's button."
+    "message": "Puuduta YubiKey nuppu."
   },
   "twoFactorYubikeySaveForm": {
-    "message": "Save the form."
+    "message": "Salvesta vorm."
   },
   "twoFactorYubikeyWarning": {
     "message": "Due to platform limitations, YubiKeys cannot be used on all Bitwarden applications. You should enable another two-step login provider so that you can access your account when YubiKeys cannot be used. Supported platforms:"
@@ -1127,28 +1127,28 @@
     }
   },
   "nfcSupport": {
-    "message": "NFC Support"
+    "message": "NFS tugi"
   },
   "twoFactorYubikeySupportsNfc": {
-    "message": "One of my keys supports NFC."
+    "message": "Üks minu võtmetest toetab NFC-d."
   },
   "twoFactorYubikeySupportsNfcDesc": {
-    "message": "If one of your YubiKeys supports NFC (such as a YubiKey NEO), you will be prompted on mobile devices whenever NFC availability is detected."
+    "message": "Kui üks sinu YubiKeydest (nt YubiKey Neo) toetab NFC-d, küsitakse sinult seda nutitelefonis, kui NFC olemasolu tuvastatakse."
   },
   "yubikeysUpdated": {
-    "message": "YubiKeys updated"
+    "message": "YubiKeyd on uuendatud"
   },
   "disableAllKeys": {
-    "message": "Disable All Keys"
+    "message": "Blokeeri kõik Võtmed"
   },
   "twoFactorDuoDesc": {
-    "message": "Enter the Bitwarden application information from your Duo Admin panel."
+    "message": "Sisesta oma Bitwardeni rakenduse informatsioon Duo admini paneelist."
   },
   "twoFactorDuoIntegrationKey": {
     "message": "Integration Key"
   },
   "twoFactorDuoSecretKey": {
-    "message": "Secret Key"
+    "message": "Salajane võti"
   },
   "twoFactorDuoApiHostname": {
     "message": "API Hostname"
@@ -1196,26 +1196,26 @@
     "message": "You have not enabled any two-step login providers yet. After you have enabled a two-step login provider you can check back here for your recovery code."
   },
   "printCode": {
-    "message": "Print Code",
+    "message": "Prindi kood",
     "description": "Print 2FA recovery code"
   },
   "reports": {
-    "message": "Reports"
+    "message": "Raportid"
   },
   "dataBreachReport": {
-    "message": "Data Breach Report"
+    "message": "Andmelekke raport"
   },
   "breachDesc": {
-    "message": "A \"breach\" is an incident where a site's data has been illegally accessed by hackers and then released publicly. Review the types of data that were compromised (email addresses, passwords, credit cards etc.) and take appropriate action, such as changing passwords."
+    "message": "Andmeleke on intsident, kus sinu kasutajakonto andmed on lekkinud või häkkerite poolt varastatud. Soovitame tungivalt üle kontrollida lekkinud andmed (e-posti aadress, paroolid, krediitkaardi andmed jne) ning võtta kasutusele meetmed nende turvamiseks. Näiteks paroolivahetus."
   },
   "breachCheckUsernameEmail": {
-    "message": "Check any usernames or email addresses that you use."
+    "message": "Kontrolli mistahes kasutajanimesid või e-posti aadresse, mida ma kasutan."
   },
   "checkBreaches": {
-    "message": "Check Breaches"
+    "message": "Kontrolli lekkeid"
   },
   "breachUsernameNotFound": {
-    "message": "$USERNAME$ was not found in any known data breaches.",
+    "message": "$USERNAME$ ei leitud ühestki teadaolevast andmelekkest.",
     "placeholders": {
       "username": {
         "content": "$1",
@@ -1224,11 +1224,11 @@
     }
   },
   "goodNews": {
-    "message": "Good News",
+    "message": "Head uudised",
     "description": "ex. Good News, No Breached Accounts Found!"
   },
   "breachUsernameFound": {
-    "message": "$USERNAME$ was found in $COUNT$ different data breaches online.",
+    "message": "$USERNAME$ leiti kokku $COUNT$ erinevas andmelekkes.",
     "placeholders": {
       "username": {
         "content": "$1",
@@ -1241,38 +1241,38 @@
     }
   },
   "breachFound": {
-    "message": "Breached Accounts Found"
+    "message": "Lekkinud kontod"
   },
   "compromisedData": {
-    "message": "Compromised data"
+    "message": "Ohus olevad andmed"
   },
   "website": {
     "message": "Veebileht"
   },
   "affectedUsers": {
-    "message": "Affected Users"
+    "message": "Mõjutatud kasutajad"
   },
   "breachOccurred": {
-    "message": "Breach Occurred"
+    "message": "Leke toimus"
   },
   "breachReported": {
-    "message": "Breach Reported"
+    "message": "Lekkest teatati"
   },
   "reportError": {
-    "message": "An error occurred trying to load the report. Try again"
+    "message": "Raporti laadimisel ilmes viga. Proovi uuesti"
   },
   "billingAndLicensing": {
-    "message": "Billing & Licensing"
+    "message": "Maksmine & Litsentsid"
   },
   "goPremium": {
     "message": "Hangi Premium",
     "description": "Another way of saying \"Get a premium membership\""
   },
   "premiumUpdated": {
-    "message": "You've upgraded to premium."
+    "message": "Oled nüüd Preemium konto omanik."
   },
   "premiumUpgradeUnlockFeatures": {
-    "message": "Upgrade your account to a premium membership and unlock some great additional features."
+    "message": "Tee oma kontost preemium konto ning saa osa paljudest lisahüvedest, mis sellega kaasnevad."
   },
   "premiumSignUpStorage": {
     "message": "1 GB ulatuses krüpteeritud salvestusruum."
@@ -1308,7 +1308,7 @@
     "message": "# lisa GB"
   },
   "additionalStorageDesc": {
-    "message": "Your plan comes with $SIZE$ of encrypted file storage. You can add additional storage for $PRICE$ per GB \/year.",
+    "message": "Sul on kasutada $SIZE$ krüpteeritud failiruumi Soovi korral saad osta lisaruumi hinnaga $PRICE$ GB \/aastas.",
     "placeholders": {
       "size": {
         "content": "$1",
@@ -1355,67 +1355,67 @@
     "message": "Krediitkaart"
   },
   "paypalClickSubmit": {
-    "message": "Click the PayPal button to log into your PayPal account, then click the Submit button below to continue."
+    "message": "Kliki PayPali nupul. Seejärel logi oma PayPali kontosse sisse ning kliki jätkamiseks \"Submit\/Saada\" nupul."
   },
   "cancelSubscription": {
-    "message": "Cancel Subscription"
+    "message": "Tühista tellimus"
   },
   "subscriptionCanceled": {
-    "message": "The subscription has been canceled."
+    "message": "Tellimus on tühistatud."
   },
   "pendingCancellation": {
-    "message": "Pending Cancellation"
+    "message": "Tühistamise ootel"
   },
   "subscriptionPendingCanceled": {
-    "message": "The subscription has been marked for cancellation at the end of the current billing period."
+    "message": "Tellimus on märgitud tühistatuks. Tellimus tühistatakse lõplikult käesoleva arveperioodi lõpus."
   },
   "reinstateSubscription": {
-    "message": "Reinstate Subscription"
+    "message": "Tellimuse uuesti aktiveerimine"
   },
   "reinstateConfirmation": {
-    "message": "Are you sure you want to remove the pending cancellation request and reinstate your subscription?"
+    "message": "Oled kindel, et soovid tühistamise tagasi võtta ja tellimuse uuesti aktiveerida?"
   },
   "reinstated": {
-    "message": "The subscription has been reinstated."
+    "message": "Tellimus on uuesti aktiveeritud."
   },
   "cancelConfirmation": {
-    "message": "Are you sure you want to cancel? You will lose access to all of this subscription's features at the end of this billing cycle."
+    "message": "Oled kindel, et soovid tellimuse tühistada? Kaotad sellega arveperioodi lõpus kõik tellimisega kaasnevad eelised."
   },
   "canceledSubscription": {
-    "message": "The subscription has been canceled."
+    "message": "Tellimus on tühistatud."
   },
   "neverExpires": {
-    "message": "Never Expires"
+    "message": "Ei aegu kunagi"
   },
   "status": {
-    "message": "Status"
+    "message": "Olek"
   },
   "nextCharge": {
-    "message": "Next Charge"
+    "message": "Järgmine makse"
   },
   "details": {
-    "message": "Details"
+    "message": "Andmed"
   },
   "downloadLicense": {
-    "message": "Download License"
+    "message": "Laadi litsents alla"
   },
   "updateLicense": {
-    "message": "Update License"
+    "message": "Uuenda litsentsi"
   },
   "updatedLicense": {
-    "message": "Updated license"
+    "message": "Litsents on uuendatud"
   },
   "manageSubscription": {
-    "message": "Manage Subscription"
+    "message": "Halda tellimust"
   },
   "storage": {
-    "message": "Storage"
+    "message": "Salvestusruum"
   },
   "addStorage": {
-    "message": "Add Storage"
+    "message": "Lisa ruumi"
   },
   "removeStorage": {
-    "message": "Remove Storage"
+    "message": "Eemalda salvestusruum"
   },
   "subscriptionStorage": {
     "message": "Your subscription has a total of $MAX_STORAGE$ GB of encrypted file storage. You are currently using $USED_STORAGE$.",
@@ -1434,7 +1434,7 @@
     "message": "Makseviis"
   },
   "noPaymentMethod": {
-    "message": "No payment method on file."
+    "message": "Failis ei ole maksemeetodit."
   },
   "addPaymentMethod": {
     "message": "Lisa makseviis"
@@ -1443,14 +1443,14 @@
     "message": "Muuda makseviisi"
   },
   "charges": {
-    "message": "Charges",
+    "message": "Maksed",
     "description": "Credit card charges\/payments."
   },
   "noCharges": {
-    "message": "No charges."
+    "message": "Maksed puuduvad."
   },
   "chargesStatement": {
-    "message": "Any charges will appear on your statement as $STATEMENT_NAME$.",
+    "message": "Mistahes maksed ilmuvad väljavõttes nimega $STATEMENT_NAME$.",
     "placeholders": {
       "statement_name": {
         "content": "$1",
@@ -1459,10 +1459,10 @@
     }
   },
   "gbStorageAdd": {
-    "message": "GB of Storage To Add"
+    "message": "Lisatav GB hulk"
   },
   "gbStorageRemove": {
-    "message": "GB of Storage To Remove"
+    "message": "Eemaldatav GB hulk"
   },
   "storageAddNote": {
     "message": "Adding storage will result in adjustments to your billing totals and immediately charge your payment method on file. The first charge will be prorated for the remainder of the current billing cycle."
@@ -1480,7 +1480,7 @@
     }
   },
   "contactSupport": {
-    "message": "Contact Customer Support"
+    "message": "Võta klienditoega ühendust"
   },
   "contactSupportPaymentMethod": {
     "message": "If you would like to change from this payment method please contact customer support."
@@ -1489,13 +1489,13 @@
     "message": "Updated payment method."
   },
   "purchasePremium": {
-    "message": "Purchase Premium"
+    "message": "Osta Premium"
   },
   "licenseFile": {
-    "message": "License File"
+    "message": "Litsentsifail"
   },
   "licenseFileDesc": {
-    "message": "Your license file will be named something like $FILE_NAME$",
+    "message": "Litsentsi nimi on sarnane $FILE_NAME$-le",
     "placeholders": {
       "file_name": {
         "content": "$1",
@@ -1504,7 +1504,7 @@
     }
   },
   "uploadLicenseFilePremium": {
-    "message": "To upgrade your account to a premium membership you need to upload a valid license file."
+    "message": "Muutmaks oma konto preemiumiks, pead üles laadima kehtiva litsentsifaili."
   },
   "uploadLicenseFileOrg": {
     "message": "To create an on-premise hosted organization you need to upload a valid license file."
@@ -1525,28 +1525,28 @@
     "message": "Seda kontot omab ettevõte."
   },
   "billingEmail": {
-    "message": "Billing Email"
+    "message": "Arve e-post"
   },
   "businessName": {
-    "message": "Business Name"
+    "message": "Ettevõtte nimi"
   },
   "chooseYourPlan": {
-    "message": "Choose Your Plan"
+    "message": "Vali oma pakett"
   },
   "users": {
     "message": "Kasutajad"
   },
   "userSeats": {
-    "message": "User Seats"
+    "message": "Kasutajaid"
   },
   "additionalUserSeats": {
-    "message": "Additional User Seats"
+    "message": "Lisakasutajad"
   },
   "userSeatsDesc": {
-    "message": "# of user seats"
+    "message": "# kasutajaid"
   },
   "userSeatsAdditionalDesc": {
-    "message": "Your plan comes with $BASE_SEATS$ user seats. You can add additional users for $SEAT_PRICE$ per user \/month.",
+    "message": "Sinu pakett sisaldab $BASE_SEATS$ kasutajat. Soovi korral saad lisada kasutajaid juurde hinnaga $SEAT_PRICE$ kasutaja \/kuus.",
     "placeholders": {
       "base_seats": {
         "content": "$1",
@@ -1559,14 +1559,14 @@
     }
   },
   "userSeatsHowManyDesc": {
-    "message": "How many user seats do you need? You can also add additional seats later if needed."
+    "message": "Palju kasutajaid sa vajad? Kasutajaid on hiljem võimalik juurde lisada."
   },
   "planNameFree": {
     "message": "Tasuta",
     "description": "Free as in 'free beer'."
   },
   "planDescFree": {
-    "message": "For testing or personal users to share with $COUNT$ other user.",
+    "message": "Teistimiseks ja isiklikuks kasutamiseks, et jagada $COUNT$ teise kasutajaga.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1575,28 +1575,28 @@
     }
   },
   "planNameFamilies": {
-    "message": "Families"
+    "message": "Perekonnad"
   },
   "planDescFamilies": {
-    "message": "For personal use, to share with family & friends."
+    "message": "Isiklikuks kasutamiseks, jagamaks sõprade ja perega."
   },
   "planNameTeams": {
-    "message": "Teams"
+    "message": "Meeskonnad"
   },
   "planDescTeams": {
-    "message": "For businesses and other team organizations."
+    "message": "Ettevõtetele ja teistele meeskondadele\/organisatsioonidele."
   },
   "planNameEnterprise": {
-    "message": "Enterprise"
+    "message": "Suurettevõte"
   },
   "planDescEnterprise": {
-    "message": "For businesses and other large organizations."
+    "message": "Suurtele ettevõtetele ja organisatsioonidele."
   },
   "freeForever": {
-    "message": "Free Forever"
+    "message": "Igavesti tasuta"
   },
   "includesXUsers": {
-    "message": "includes $COUNT$ users",
+    "message": "sisaldab $COUNT$ kasutajat",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1605,10 +1605,10 @@
     }
   },
   "additionalUsers": {
-    "message": "Additional Users"
+    "message": "Lisakasutajad"
   },
   "costPerUser": {
-    "message": "$COST$ per user",
+    "message": "$COST$ kasutaja kohta",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -1668,13 +1668,13 @@
     "message": "Sync your users and groups from a directory"
   },
   "trackAuditLogs": {
-    "message": "Track user actions with audit logs"
+    "message": "Jälgi kasutaja tegevusi auditi logidega"
   },
   "enforce2faDuo": {
-    "message": "Enforce 2FA with Duo"
+    "message": "Jõusta 2FA Duo-ga"
   },
   "priorityCustomerSupport": {
-    "message": "Priority customer support"
+    "message": "Kiirem klienditugi"
   },
   "xDayFreeTrial": {
     "message": "$COUNT$ day free trial, cancel anytime",
@@ -1686,19 +1686,19 @@
     }
   },
   "monthly": {
-    "message": "Monthly"
+    "message": "Igakuiselt"
   },
   "annually": {
-    "message": "Annually"
+    "message": "Aastas"
   },
   "basePrice": {
-    "message": "Base Price"
+    "message": "Baashind"
   },
   "organizationCreated": {
-    "message": "Organization Created"
+    "message": "Organisatsioon on loodud"
   },
   "organizationReadyToGo": {
-    "message": "Your new organization is ready to go!"
+    "message": "Uus organisatsioon on kasutamiseks valmis!"
   },
   "leave": {
     "message": "Lahku"
@@ -1713,28 +1713,28 @@
     "message": "Default Collection"
   },
   "getHelp": {
-    "message": "Get Help"
+    "message": "Klienditugi"
   },
   "getApps": {
-    "message": "Get the Apps"
+    "message": "Hangi äpid"
   },
   "loggedInAs": {
-    "message": "Logged in as"
+    "message": "Sisse logitud kui"
   },
   "eventLogs": {
-    "message": "Event Logs"
+    "message": "Sündmuste logid"
   },
   "people": {
-    "message": "People"
+    "message": "Inimesed"
   },
   "groups": {
-    "message": "Groups"
+    "message": "Grupid"
   },
   "newGroup": {
-    "message": "New Group"
+    "message": "Uus grupp"
   },
   "addGroup": {
-    "message": "Add Group"
+    "message": "Lisa grupp"
   },
   "editGroup": {
     "message": "Muuda gruppi"
@@ -1761,7 +1761,7 @@
     "message": "See grupp pääseb ligi ainult valitud kirjetele."
   },
   "readOnly": {
-    "message": "Read Only"
+    "message": "Ainult loetav"
   },
   "newCollection": {
     "message": "Uus kogumik"
@@ -1776,7 +1776,7 @@
     "message": "Oled kindel, et soovid selle kogumiku kustutada?"
   },
   "editUser": {
-    "message": "Edit User"
+    "message": "Muuda kasutajat"
   },
   "inviteUser": {
     "message": "Invite User"
@@ -1818,10 +1818,10 @@
     "message": "The highest access user that can manage all aspects of your organization."
   },
   "admin": {
-    "message": "Admin"
+    "message": "Administraator"
   },
   "adminDesc": {
-    "message": " Admins can access and manage all items, collections and users in your organization."
+    "message": " Administraatorid pääsevad ligi ja haldavad kõiki organisatsiooni kirjeid, kollektsioone ja kasutajaid."
   },
   "user": {
     "message": "Kasutaja"
@@ -1875,19 +1875,19 @@
     "message": "Keela kaheastmeline kinnitamine."
   },
   "recovered2fa": {
-    "message": "Recovered account from two-step login."
+    "message": "Konto on taastatud kaheastmelisest kinnitamisest."
   },
   "failedLogin": {
-    "message": "Login attempt failed with incorrect password."
+    "message": "Sisselogimine nurjus vale parooli tõttu."
   },
   "failedLogin2fa": {
-    "message": "Login attempt failed with incorrect two-step login."
+    "message": "Sisselogimine nurjus vale kaheastmelise kinnituse tõttu."
   },
   "editedOrgSettings": {
-    "message": "Edited organization settings."
+    "message": "Organisatsiooni seaded on muudetud."
   },
   "createdItemId": {
-    "message": "Created item $ID$.",
+    "message": "Lõi kirje $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1896,7 +1896,7 @@
     }
   },
   "editedItemId": {
-    "message": "Edited item $ID$.",
+    "message": "Muutis kirjet $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1905,7 +1905,7 @@
     }
   },
   "deletedItemId": {
-    "message": "Deleted item $ID$.",
+    "message": "Kustutas kirje $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1914,7 +1914,7 @@
     }
   },
   "sharedItemId": {
-    "message": "Shared item $ID$.",
+    "message": "Jagas kirjet $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1923,7 +1923,7 @@
     }
   },
   "createdCollectionId": {
-    "message": "Created collection $ID$.",
+    "message": "Lõi kollektsiooni $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1932,7 +1932,7 @@
     }
   },
   "editedCollectionId": {
-    "message": "Edited collection $ID$.",
+    "message": "Muutis kollektsiooni $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1941,7 +1941,7 @@
     }
   },
   "deletedCollectionId": {
-    "message": "Deleted collection $ID$.",
+    "message": "Kustutas kollektsiooni $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1950,7 +1950,7 @@
     }
   },
   "createdGroupId": {
-    "message": "Created group $ID$.",
+    "message": "Lõi grupi $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1959,7 +1959,7 @@
     }
   },
   "editedGroupId": {
-    "message": "Edited group $ID$.",
+    "message": "Muutis gruppi $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1968,7 +1968,7 @@
     }
   },
   "deletedGroupId": {
-    "message": "Deleted group $ID$.",
+    "message": "Kustutas grupi $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1977,7 +1977,7 @@
     }
   },
   "removedUserId": {
-    "message": "Removed user $ID$.",
+    "message": "Eemaldas kasutaja $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1986,7 +1986,7 @@
     }
   },
   "createdAttachmentForItem": {
-    "message": "Created attachment for item $ID$.",
+    "message": "Lisas kirjele $ID$ manuse.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -1995,7 +1995,7 @@
     }
   },
   "deletedAttachmentForItem": {
-    "message": "Deleted attachment for item $ID$.",
+    "message": "Kustutas kirje $ID$ manuse.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2004,7 +2004,7 @@
     }
   },
   "editedCollectionsForItem": {
-    "message": "Edited collections for item $ID$.",
+    "message": "Muutis kirje $ID$ kollektsioone.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2013,7 +2013,7 @@
     }
   },
   "invitedUserId": {
-    "message": "Invited user $ID$.",
+    "message": "Kutsus kasutaja $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2022,7 +2022,7 @@
     }
   },
   "confirmedUserId": {
-    "message": "Confirmed user $ID$.",
+    "message": "Kinnitas kasutaja $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2103,55 +2103,55 @@
     "message": "Confirm Users"
   },
   "usersNeedConfirmed": {
-    "message": "You have users that have accepted their invitation, but still need to be confirmed. Users will not have access to the organization until they are confirmed."
+    "message": "Sul on kasutajaid, kes on küll kutsumisega nõustunud, aga vajavad veel kinnitust. Kasutajad ei pääse organisatsioonile ligi enne, kui nad on kinnitatud."
   },
   "startDate": {
-    "message": "Start Date"
+    "message": "Alguskuupäev"
   },
   "endDate": {
-    "message": "End Date"
+    "message": "Lõpukuupäev"
   },
   "verifyEmail": {
-    "message": "Verify Email"
+    "message": "Kinnita e-posti aadress"
   },
   "verifyEmailDesc": {
-    "message": "Verify your account's email address to unlock access to all features."
+    "message": "Kõikide võimaluste kasutamiseks on vajalik konto e-posti aadressi kinnitamine."
   },
   "verifyEmailFirst": {
-    "message": "Your account's email address first must be verified."
+    "message": "Esmalt pead kinnitama konto e-poesti aadressi."
   },
   "checkInboxForVerification": {
-    "message": "Check your email inbox for a verification link."
+    "message": "E-posti aadressile saadeti kinnituslink."
   },
   "emailVerified": {
-    "message": "Your email has been verified."
+    "message": "E-posti aadress on kinnitatud."
   },
   "emailVerifiedFailed": {
-    "message": "Unable to verify your email. Try sending a new verification email."
+    "message": "E-posti kinnitamine nurjus. Proovi uut kinnituskirja saata."
   },
   "updateBrowser": {
-    "message": "Update Browser"
+    "message": "Uuenda brauserit"
   },
   "updateBrowserDesc": {
-    "message": "You are using an unsupported web browser. The web vault may not function properly."
+    "message": "Kasutad brauserit, mida ei toetata. Veebihoidla ei pruugi hästi töödata."
   },
   "joinOrganization": {
-    "message": "Join Organization"
+    "message": "Liitu organisatsiooniga"
   },
   "joinOrganizationDesc": {
-    "message": "You've been invited to join the organization listed above. To accept the invitation, you need to log in or create a new Bitwarden account."
+    "message": "Sind on kutsutud ülal oleva organisatsiooniga liituma. Liitumise kinnitamiseks pead sisse logima või omale Bitwardeni konto looma."
   },
   "inviteAccepted": {
-    "message": "Invitation Accepted"
+    "message": "Kutse on vastu võetud"
   },
   "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+    "message": "Pääsed organisatsiooni kirjetele ligi niipea, kui administraator sinu liikmelisuse kinnitab. Teavitame sind sellest e-posti teel."
   },
   "inviteAcceptFailed": {
-    "message": "Unable to accept invitation. Ask an organization admin to send a new invitation."
+    "message": "Kutse vastuvõtmine nurjus. Palu organisatsiooni administraatoril uus kutse saata."
   },
   "rememberEmail": {
-    "message": "Remember email"
+    "message": "Mäleta e-posti aadressi"
   },
   "recoverAccountTwoStepDesc": {
     "message": "If you cannot access your account through your normal two-step login methods, you can use your two-step login recovery code to disable all two-step providers on your account."
@@ -2163,7 +2163,7 @@
     "message": "Two-step login has been disabled on your account."
   },
   "learnMore": {
-    "message": "Learn more"
+    "message": "Rohkem teavet"
   },
   "deleteRecoverDesc": {
     "message": "Enter your email address below to recover and delete your account."
@@ -2187,26 +2187,26 @@
     "message": "Deleting the organization is permanent. It cannot be undone."
   },
   "organizationDeleted": {
-    "message": "Organization Deleted"
+    "message": "Organisatsioon on kustutatud"
   },
   "organizationDeletedDesc": {
-    "message": "The organization and all associated data has been deleted."
+    "message": "Organisatsioon ja kõik sellega seonduvad andmed on kustutatud."
   },
   "organizationUpdated": {
-    "message": "Organization updated"
+    "message": "Organisatsiooni on uuendatud"
   },
   "taxInformation": {
     "message": "Käibemaksu info"
   },
   "taxInformationDesc": {
-    "message": "Please contact support to provide (or update) tax information for your invoices."
+    "message": "Käibemaksu informatsiooni uuendamiseks võta ühendust klienditoega."
   },
   "billingPlan": {
-    "message": "Plan",
+    "message": "Pakett",
     "description": "A billing plan\/package. For example: families, teams, enterprise, etc."
   },
   "changeBillingPlan": {
-    "message": "Change Plan",
+    "message": "Muuta paketti",
     "description": "A billing plan\/package. For example: families, teams, enterprise, etc."
   },
   "changeBillingPlanDesc": {
@@ -2255,7 +2255,7 @@
     "message": "Account Holder Name"
   },
   "bankAccountType": {
-    "message": "Account Type"
+    "message": "Konto tüüp"
   },
   "bankAccountTypeCompany": {
     "message": "Ettevõte (äri)"
@@ -2267,11 +2267,11 @@
     "message": "Sisesta oma paigalduse id"
   },
   "addSeats": {
-    "message": "Add Seats",
+    "message": "Lisa kasutajaid",
     "description": "Seat = User Seat"
   },
   "removeSeats": {
-    "message": "Remove Seats",
+    "message": "Eemalda kasutajaid",
     "description": "Seat = User Seat"
   },
   "subscriptionUserSeats": {
@@ -2284,10 +2284,10 @@
     }
   },
   "seatsToAdd": {
-    "message": "Seats To Add"
+    "message": "Lisatavad kasutajad"
   },
   "seatsToRemove": {
-    "message": "Seats To Remove"
+    "message": "Eemaldatavad kasutajad"
   },
   "seatsAddNote": {
     "message": "Adding user seats will result in adjustments to your billing totals and immediately charge your payment method on file. The first charge will be prorated for the remainder of the current billing cycle."
@@ -2338,10 +2338,10 @@
     "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   },
   "createOrganizationStep1": {
-    "message": "Create Organization: Step 1"
+    "message": "Organisatsiooni loomine: Samm 1"
   },
   "createOrganizationCreatePersonalAccount": {
-    "message": "Before creating your organization, you first need to create a free personal account."
+    "message": "Enne organisatsiooni loomist pead esmalt registreerima tasuta personaalkonto."
   },
   "refunded": {
     "message": "Tagasi makstud"
@@ -2363,38 +2363,38 @@
     "message": "Filtrid"
   },
   "lockOptions": {
-    "message": "Lock Options"
+    "message": "Automaatne lukustamine"
   },
   "lockOptionsDesc": {
-    "message": "Choose when your vault locks. A locked vault requires that you re-enter your master password to access it again."
+    "message": "Vali, kuna hoidla lukustatakse. Lukustatud hoidlale pääseb ligi pärast ülemparooli sisestamist."
   },
   "oneMinute": {
-    "message": "1 minute"
+    "message": "1 minuti pärast"
   },
   "fiveMinutes": {
-    "message": "5 minutes"
+    "message": "5 minuti pärast"
   },
   "fifteenMinutes": {
-    "message": "15 minutes"
+    "message": "15 minuti pärast"
   },
   "thirtyMinutes": {
-    "message": "30 minutes"
+    "message": "30 minuti pärast"
   },
   "oneHour": {
-    "message": "1 hour"
+    "message": "1 tunni pärast"
   },
   "fourHours": {
-    "message": "4 hours"
+    "message": "4 tunni pärast"
   },
   "onRefresh": {
-    "message": "On Browser Refresh"
+    "message": "Brauseri kinnipanekul"
   },
   "dateUpdated": {
-    "message": "Updated",
+    "message": "Uuendatud",
     "description": "ex. Date this item was updated"
   },
   "datePasswordUpdated": {
-    "message": "Password Updated",
+    "message": "Parool on uuendatud",
     "description": "ex. Date this password was updated"
   },
   "organizationIsDisabled": {
diff --git a/src/locales/nl/messages.json b/src/locales/nl/messages.json
index 9084797483..cfb22c9aec 100644
--- a/src/locales/nl/messages.json
+++ b/src/locales/nl/messages.json
@@ -10,7 +10,7 @@
     }
   },
   "whatTypeOfItem": {
-    "message": "Wat voor type item voegt u toe?"
+    "message": "Welk soort item is dit?"
   },
   "name": {
     "message": "Naam"
@@ -137,7 +137,7 @@
     "message": "Vervaljaar"
   },
   "authenticatorKeyTotp": {
-    "message": "Authenticatiesleutel (TOTP)"
+    "message": "Authenticatiegeheim (TOTP)"
   },
   "folder": {
     "message": "Map"
@@ -293,19 +293,19 @@
     "message": "Voornaam"
   },
   "middleName": {
-    "message": "Tussenvoegsel"
+    "message": "Tweede voornaam"
   },
   "lastName": {
     "message": "Achternaam"
   },
   "address1": {
-    "message": "Adres 1"
+    "message": "Adresregel 1"
   },
   "address2": {
-    "message": "Adres 2"
+    "message": "Adresregel 2"
   },
   "address3": {
-    "message": "Adres 3"
+    "message": "Adresregel 3"
   },
   "cityTown": {
     "message": "Stad \/ Dorp"
@@ -427,19 +427,19 @@
     "message": "U kunt deze functie niet gebruiken zolang u uw encryptiesleutel niet hebt bijgewerkt."
   },
   "addedItem": {
-    "message": "Item is toegevoegd"
+    "message": "Object is toegevoegd"
   },
   "editedItem": {
-    "message": "Item is bewerkt"
+    "message": "Object is bewerkt"
   },
   "sharedItem": {
-    "message": "Item is gedeeld"
+    "message": "Object is gedeeld"
   },
   "sharedItems": {
-    "message": "Items zijn gedeeld"
+    "message": "Objecten zijn gedeeld"
   },
   "deleteItem": {
-    "message": "Item verwijderen"
+    "message": "Object verwijderen"
   },
   "deleteFolder": {
     "message": "Map verwijderen"
@@ -448,7 +448,7 @@
     "message": "Bijlage verwijderen"
   },
   "deleteItemConfirmation": {
-    "message": "Weet u zeker dat u dit item wilt verwijderen?"
+    "message": "Weet u zeker dat u dit object wilt verwijderen?"
   },
   "deletedItem": {
     "message": "Item is verwijderd"
@@ -577,13 +577,13 @@
     "message": "Uw kluis is vergrendeld. Controleer uw hoofdwachtwoord om door te gaan."
   },
   "unlock": {
-    "message": "Ontgrendelen"
+    "message": "Ontgrendel"
   },
   "invalidMasterPassword": {
     "message": "Ongeldig hoofdwachtwoord"
   },
   "lockNow": {
-    "message": "Nu vergrendelen"
+    "message": "Vergrendel nu"
   },
   "noItemsInList": {
     "message": "Er zijn geen items om weer te geven."
@@ -637,7 +637,7 @@
     }
   },
   "rememberMe": {
-    "message": "Mijn gegevens onthouden"
+    "message": "Onthoud mij"
   },
   "sendVerificationCodeEmailAgain": {
     "message": "Verificatiecode-e-mail opnieuw versturen"
@@ -966,7 +966,7 @@
     "message": "Standaard"
   },
   "domainRules": {
-    "message": "Domain Rules"
+    "message": "Domeinregels"
   },
   "domainRulesDesc": {
     "message": "If you have the same login across multiple different website domains, you can mark the website as \"equivalent\". \"Global\" domains are ones already created for you by Bitwarden."
@@ -987,7 +987,7 @@
     "message": "Aanpassen"
   },
   "newCustomDomain": {
-    "message": "New Custom Domain"
+    "message": "Nieuw Aangepast Domein"
   },
   "newCustomDomainDesc": {
     "message": "Enter a list of domains separated by commas. Only \"base\" domains are allowed. Do not enter subdomains. For example, enter \"google.com\" instead of \"www.google.com\". You can also enter \"androidapp:\/\/package.name\" to associate an android app with other website domains."
@@ -1256,7 +1256,7 @@
     "message": "Breach Occurred"
   },
   "breachReported": {
-    "message": "Breach Reported"
+    "message": "Lek Gerapporteerd"
   },
   "reportError": {
     "message": "An error occurred trying to load the report. Try again"
@@ -1305,7 +1305,7 @@
     "message": "Extra opslagruimte (GB)"
   },
   "additionalStorageGbDesc": {
-    "message": "# of additional GB"
+    "message": "# extra GB"
   },
   "additionalStorageDesc": {
     "message": "Your plan comes with $SIZE$ of encrypted file storage. You can add additional storage for $PRICE$ per GB \/year.",
@@ -1349,7 +1349,7 @@
     }
   },
   "paymentInformation": {
-    "message": "Payment Information"
+    "message": "Betaalgegevens"
   },
   "creditCard": {
     "message": "Creditcard"