diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
index 32a841849e5..bc37154a267 100644
--- a/src/i18n/en-US.json
+++ b/src/i18n/en-US.json
@@ -266,7 +266,7 @@
   "connectionRequestConnect": "Connect",
   "connectionRequestIgnore": "Ignore",
   "conversationAssetDownloading": "Downloading…",
-  "conversationAssetFailedDecryptDownloading": "DOWNLOAD FAILED (CANNOT DECRYPT)",
+  "conversationAssetFailedDecryptDownloading": "DOWNLOAD FAILED (File could not be decrypted)",
   "conversationAssetFailedHashDownloading": "DOWNLOAD FAILED (HASH DOES NOT MATCH)",
   "conversationAssetRestrictedAudioMessageHeadline": "Audio message",
   "conversationAssetUploadFailed": "Upload Failed",
@@ -693,25 +693,25 @@
   "modalAcknowledgeAction": "Ok",
   "modalAcknowledgeHeadline": "Something went wrong",
   "modalAppLockForgotGoBackButton": "Go back",
-  "modalAppLockForgotMessage": "The data stored on this device can only be accessed with your app lock passphrase. If you have forgotten your passphrase, you can reset this client.",
-  "modalAppLockForgotTitle": "Forgot your app lock passphrase?",
+  "modalAppLockForgotMessage": "The data stored on this device can only be accessed with your app lock passcode. If you have forgotten your passcode, you can reset this client.",
+  "modalAppLockForgotTitle": "Forgot your app lock passcode?",
   "modalAppLockForgotWipeCTA": "Reset this client",
-  "modalAppLockLockedError": "Wrong passphrase",
+  "modalAppLockLockedError": "Wrong passcode",
   "modalAppLockLockedForgotCTA": "Access as new device",
   "modalAppLockLockedTitle": "Enter passcode to unlock {{brandName}}",
   "modalAppLockLockedUnlockButton": "Unlock",
   "modalAppLockPasscode": "Passcode",
-  "modalAppLockSetupAcceptButton": "Set passphrase",
+  "modalAppLockSetupAcceptButton": "Set passcode",
   "modalAppLockSetupChangeMessage": "Your organization needs to lock your app when {{brandName}} is not in use to keep the team safe.[br]Create a passlock to unlock {{brandName}}. Please, remember it, as it can not be recovered.",
   "modalAppLockSetupChangeTitle": "There was a change at {{brandName}}",
-  "modalAppLockSetupCloseBtn": "Close window, Set app lock passphrase?",
+  "modalAppLockSetupCloseBtn": "Close window, Set app lock passcode?",
   "modalAppLockSetupDigit": "A digit",
   "modalAppLockSetupLong": "At least {{minPasswordLength}} characters long",
   "modalAppLockSetupLower": "A lowercase letter",
-  "modalAppLockSetupMessage": "The app will lock itself after a certain time of inactivity.[br]To unlock the app you need to enter this passphrase.[br]Make sure to remember this passphrase as there is no way to recover it.",
-  "modalAppLockSetupSecondPlaceholder": "Repeat passphrase",
+  "modalAppLockSetupMessage": "The app will lock itself after a certain time of inactivity.[br]To unlock the app you need to enter this passcode.[br]Make sure to remember this passcode as there is no way to recover it.",
+  "modalAppLockSetupSecondPlaceholder": "Repeat passcode",
   "modalAppLockSetupSpecial": "A special character",
-  "modalAppLockSetupTitle": "Set app lock passphrase",
+  "modalAppLockSetupTitle": "Set app lock passcode",
   "modalAppLockSetupUppercase": "An uppercase letter",
   "modalAppLockWipeConfirmConfirmButton": "Reset this client",
   "modalAppLockWipeConfirmGoBackButton": "Go back",
@@ -1000,9 +1000,9 @@
   "preferencesAccountPrivacy": "Privacy",
   "preferencesAccountReadReceiptsCheckbox": "Read receipts",
   "preferencesAccountReadReceiptsDetail": "When this is off, you won’t be able to see read receipts from other people. This setting does not apply to group conversations.",
-  "preferencesAccountResetAppLockPassphrase": "Reset app lock passphrase",
+  "preferencesAccountResetAppLockPassphrase": "Reset app lock passcode",
   "preferencesAccountResetPassword": "Reset password",
-  "preferencesAccountSetAppLockPassphrase": "Set app lock passphrase",
+  "preferencesAccountSetAppLockPassphrase": "Set app lock passcode",
   "preferencesAccountTeam": "Team",
   "preferencesAccountUsername": "Username",
   "preferencesAccountUsernameAvailable": "Available",