diff --git a/Ring/Ring/Resources/ace.lproj/Localizable.strings b/Ring/Ring/Resources/ace.lproj/Localizable.strings
index 220b6be9934333545b5fcf82abcb8107a887cd72..ce5175404f475b1e9a68d5757aba1dd30df6a5e9 100644
--- a/Ring/Ring/Resources/ace.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ace.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "ڤرليمن ڤرساتوان";
-"global.confirm" = "Confirm";
+"global.confirm" = "ڤڠاجرن";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "ڤڠاجرن";
+"global.connect" = "وصلكن";
 
 // Scan
 "scan.badQrCode" = "كود QR يڠ براوسيا";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "كود QR";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "ميكروفون خاموش";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "ڤڠاجين ڤڠاجين";
 "accessibility.calls.default.hangUpCall" = "Hang up";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "كرانڽ";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "كاميرا ڤڠهادڤن";
 "accessibility.calls.alter.pauseCall" = "ڤڠاجين ڤڠاجين";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
 "accessibility.calls.alter.addParticipant" = "مڠمبيل ڤڠوربان";
diff --git a/Ring/Ring/Resources/ar.lproj/Localizable.strings b/Ring/Ring/Resources/ar.lproj/Localizable.strings
index 8afcdb79c28acce52e1e1c2e8ef57b3010362aef..72d6eb72b69ba2bf1bf45f5ca79649dc2a111ab6 100644
--- a/Ring/Ring/Resources/ar.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ar.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "الوقت";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "تأكيد كلمة المرور";
-"global.confirm" = "Confirm";
+"global.confirm" = "تأكيد";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "تأكيد";
+"global.connect" = "إتصال";
 
 // Scan
 "scan.badQrCode" = "رمز QR غير صالح";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "رمز QR";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "غادر";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "كتم ميكروفون";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "وقفة المكالمة";
 "accessibility.calls.default.hangUpCall" = "إنهاء";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "رفع اليد";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "أوقف الكاميرا";
 "accessibility.calls.alter.pauseCall" = "استئناف المكالمة";
 "accessibility.calls.alter.hangUpCall" = "إنهاء";
 "accessibility.calls.alter.addParticipant" = "أضف مشارك";
diff --git a/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings b/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
index 9ac93b0648719c260b8d091ba5eaf9f2012fde41..34f500c00b92b8faeea599d265cde401f86bb82d 100644
--- a/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "الوقت";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "تأكيد كلمة المرور";
-"global.confirm" = "Confirm";
+"global.confirm" = "تأكيد";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "تأكيد";
+"global.connect" = "إتصال";
 
 // Scan
 "scan.badQrCode" = "رمز QR غير صالح";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "رمز QR";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "غادر";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "كتم ميكروفون";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "وقفة المكالمة";
 "accessibility.calls.default.hangUpCall" = "إنهاء";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "رفع اليد";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "أوقف الكاميرا";
 "accessibility.calls.alter.pauseCall" = "استئناف المكالمة";
 "accessibility.calls.alter.hangUpCall" = "إنهاء";
 "accessibility.calls.alter.addParticipant" = "أضف مشارك";
diff --git a/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings b/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
index ab1788ad3b040b392d470799631b3f6f5ab4fe34..1f98fc039e6b4438ff215dacb03945358468c128 100644
--- a/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Confirmar contraseña";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Confirmar";
+"global.connect" = "Conectar";
 
 // Scan
 "scan.badQrCode" = "Un codiciu QR malo";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "Códice QR";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Micrófonos silenciosos";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Pausa llamada";
 "accessibility.calls.default.hangUpCall" = "Enfermedaes.";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Ellí ye la mano.";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "La cámara de detención";
 "accessibility.calls.alter.pauseCall" = "Reanudar la llamada";
 "accessibility.calls.alter.hangUpCall" = "Enfermedaes.";
 "accessibility.calls.alter.addParticipant" = "Aúna de les partes";
diff --git a/Ring/Ring/Resources/az.lproj/Localizable.strings b/Ring/Ring/Resources/az.lproj/Localizable.strings
index 82b6d5a818f6698a600b588b44bda368fb1e3bce..f33bb0574007b7f708e1b565559f7c6d569981c1 100644
--- a/Ring/Ring/Resources/az.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/az.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "رمز لری تصدیق ائدیر";
-"global.confirm" = "Confirm";
+"global.confirm" = "تأکید ائدیر";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "تأکید ائدیر";
+"global.connect" = "باغلا";
 
 // Scan
 "scan.badQrCode" = "سيخين QR کد";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "QR کد";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Mikrofonu səssiz et";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "توقف تماس";
 "accessibility.calls.default.hangUpCall" = "باغلا";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "ال قالديريب";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "دوربین ایست";
 "accessibility.calls.alter.pauseCall" = "تماسونو تکرار ائتمک";
 "accessibility.calls.alter.hangUpCall" = "باغلا";
 "accessibility.calls.alter.addParticipant" = "شرکتچی قوش";
diff --git a/Ring/Ring/Resources/az_IR.lproj/Localizable.strings b/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
index a0d3eb1863e52e59005a794cca03c0a1c1594e75..6eaa684bc6375170a61b0c60af0b4e5f4d0b48c9 100644
--- a/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "رمز لری تصدیق ائدیر";
-"global.confirm" = "Confirm";
+"global.confirm" = "تأکید ائدیر";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "تأکید ائدیر";
+"global.connect" = "باغلا";
 
 // Scan
 "scan.badQrCode" = "سيخين QR کد";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "QR کد";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "ساکیت مئکروفون";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "توقف تماس";
 "accessibility.calls.default.hangUpCall" = "باغلا";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "ال قالديريب";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "دوربین ایست";
 "accessibility.calls.alter.pauseCall" = "تماسونو تکرار ائتمک";
 "accessibility.calls.alter.hangUpCall" = "باغلا";
 "accessibility.calls.alter.addParticipant" = "شرکتچی قوش";
diff --git a/Ring/Ring/Resources/be.lproj/Localizable.strings b/Ring/Ring/Resources/be.lproj/Localizable.strings
index 3a51d8c4c5bfdb404f2a153ee553c86ee740630d..95b21e41188326a1e1964b5a950be4e76889e865 100644
--- a/Ring/Ring/Resources/be.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/be.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Пацвердзіць пароль";
-"global.confirm" = "Confirm";
+"global.confirm" = "Пацвердзіць";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Пацвердзіць";
+"global.connect" = "Злучэнне";
 
 // Scan
 "scan.badQrCode" = "Дрэнны QR-код";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "QR код";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Непаўны мікрафон";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Паза званок";
 "accessibility.calls.default.hangUpCall" = "Hang up";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Падыміце руку";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Спыніць камеру";
 "accessibility.calls.alter.pauseCall" = "Падключыць званок";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
 "accessibility.calls.alter.addParticipant" = "Дадаць удзельніка";
diff --git a/Ring/Ring/Resources/be_BY.lproj/Localizable.strings b/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
index 3a51d8c4c5bfdb404f2a153ee553c86ee740630d..95b21e41188326a1e1964b5a950be4e76889e865 100644
--- a/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Пацвердзіць пароль";
-"global.confirm" = "Confirm";
+"global.confirm" = "Пацвердзіць";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Пацвердзіць";
+"global.connect" = "Злучэнне";
 
 // Scan
 "scan.badQrCode" = "Дрэнны QR-код";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "QR код";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Непаўны мікрафон";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Паза званок";
 "accessibility.calls.default.hangUpCall" = "Hang up";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Падыміце руку";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Спыніць камеру";
 "accessibility.calls.alter.pauseCall" = "Падключыць званок";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
 "accessibility.calls.alter.addParticipant" = "Дадаць удзельніка";
diff --git a/Ring/Ring/Resources/bg.lproj/Localizable.strings b/Ring/Ring/Resources/bg.lproj/Localizable.strings
index 85171692ccc97be1171634eb867b21b4f5bb46f5..53b0672a266da46287cd6b320699946dccc40791 100644
--- a/Ring/Ring/Resources/bg.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bg.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Време";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Потвърдете паролата";
-"global.confirm" = "Confirm";
+"global.confirm" = "Потвърди";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Потвърди";
+"global.connect" = "Свържете се";
 
 // Scan
 "scan.badQrCode" = "Грешен QR-код";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "QR код";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "Изход";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Заглушаване на микрофона";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Позвони на пауза";
 "accessibility.calls.default.hangUpCall" = "Затваряне";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Вдигнете ръка";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Стъп камери";
 "accessibility.calls.alter.pauseCall" = "Презачаване на обаждането";
 "accessibility.calls.alter.hangUpCall" = "Затваряне";
 "accessibility.calls.alter.addParticipant" = "Добавяне на участник";
diff --git a/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings b/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
index 85171692ccc97be1171634eb867b21b4f5bb46f5..53b0672a266da46287cd6b320699946dccc40791 100644
--- a/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Време";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Потвърдете паролата";
-"global.confirm" = "Confirm";
+"global.confirm" = "Потвърди";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Потвърди";
+"global.connect" = "Свържете се";
 
 // Scan
 "scan.badQrCode" = "Грешен QR-код";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "QR код";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "Изход";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Заглушаване на микрофона";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Позвони на пауза";
 "accessibility.calls.default.hangUpCall" = "Затваряне";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Вдигнете ръка";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Стъп камери";
 "accessibility.calls.alter.pauseCall" = "Презачаване на обаждането";
 "accessibility.calls.alter.hangUpCall" = "Затваряне";
 "accessibility.calls.alter.addParticipant" = "Добавяне на участник";
diff --git a/Ring/Ring/Resources/bn.lproj/Localizable.strings b/Ring/Ring/Resources/bn.lproj/Localizable.strings
index 36cefab41904194ca295a8400c48d10746abce29..4b12d4e0135a9e0ca1ec4fb0a067a9971c8e9529 100644
--- a/Ring/Ring/Resources/bn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bn.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "পাসওয়ার্ড নিশ্চিত করুন";
-"global.confirm" = "Confirm";
+"global.confirm" = "নিশ্চিত করুন";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "নিশ্চিত করুন";
+"global.connect" = "সংযুক্ত করুন";
 
 // Scan
 "scan.badQrCode" = "খারাপ QR কোড";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "QR কোড";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "নিঃশব্দ মাইক্রোফোন";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "বিরতি কল";
 "accessibility.calls.default.hangUpCall" = "বন্ধ করো";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "হাত বাড়াও";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "স্টপ ক্যামেরা";
 "accessibility.calls.alter.pauseCall" = "পুনরায় কল";
 "accessibility.calls.alter.hangUpCall" = "বন্ধ করো";
 "accessibility.calls.alter.addParticipant" = "অংশগ্রহণকারী যোগ করুন";
diff --git a/Ring/Ring/Resources/ca.lproj/Localizable.strings b/Ring/Ring/Resources/ca.lproj/Localizable.strings
index 15392dbb4a74bc815913f689d9d4242f5348652b..da422d3451b6960cbe08a591eff43b679101a408 100644
--- a/Ring/Ring/Resources/ca.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ca.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Temps";
 "global.editPassword" = "Edita la contrasenya";
 "global.confirmPassword" = "Confirmi contrasenya";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirma";
 "global.cameraDisabled" = "L'accés a la càmera està deshabilitat. Habiliteu-lo en la configuració del dispositiu per fer servir aquesta funció.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Confirma";
+"global.connect" = "Connectar";
 
 // Scan
 "scan.badQrCode" = "Mal codi QR";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "Codi QR";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "Sortir";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Silencia el micròfon";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Pausa de trucada";
 "accessibility.calls.default.hangUpCall" = "Penja";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Aixeca la mà";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Aparell de detenció";
 "accessibility.calls.alter.pauseCall" = "Reanudar la trucada";
 "accessibility.calls.alter.hangUpCall" = "Penja";
 "accessibility.calls.alter.addParticipant" = "Afegir participant";
diff --git a/Ring/Ring/Resources/cmn.lproj/Localizable.strings b/Ring/Ring/Resources/cmn.lproj/Localizable.strings
index ec52111a5e964860e13e51431a2c7638d9031869..f41b7f29b632e6bed3ecd8e85d2603aa1a6f0447 100644
--- a/Ring/Ring/Resources/cmn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cmn.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "时间";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "确认密码";
-"global.confirm" = "Confirm";
+"global.confirm" = "確認";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "確認";
+"global.connect" = "连接";
 
 // Scan
 "scan.badQrCode" = "无效的二维码";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "二维码";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "離開";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,8 +572,8 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.toggleAudio" = "关闭麦克风";
+"accessibility.calls.default.toggleVideo" = "启动摄像头";
 "accessibility.calls.default.pauseCall" = "暫停通話";
 "accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "举手";
 
 "accessibility.calls.alter.toggleAudio" = "麦克风静音";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "关闭摄像头";
 "accessibility.calls.alter.pauseCall" = "恢复通话";
 "accessibility.calls.alter.hangUpCall" = "挂断";
 "accessibility.calls.alter.addParticipant" = "添加参与者";
diff --git a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
index f6e078b818d84f069950a8bd747c8b21a643d4c7..789d47c577f3baff213cf1e8b6c8a13a30eaacd0 100644
--- a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Čas";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Potvrdit heslo";
-"global.confirm" = "Confirm";
+"global.confirm" = "Potvrdit";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Potvrdit";
+"global.connect" = "Připojit";
 
 // Scan
 "scan.badQrCode" = "Špatný kód QR";
@@ -107,7 +107,7 @@
 "smartlist.newContact" = "New contact";
 "smartlist.newGroup" = "New group";
 "smartlist.accounts" = "Účty";
-"smartlist.invitationReceived" = "Invitations received";
+"smartlist.invitationReceived" = "Pozvání přijato";
 "smartlist.noResults" = "Žádné výsledky";
 "smartlist.noConversation" = "Žádné konverzace";
 "smartlist.searchBarPlaceholder" = "Enter name…";
@@ -152,7 +152,7 @@
 "invitations.accepted" = "Přijato";
 "invitations.declined" = "Declined";
 "invitations.blocked" = "Blocked";
-"invitations.list" = "Invitations received";
+"invitations.list" = "Pozvání přijato";
 
 // Walkthrough
 
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "Kód QR";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "Odejít";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Ztlumit mikrofon";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Pozastavení volání";
 "accessibility.calls.default.hangUpCall" = "Zavěsit";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Zvednout ruku";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Zastavit kameru";
 "accessibility.calls.alter.pauseCall" = "Pokračovat v hovoru";
 "accessibility.calls.alter.hangUpCall" = "Zavěsit";
 "accessibility.calls.alter.addParticipant" = "Přidat účastníka";
diff --git a/Ring/Ring/Resources/da.lproj/Localizable.strings b/Ring/Ring/Resources/da.lproj/Localizable.strings
index 0cb1676f8b6f4906310d96697374292e45f77db8..5e99c06b6f8bac53121f366b183d3d7592c7546f 100644
--- a/Ring/Ring/Resources/da.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/da.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Tid";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Bekræft adgangskode";
-"global.confirm" = "Confirm";
+"global.confirm" = "- Det bekræfter jeg.";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "- Det bekræfter jeg.";
+"global.connect" = "Køb";
 
 // Scan
 "scan.badQrCode" = "Ugyldigt QR-kode";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "QR-kode";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "Afslut";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Sluk mikrofon";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Pause-opkald";
 "accessibility.calls.default.hangUpCall" = "Læg på";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Løft hånden.";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Stop kameraet";
 "accessibility.calls.alter.pauseCall" = "Opkaldet genoptages";
 "accessibility.calls.alter.hangUpCall" = "Læg på";
 "accessibility.calls.alter.addParticipant" = "Tilføj deltager";
diff --git a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
index 413e5611cff452a2514c4691a953381a0652a351..efedfbc75dbe282a93d9cd152d34b58d7791d90a 100644
--- a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Passwort bearbeiten";
 "global.confirmPassword" = "Konto bestätigen";
-"global.confirm" = "Confirm";
+"global.confirm" = "Bestätigen";
 "global.cameraDisabled" = "Der Kamerazugriff ist deaktiviert. Aktivieren Sie diesen in den Geräteeinstellungen, um diese Funktion zu nutzen.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Bestätigen";
+"global.connect" = "Verbinden";
 
 // Scan
 "scan.badQrCode" = "Bad QR code";
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Ein Jami-Konto wird nur auf diesem Gerät lokal erstellt und als Archiv mit seinen Kontoschlüsseln gespeichert. Der Zugriff auf das Archiv kann optional mit einem Passwort geschützt werden.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.importAccount" = "Konto importieren";
+"linkToAccount.showQrCode" = "QR-Code";
+"linkToAccount.showPinCode" = "Authentifizierungscode";
+"linkToAccount.actionRequired" = "Aktion erforderlich.\nBitte bestätigen Sie das Konto auf dem Quellgerät.";
+"linkToAccount.allSet" = "Konto erfolgreich importiert.";
+"linkToAccount.goToAccounts" = "Zum importierten Konto gehen";
+"linkToAccount.exportInstructions" = "Starten Sie den Export auf dem Quellgerät.";
+"linkToAccount.exportInstructionsPath" = "Wählen Sie Konto > Kontoeinstellungen > Neues Gerät verknüpfen.";
+"linkToAccount.scanQrCode" = "Wenn Sie bereit sind, scannen Sie den QR-Code.";
+"linkToAccount.enterProvidedCode" = "Wenn Sie bereit sind, geben Sie den Authentifizierungscode ein.";
+"linkToAccount.accountLockedWithPassword" = "Das Konto ist mit einem Passwort geschützt.\nUm fortzufahren, geben Sie das Kontopasswort ein.";
+"linkToAccount.exit" = "Beenden";
+"linkToAccount.shareMessage" = "Ihr Code ist: %@";
+"linkToAccount.alertTile" = "Möchten Sie den Vorgang beenden?";
+"linkToAccount.alertMessage" = "Durch das Beenden wird der Kontoimportvorgang abgebrochen.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Ein Jami-Konto aus lokalen Archivdatei importieren.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Ein neues Gerät verknüpfen";
 "linkDevice.networkError" = "Beim Exportieren des Kontos ist ein Netzwerkfehler aufgetreten.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Es ist ein Authentifizierungsfehler aufgetreten.\nBitte bestätigen Sie Ihr Passwort.";
+"linkDevice.errorNetwork" = "Es ist ein Netzwerkfehler aufgetreten.\nBitte überprüfen Sie Ihre Verbindung.";
+"linkDevice.errorTimeout" = "Der Vorgang ist abgelaufen.\nBitte versuchen Sie es erneut.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Beim Exportieren des Kontos ist ein Fehler aufgetreten.n\nBitte versuchen Sie es erneut.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Wenn Sie bereit sind, scannen Sie den QR-Code.";
+"linkDevice.infoCode" = "Wenn Sie bereit sind, geben Sie den Code ein und drücken Sie „Verbinden“.";
+"linkDevice.connecting" = "Verbindung zu Ihrem neuen Gerät wird hergestellt …";
+"linkDevice.authenticationInfo" = "Neues Gerät unter der unten stehenden IP-Adresse gefunden. Sind Sie das?\nUm mit der Übertragung des Kontos fortzufahren, klicken Sie auf „Bestätigen“.";
+"linkDevice.newDeviceIP" = "Neue Geräte-IP-Adresse: %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Der neue Geräte-Identifikator wird nicht erkannt.\nBitte folgen Sie den obigen Anweisungen.";
+"linkDevice.exportInProgress" = "Der Exportvorgang des Kontos auf das neue Gerät ist im Gange.\nBitte bestätigen Sie den Import auf dem neuen Gerät.";
+"linkDevice.completed" = "Konto erfolgreich auf das neue Gerät importiert.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Einen Audioanruf beginnen";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ ungelesene Nachrichten.";
 "accessibility.conversationRowBlocked" = "Unterhaltung blockiert";
 "accessibility.conversationRowSyncing" = "Synchronisierung im Gange";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Letzte Nachricht an %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Verfügbar";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Erhaltene Einladungen:  %@ ausstehende Einladungen";
 "accessibility.pendingRequestsRowSingular" = "Einladung erhalten: %@ Einladung ausstehend";
 "accessibility.pendingRequestsRowHint" = "Doppeltippen um erhaltene Einladungen zu überprüfen und darauf zu antworten";
 "accessibility.pendingRequestsListBlockUser" = "Absender der Einladung blockieren";
@@ -565,16 +564,16 @@
 "accessibility.messageBubbleEdited" = "Bearbeitet";
 "accessibility.messageBubbleRead" = "Gelesen";
 "accessibility.messageBubbleUnread" = "Ungelesen";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Leere Textnachricht empfangen am %@. Diese wurde möglicherweise nicht korrekt gesendet.";
 "accessibility.fileTransferNoName" = "Datei empfangen am %@, Name nicht verfügbar";
 "accessibility.inReply" = "Als Antwort auf die Nachricht";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.text.receivedOn" = "%1@, Nachricht erhalten am %2@";
+"accessibility.text.sentOn" = "%1@, Nachricht gesendet am %2@";
+"accessibility.fileTransfer.receivedOn" = "Datei: %1@ , empfangen am %2@";
+"accessibility.fileTransfer.sentOn" = "Datei: %1@, gesendet am %2@";
+"accessibility.call.lasted" = "Dauerte %@";
+"accessibility.calls.default.toggleAudio" = "Mikrofon stummschalten";
+"accessibility.calls.default.toggleVideo" = "Kamera starten";
 "accessibility.calls.default.pauseCall" = "Gespräch Halten";
 "accessibility.calls.default.hangUpCall" = "Auflegen";
 "accessibility.calls.default.addParticipant" = "Teilnehmer hinzufügen";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Ihre Hand heben";
 
 "accessibility.calls.alter.toggleAudio" = "Mikrofon-Stummschaltung aufheben";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Kamera stoppen";
 "accessibility.calls.alter.pauseCall" = "Gespräch wieder aufnehmen";
 "accessibility.calls.alter.hangUpCall" = "Auflegen";
 "accessibility.calls.alter.addParticipant" = "Teilnehmer hinzufügen";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Auflegen";
 "accessibility.conference.lowerHand" = "Hand senken";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Token-QR-Code";
diff --git a/Ring/Ring/Resources/de.lproj/Localizable.strings b/Ring/Ring/Resources/de.lproj/Localizable.strings
index afb4ee1b246df12e9512f3198752a63a227f0805..3f1abc8b3fd0c0135a9639a40dc723cedd11ae22 100644
--- a/Ring/Ring/Resources/de.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Zeit";
 "global.editPassword" = "Passwort bearbeiten";
 "global.confirmPassword" = "Passwort bestätigen";
-"global.confirm" = "Confirm";
+"global.confirm" = "Bestätigen";
 "global.cameraDisabled" = "Der Kamerazugriff ist deaktiviert. Aktivieren Sie diesen in den Geräteeinstellungen, um diese Funktion zu nutzen.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Bestätigen";
+"global.connect" = "Verbinden";
 
 // Scan
 "scan.badQrCode" = "QR-Code ungültig";
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Ein Jami-Konto wird nur auf diesem Gerät lokal erstellt und als Archiv mit seinen Kontoschlüsseln gespeichert. Der Zugriff auf das Archiv kann optional mit einem Passwort geschützt werden.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.importAccount" = "Konto importieren";
+"linkToAccount.showQrCode" = "QR-Code";
+"linkToAccount.showPinCode" = "Authentifizierungscode";
+"linkToAccount.actionRequired" = "Aktion erforderlich.\nBitte bestätigen Sie das Konto auf dem Quellgerät.";
+"linkToAccount.allSet" = "Konto erfolgreich importiert.";
+"linkToAccount.goToAccounts" = "Zum importierten Konto gehen";
+"linkToAccount.exportInstructions" = "Starten Sie den Export auf dem Quellgerät.";
+"linkToAccount.exportInstructionsPath" = "Wählen Sie Konto > Kontoeinstellungen > Neues Gerät verknüpfen.";
+"linkToAccount.scanQrCode" = "Wenn Sie bereit sind, scannen Sie den QR-Code.";
+"linkToAccount.enterProvidedCode" = "Wenn Sie bereit sind, geben Sie den Authentifizierungscode ein.";
+"linkToAccount.accountLockedWithPassword" = "Das Konto ist mit einem Passwort geschützt.\nUm fortzufahren, geben Sie das Kontopasswort ein.";
+"linkToAccount.exit" = "Schliessen";
+"linkToAccount.shareMessage" = "Ihr Code ist: %@";
+"linkToAccount.alertTile" = "Möchten Sie den Vorgang beenden?";
+"linkToAccount.alertMessage" = "Durch das Beenden wird der Kontoimportvorgang abgebrochen.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Ein Jami-Konto aus lokalen Archivdatei importieren.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Verbinde neues Gerät";
 "linkDevice.networkError" = "Beim Exportieren des Kontos ist ein Netzwerkfehler aufgetreten.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Es ist ein Authentifizierungsfehler aufgetreten.\nBitte bestätigen Sie Ihr Passwort.";
+"linkDevice.errorNetwork" = "Es ist ein Netzwerkfehler aufgetreten.\nBitte überprüfen Sie Ihre Verbindung.";
+"linkDevice.errorTimeout" = "Der Vorgang ist abgelaufen.\nBitte versuchen Sie es erneut.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Beim Exportieren des Kontos ist ein Fehler aufgetreten.n\nBitte versuchen Sie es erneut.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Wenn Sie bereit sind, scannen Sie den QR-Code.";
+"linkDevice.infoCode" = "Wenn Sie bereit sind, geben Sie den Code ein und drücken Sie „Verbinden“.";
+"linkDevice.connecting" = "Verbindung zu Ihrem neuen Gerät wird hergestellt …";
+"linkDevice.authenticationInfo" = "Neues Gerät unter der unten stehenden IP-Adresse gefunden. Sind Sie das?\nUm mit der Übertragung des Kontos fortzufahren, klicken Sie auf „Bestätigen“.";
+"linkDevice.newDeviceIP" = "Neue Geräte-IP-Adresse: %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Der neue Geräte-Identifikator wird nicht erkannt.\nBitte folgen Sie den obigen Anweisungen.";
+"linkDevice.exportInProgress" = "Der Exportvorgang des Kontos auf das neue Gerät ist im Gange.\nBitte bestätigen Sie den Import auf dem neuen Gerät.";
+"linkDevice.completed" = "Konto erfolgreich auf das neue Gerät importiert.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Audioanruf starten";
@@ -552,11 +551,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ ungelesene Nachrichten.";
 "accessibility.conversationRowBlocked" = "Unterhaltung blockiert";
 "accessibility.conversationRowSyncing" = "Synchronisierung im Gange";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Letzte Nachricht an %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Verfügbar";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
-"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Erhaltene Einladungen:  %@ ausstehende Einladungen";
+"accessibility.pendingRequestsRowSingular" = "Einladung erhalten: %@ Einladung ausstehend";
 "accessibility.pendingRequestsRowHint" = "Doppeltippen um erhaltene Einladungen zu überprüfen und darauf zu antworten";
 "accessibility.pendingRequestsListBlockUser" = "Absender der Einladung blockieren";
 "accessibility.pendingRequestsListRejectInvitation" = "Einladung ablehnen";
@@ -565,16 +564,16 @@
 "accessibility.messageBubbleEdited" = "Bearbeitet";
 "accessibility.messageBubbleRead" = "Gelesen";
 "accessibility.messageBubbleUnread" = "Ungelesen";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Leere Textnachricht empfangen am %@. Diese wurde möglicherweise nicht korrekt gesendet.";
 "accessibility.fileTransferNoName" = "Datei empfangen am %@, Name nicht verfügbar";
 "accessibility.inReply" = "Als Antwort auf die Nachricht";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.text.receivedOn" = "%1@, Nachricht erhalten am %2@";
+"accessibility.text.sentOn" = "%1@, Nachricht gesendet am %2@";
+"accessibility.fileTransfer.receivedOn" = "Datei: %1@ , empfangen am %2@";
+"accessibility.fileTransfer.sentOn" = "Datei: %1@, gesendet am %2@";
+"accessibility.call.lasted" = "Dauerte %@";
+"accessibility.calls.default.toggleAudio" = "Mikrofon stummschalten";
+"accessibility.calls.default.toggleVideo" = "Kamera starten";
 "accessibility.calls.default.pauseCall" = "Anruf pausieren";
 "accessibility.calls.default.hangUpCall" = "Auflegen";
 "accessibility.calls.default.addParticipant" = "Gesprächspartner hinzufügen";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Hand heben";
 
 "accessibility.calls.alter.toggleAudio" = "Mikrofon-Stummschaltung aufheben";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Kamera stoppen";
 "accessibility.calls.alter.pauseCall" = "Anruf fortsetzen";
 "accessibility.calls.alter.hangUpCall" = "Auflegen";
 "accessibility.calls.alter.addParticipant" = "Gesprächspartner hinzufügen";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Auflegen";
 "accessibility.conference.lowerHand" = "Hand senken";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Token-QR-Code";
diff --git a/Ring/Ring/Resources/el.lproj/Localizable.strings b/Ring/Ring/Resources/el.lproj/Localizable.strings
index 041d1889b48f1668b8d43eaa00bf183581311915..cc9f7d03033e7fc02d569d7fd3ecd34ee8b20a76 100644
--- a/Ring/Ring/Resources/el.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/el.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Ώρα";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Επιβεβαίωση κωδικού";
-"global.confirm" = "Confirm";
+"global.confirm" = "Επιβεβαίωση";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Επιβεβαίωση";
+"global.connect" = "Σύνδεση";
 
 // Scan
 "scan.badQrCode" = "Κακό QR κωδικό";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "Κώδικας QR";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "Έξοδος";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Σίγαση μικροφώνου";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Παύση κλήσης";
 "accessibility.calls.default.hangUpCall" = "Κλείσιμο";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Σηκώστε το χέρι σας";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Διακοπή κάμερας";
 "accessibility.calls.alter.pauseCall" = "Επαναφέρετε την κλήση";
 "accessibility.calls.alter.hangUpCall" = "Κλείσιμο";
 "accessibility.calls.alter.addParticipant" = "Προσθήκη συμμετέχοντος";
diff --git a/Ring/Ring/Resources/eo.lproj/Localizable.strings b/Ring/Ring/Resources/eo.lproj/Localizable.strings
index 576d1c046386a83ffe9e4bac7b0dce6c52c0f76a..bff8da97f5a6c12a21948265b812f6619badb8f0 100644
--- a/Ring/Ring/Resources/eo.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eo.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Horo";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Konfirmu pasvorton";
-"global.confirm" = "Confirm";
+"global.confirm" = "Konfirmu";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Konfirmu";
+"global.connect" = "Konekti";
 
 // Scan
 "scan.badQrCode" = "Malbona QR-kodo";
@@ -196,7 +196,7 @@
 
 // Link To Account form
 "linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
+"linkToAccount.showQrCode" = "QR-kodo";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
 "linkToAccount.allSet" = "Account imported successfully.";
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "Eliri";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Muta mikrofono";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Paŭzo alvoko";
 "accessibility.calls.default.hangUpCall" = "Fini vokon";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Levu la manon";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Haltu la fotilon";
 "accessibility.calls.alter.pauseCall" = "Reviziu la telefonvokon";
 "accessibility.calls.alter.hangUpCall" = "Fini vokon";
 "accessibility.calls.alter.addParticipant" = "Aldoni partoprenanton";
diff --git a/Ring/Ring/Resources/es.lproj/Localizable.strings b/Ring/Ring/Resources/es.lproj/Localizable.strings
index a4946af0ed20211a31070b1ccc3b30448951967a..98183c58812c1a9cc6811e3bbddfbb6d0dedcf2c 100644
--- a/Ring/Ring/Resources/es.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es.lproj/Localizable.strings
@@ -57,10 +57,10 @@
 "global.time" = "Hora";
 "global.editPassword" = "Editar contraseña";
 "global.confirmPassword" = "Confirmar contraseña";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.cameraDisabled" = "El acceso a la cámara está deshabilitado. Habilítelo en la configuración del dispositivo para usar esta función.";
-"global.confirm" = "Confirm";
-"global.connect" = "Connect";
+"global.confirm" = "Confirmar";
+"global.connect" = "Conectar";
 
 // Scan
 "scan.badQrCode" = "Código QR incorrecto";
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Una cuenta Jami se crea y almacena localmente solo en este dispositivo como un archivo que contiene sus claves de cuenta. El acceso al archivo puede protegerse opcionalmente con una contraseña.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.importAccount" = "Importar cuenta";
+"linkToAccount.showQrCode" = "Código QR";
+"linkToAccount.showPinCode" = "Código de autenticación";
+"linkToAccount.actionRequired" = "Acción requerida.\nConfirmar la cuenta en el dispositivo de origen.";
+"linkToAccount.allSet" = "Cuenta importada correctamente.";
+"linkToAccount.goToAccounts" = "Ir a la cuenta importada";
+"linkToAccount.exportInstructions" = "En el dispositivo de origen, inicie la exportación.";
+"linkToAccount.exportInstructionsPath" = "Seleccionar Cuenta > Configurar la cuenta > Vincular nuevo dispositivo.";
+"linkToAccount.scanQrCode" = "Cuando esté listo, escanee el código QR.";
+"linkToAccount.enterProvidedCode" = "Cuando esté listo, ingrese el código de autenticación.";
+"linkToAccount.accountLockedWithPassword" = "La cuenta está protegida con una contraseña.\nPara continuar, ingrese la contraseña de la cuenta.";
+"linkToAccount.exit" = "Salir";
+"linkToAccount.shareMessage" = "Su código es: %@";
+"linkToAccount.alertTile" = "¿Quieres salir?";
+"linkToAccount.alertMessage" = "Al salir, se cancelará la operación de importación de la cuenta.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar la cuenta Jami desde el archivo de almacenamiento local.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Vincular un dispositivo nuevo";
 "linkDevice.networkError" = "Se produjo un error de red al exportar la cuenta.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Se produjo un error de autenticación.\nPor favor, verifique la contraseña.";
+"linkDevice.errorNetwork" = "Se produjo un error de red.\nVerifique la conexión.";
+"linkDevice.errorTimeout" = "Se agotó el tiempo de espera de la operación.\nPor favor, inténtelo de nuevo.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Se produjo un error al exportar la cuenta.número\nPor favor, inténtelo de nuevo.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Cuando esté listo, escanee el código QR.";
+"linkDevice.infoCode" = "Cuando esté listo, ingrese el código y presione ' Conectar`.";
+"linkDevice.connecting" = "Conexión a su nuevo dispositivo...";
+"linkDevice.authenticationInfo" = "Nuevo dispositivo encontrado en la dirección IP. ¿Eres tú?\nPara continuar transfiriendo la cuenta, clic en`Confirmar'.";
+"linkDevice.newDeviceIP" = "Nueva dirección IP del dispositivo: %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "El nuevo identificador de dispositivo no se reconoce.\nPor favor, siga las instrucciones anteriores.";
+"linkDevice.exportInProgress" = "La operación de exportación de la cuenta al nuevo dispositivo está en curso.\nConfirmar la importación en el nuevo dispositivo.";
+"linkDevice.completed" = "Cuenta importada correctamente en el nuevo dispositivo.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Empezar llamada de audio";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ mensajes no leídos.";
 "accessibility.conversationRowBlocked" = "Conversación bloqueada";
 "accessibility.conversationRowSyncing" = "Sincronización en curso";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Último mensaje en%@";
 "accessibility.userPresenceOnline" = "En línea";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitaciones recibidas: %@ invitaciones pendientes";
 "accessibility.pendingRequestsRowSingular" = "Invitación recibida: %@ invitación pendiente";
 "accessibility.pendingRequestsRowHint" = "Doble clic para revisar y responder a las invitaciones que recibiste.";
 "accessibility.pendingRequestsListBlockUser" = "Bloquear remitente de invitación";
@@ -565,16 +564,16 @@
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Leer";
 "accessibility.messageBubbleUnread" = "Sin leer";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Mensaje de texto vacío recibido en %@. Es posible que esto no se haya enviado correctamente.";
 "accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
 "accessibility.inReply" = "En respuesta al mensaje";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.text.receivedOn" = "%1@, mensaje recibido el %2@";
+"accessibility.text.sentOn" = "%1@, mensaje enviado el %2@";
+"accessibility.fileTransfer.receivedOn" = "Archivo: %1@ , recibido el %2@";
+"accessibility.fileTransfer.sentOn" = "Archivo: %1@, enviado el %2@";
+"accessibility.call.lasted" = "Duración %@";
+"accessibility.calls.default.toggleAudio" = "Silenciar micrófono";
+"accessibility.calls.default.toggleVideo" = "Iniciar cámara";
 "accessibility.calls.default.pauseCall" = "Pausar llamada";
 "accessibility.calls.default.hangUpCall" = "Colgar";
 "accessibility.calls.default.addParticipant" = "Agregar participante";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Levanta tu mano";
 
 "accessibility.calls.alter.toggleAudio" = "Activar micrófono";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Detener cámara";
 "accessibility.calls.alter.pauseCall" = "Reanudar llamada";
 "accessibility.calls.alter.hangUpCall" = "Colgar";
 "accessibility.calls.alter.addParticipant" = "Agregar participante";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Colgar";
 "accessibility.conference.lowerHand" = "Bajar la mano";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Código QR de token";
diff --git a/Ring/Ring/Resources/es_419.lproj/Localizable.strings b/Ring/Ring/Resources/es_419.lproj/Localizable.strings
index 56d129088fb9acad1c572e36e80dbbb6682d8eb0..6acafcc8c2ff0cffa9c2a501d4df8308ce24218f 100644
--- a/Ring/Ring/Resources/es_419.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_419.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Hora";
 "global.editPassword" = "Editar contraseña";
 "global.confirmPassword" = "Confirmar contraseña";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.cameraDisabled" = "El acceso a la cámara está deshabilitado. Habilítelo en la configuración del dispositivo para usar esta función.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.connect" = "Conectarse";
 
 // Scan
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Una cuenta Jami se crea y almacena localmente solo en este dispositivo como un archivo que contiene sus claves de cuenta. El acceso al archivo puede protegerse opcionalmente con una contraseña.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.importAccount" = "Importar cuenta";
+"linkToAccount.showQrCode" = "Código QR";
+"linkToAccount.showPinCode" = "Código de autenticación";
+"linkToAccount.actionRequired" = "Acción requerida.\nConfirmar la cuenta en el dispositivo de origen.";
+"linkToAccount.allSet" = "Cuenta importada correctamente.";
+"linkToAccount.goToAccounts" = "Ir a la cuenta importada";
+"linkToAccount.exportInstructions" = "En el dispositivo de origen, inicie la exportación.";
+"linkToAccount.exportInstructionsPath" = "Seleccionar Cuenta > Configurar la cuenta > Vincular nuevo dispositivo.";
+"linkToAccount.scanQrCode" = "Cuando esté listo, escanee el código QR.";
+"linkToAccount.enterProvidedCode" = "Cuando esté listo, ingrese el código de autenticación.";
+"linkToAccount.accountLockedWithPassword" = "La cuenta está protegida con una contraseña.\nPara continuar, ingrese la contraseña de la cuenta.";
+"linkToAccount.exit" = "Salir";
+"linkToAccount.shareMessage" = "Su código es: %@";
+"linkToAccount.alertTile" = "¿Quieres salir?";
+"linkToAccount.alertMessage" = "Al salir, se cancelará la operación de importación de la cuenta.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar la cuenta Jami desde el archivo de almacenamiento local.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Vincular nuevo dispositivo";
 "linkDevice.networkError" = "Se produjo un error de red al exportar la cuenta.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Se produjo un error de autenticación.\nPor favor, verifique la contraseña.";
+"linkDevice.errorNetwork" = "Se produjo un error de red.\nVerifique la conexión.";
+"linkDevice.errorTimeout" = "Se agotó el tiempo de espera de la operación.\nPor favor, inténtelo de nuevo.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Se produjo un error al exportar la cuenta.número\nPor favor, inténtelo de nuevo.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Cuando esté listo, escanee el código QR.";
+"linkDevice.infoCode" = "Cuando esté listo, ingrese el código y presione ' Conectar`.";
+"linkDevice.connecting" = "Conexión a su nuevo dispositivo...";
+"linkDevice.authenticationInfo" = "Nuevo dispositivo encontrado en la dirección IP. ¿Eres tú?\nPara continuar transfiriendo la cuenta, clic en`Confirmar'.";
+"linkDevice.newDeviceIP" = "Nueva dirección IP del dispositivo: %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "El nuevo identificador de dispositivo no se reconoce.\nPor favor, siga las instrucciones anteriores.";
+"linkDevice.exportInProgress" = "La operación de exportación de la cuenta al nuevo dispositivo está en curso.\nConfirmar la importación en el nuevo dispositivo.";
+"linkDevice.completed" = "Cuenta importada correctamente en el nuevo dispositivo.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Iniciar una llamada con audio";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ mensajes no leídos.";
 "accessibility.conversationRowBlocked" = "Conversación bloqueada";
 "accessibility.conversationRowSyncing" = "Sincronización en curso";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Último mensaje en%@";
 "accessibility.userPresenceOnline" = "En línea";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitaciones recibidas: %@ invitaciones pendientes";
 "accessibility.pendingRequestsRowSingular" = "Invitación recibida: %@ invitación pendiente";
 "accessibility.pendingRequestsRowHint" = "Doble clic para revisar y responder a las invitaciones que recibiste.";
 "accessibility.pendingRequestsListBlockUser" = "Bloquear remitente de invitación";
@@ -565,16 +564,16 @@
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Leer";
 "accessibility.messageBubbleUnread" = "Sin leer";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Mensaje de texto vacío recibido en %@. Es posible que esto no se haya enviado correctamente.";
 "accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
 "accessibility.inReply" = "En respuesta al mensaje";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.text.receivedOn" = "%1@, mensaje recibido el %2@";
+"accessibility.text.sentOn" = "%1@, mensaje enviado el %2@";
+"accessibility.fileTransfer.receivedOn" = "Archivo: %1@ , recibido el %2@";
+"accessibility.fileTransfer.sentOn" = "Archivo: %1@, enviado el %2@";
+"accessibility.call.lasted" = "Duración %@";
+"accessibility.calls.default.toggleAudio" = "Enmudecer micrófono";
+"accessibility.calls.default.toggleVideo" = "Iniciar cámara";
 "accessibility.calls.default.pauseCall" = "Pausar llamada";
 "accessibility.calls.default.hangUpCall" = "Colgar";
 "accessibility.calls.default.addParticipant" = "Agregar participante";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Levanta tu mano";
 
 "accessibility.calls.alter.toggleAudio" = "Activar micrófono";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Detener cámara";
 "accessibility.calls.alter.pauseCall" = "Reanudar llamada";
 "accessibility.calls.alter.hangUpCall" = "Colgar";
 "accessibility.calls.alter.addParticipant" = "Agregar participante";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Colgar";
 "accessibility.conference.lowerHand" = "Bajar la mano";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Código QR de token";
diff --git a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
index 77a80cb31847efa954d3f24b6a46d226442715a6..2bb3a2501fec5b5cd3a849284e459da656a9f115 100644
--- a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Hora";
 "global.editPassword" = "Editar contraseña";
 "global.confirmPassword" = "Confirmar contraseña";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.cameraDisabled" = "El acceso a la cámara está deshabilitado. Habilítelo en la configuración del dispositivo para usar esta función.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.connect" = "Conectarse";
 
 // Scan
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Una cuenta Jami se crea y almacena localmente solo en este dispositivo como un archivo que contiene sus claves de cuenta. El acceso al archivo puede protegerse opcionalmente con una contraseña.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.importAccount" = "Importar cuenta";
+"linkToAccount.showQrCode" = "Código QR";
+"linkToAccount.showPinCode" = "Código de autenticación";
+"linkToAccount.actionRequired" = "Acción requerida.\nConfirmar la cuenta en el dispositivo de origen.";
+"linkToAccount.allSet" = "Cuenta importada correctamente.";
+"linkToAccount.goToAccounts" = "Ir a la cuenta importada";
+"linkToAccount.exportInstructions" = "En el dispositivo de origen, inicie la exportación.";
+"linkToAccount.exportInstructionsPath" = "Seleccionar Cuenta > Configurar la cuenta > Vincular nuevo dispositivo.";
+"linkToAccount.scanQrCode" = "Cuando esté listo, escanee el código QR.";
+"linkToAccount.enterProvidedCode" = "Cuando esté listo, ingrese el código de autenticación.";
+"linkToAccount.accountLockedWithPassword" = "La cuenta está protegida con una contraseña.\nPara continuar, ingrese la contraseña de la cuenta.";
+"linkToAccount.exit" = "Salir";
+"linkToAccount.shareMessage" = "Su código es: %@";
+"linkToAccount.alertTile" = "¿Quieres salir?";
+"linkToAccount.alertMessage" = "Al salir, se cancelará la operación de importación de la cuenta.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar la cuenta Jami desde el archivo de almacenamiento local.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Vincular nuevo dispositivo";
 "linkDevice.networkError" = "Se produjo un error de red al exportar la cuenta.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Se produjo un error de autenticación.\nPor favor, verifique la contraseña.";
+"linkDevice.errorNetwork" = "Se produjo un error de red.\nVerifique la conexión.";
+"linkDevice.errorTimeout" = "Se agotó el tiempo de espera de la operación.\nPor favor, inténtelo de nuevo.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Se produjo un error al exportar la cuenta.número\nPor favor, inténtelo de nuevo.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Cuando esté listo, escanee el código QR.";
+"linkDevice.infoCode" = "Cuando esté listo, ingrese el código y presione ' Conectar`.";
+"linkDevice.connecting" = "Conexión a su nuevo dispositivo...";
+"linkDevice.authenticationInfo" = "Nuevo dispositivo encontrado en la dirección IP. ¿Eres tú?\nPara continuar transfiriendo la cuenta, clic en`Confirmar'.";
+"linkDevice.newDeviceIP" = "Nueva dirección IP del dispositivo: %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "El nuevo identificador de dispositivo no se reconoce.\nPor favor, siga las instrucciones anteriores.";
+"linkDevice.exportInProgress" = "La operación de exportación de la cuenta al nuevo dispositivo está en curso.\nConfirmar la importación en el nuevo dispositivo.";
+"linkDevice.completed" = "Cuenta importada correctamente en el nuevo dispositivo.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Iniciar una llamada con audio";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ mensajes no leídos.";
 "accessibility.conversationRowBlocked" = "Conversación bloqueada";
 "accessibility.conversationRowSyncing" = "Sincronización en curso";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Último mensaje en%@";
 "accessibility.userPresenceOnline" = "En línea";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitaciones recibidas: %@ invitaciones pendientes";
 "accessibility.pendingRequestsRowSingular" = "Invitación recibida: %@ invitación pendiente";
 "accessibility.pendingRequestsRowHint" = "Doble clic para revisar y responder a las invitaciones que recibiste.";
 "accessibility.pendingRequestsListBlockUser" = "Bloquear remitente de invitación";
@@ -565,16 +564,16 @@
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Leer";
 "accessibility.messageBubbleUnread" = "Sin leer";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Mensaje de texto vacío recibido en %@. Es posible que esto no se haya enviado correctamente.";
 "accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
 "accessibility.inReply" = "En respuesta al mensaje";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.text.receivedOn" = "%1@, mensaje recibido el %2@";
+"accessibility.text.sentOn" = "%1@, mensaje enviado el %2@";
+"accessibility.fileTransfer.receivedOn" = "Archivo: %1@ , recibido el %2@";
+"accessibility.fileTransfer.sentOn" = "Archivo: %1@, enviado el %2@";
+"accessibility.call.lasted" = "Duración %@";
+"accessibility.calls.default.toggleAudio" = "Enmudecer micrófono";
+"accessibility.calls.default.toggleVideo" = "Iniciar cámara";
 "accessibility.calls.default.pauseCall" = "Pausar llamada";
 "accessibility.calls.default.hangUpCall" = "Colgar";
 "accessibility.calls.default.addParticipant" = "Añadir participante";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Levanta tu mano";
 
 "accessibility.calls.alter.toggleAudio" = "Activar micrófono";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Detener cámara";
 "accessibility.calls.alter.pauseCall" = "Reanudar llamada";
 "accessibility.calls.alter.hangUpCall" = "Colgar";
 "accessibility.calls.alter.addParticipant" = "Añadir participante";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Colgar";
 "accessibility.conference.lowerHand" = "Bajar la mano";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Código QR de token";
diff --git a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
index 46ac6120ca7c2da747430083da6514227e8e95b7..aa02c6c4999929dbab3a42871b49472ed1e8aaae 100644
--- a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Tiempo";
 "global.editPassword" = "Editar contraseña";
 "global.confirmPassword" = "Confirmar contraseña";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.cameraDisabled" = "El acceso a la cámara está deshabilitado. Habilítelo en la configuración del dispositivo para usar esta función.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.connect" = "Conectarse";
 
 // Scan
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Una cuenta Jami se crea y almacena localmente solo en este dispositivo como un archivo que contiene sus claves de cuenta. El acceso al archivo puede protegerse opcionalmente con una contraseña.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.importAccount" = "Importar cuenta";
+"linkToAccount.showQrCode" = "Código QR";
+"linkToAccount.showPinCode" = "Código de autenticación";
+"linkToAccount.actionRequired" = "Acción requerida.\nConfirmar la cuenta en el dispositivo de origen.";
+"linkToAccount.allSet" = "Cuenta importada correctamente.";
+"linkToAccount.goToAccounts" = "Ir a la cuenta importada";
+"linkToAccount.exportInstructions" = "En el dispositivo de origen, inicie la exportación.";
+"linkToAccount.exportInstructionsPath" = "Seleccionar Cuenta > Configurar la cuenta > Vincular nuevo dispositivo.";
+"linkToAccount.scanQrCode" = "Cuando esté listo, escanee el código QR.";
+"linkToAccount.enterProvidedCode" = "Cuando esté listo, ingrese el código de autenticación.";
+"linkToAccount.accountLockedWithPassword" = "La cuenta está protegida con una contraseña.\nPara continuar, ingrese la contraseña de la cuenta.";
+"linkToAccount.exit" = "Salir";
+"linkToAccount.shareMessage" = "Su código es: %@";
+"linkToAccount.alertTile" = "¿Quieres salir?";
+"linkToAccount.alertMessage" = "Al salir, se cancelará la operación de importación de la cuenta.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar la cuenta Jami desde el archivo de almacenamiento local.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Vincular nuevo dispositivo";
 "linkDevice.networkError" = "Se produjo un error de red al exportar la cuenta.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Se produjo un error de autenticación.\nPor favor, verifique la contraseña.";
+"linkDevice.errorNetwork" = "Se produjo un error de red.\nVerifique la conexión.";
+"linkDevice.errorTimeout" = "Se agotó el tiempo de espera de la operación.\nPor favor, inténtelo de nuevo.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Se produjo un error al exportar la cuenta.número\nPor favor, inténtelo de nuevo.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Cuando esté listo, escanee el código QR.";
+"linkDevice.infoCode" = "Cuando esté listo, ingrese el código y presione ' Conectar`.";
+"linkDevice.connecting" = "Conexión a su nuevo dispositivo...";
+"linkDevice.authenticationInfo" = "Nuevo dispositivo encontrado en la dirección IP. ¿Eres tú?\nPara continuar transfiriendo la cuenta, clic en`Confirmar'.";
+"linkDevice.newDeviceIP" = "Nueva dirección IP del dispositivo: %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "El nuevo identificador de dispositivo no se reconoce.\nPor favor, siga las instrucciones anteriores.";
+"linkDevice.exportInProgress" = "La operación de exportación de la cuenta al nuevo dispositivo está en curso.\nConfirmar la importación en el nuevo dispositivo.";
+"linkDevice.completed" = "Cuenta importada correctamente en el nuevo dispositivo.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Iniciar una llamada con audio";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ mensajes no leídos.";
 "accessibility.conversationRowBlocked" = "Conversación bloqueada";
 "accessibility.conversationRowSyncing" = "Sincronización en curso";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Último mensaje en%@";
 "accessibility.userPresenceOnline" = "En línea";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitaciones recibidas: %@ invitaciones pendientes";
 "accessibility.pendingRequestsRowSingular" = "Invitación recibida: %@ invitación pendiente";
 "accessibility.pendingRequestsRowHint" = "Doble clic para revisar y responder a las invitaciones que recibiste.";
 "accessibility.pendingRequestsListBlockUser" = "Bloquear remitente de invitación";
@@ -565,16 +564,16 @@
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Leer";
 "accessibility.messageBubbleUnread" = "Sin leer";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Mensaje de texto vacío recibido en %@. Es posible que esto no se haya enviado correctamente.";
 "accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
 "accessibility.inReply" = "En respuesta al mensaje";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.text.receivedOn" = "%1@, mensaje recibido el %2@";
+"accessibility.text.sentOn" = "%1@, mensaje enviado el %2@";
+"accessibility.fileTransfer.receivedOn" = "Archivo: %1@ , recibido el %2@";
+"accessibility.fileTransfer.sentOn" = "Archivo: %1@, enviado el %2@";
+"accessibility.call.lasted" = "Duración %@";
+"accessibility.calls.default.toggleAudio" = "Enmudecer micrófono";
+"accessibility.calls.default.toggleVideo" = "Iniciar cámara";
 "accessibility.calls.default.pauseCall" = "Pausar llamada";
 "accessibility.calls.default.hangUpCall" = "Colgar";
 "accessibility.calls.default.addParticipant" = "Agregar participante";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Levanta tu mano";
 
 "accessibility.calls.alter.toggleAudio" = "Activar micrófono";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Detener cámara";
 "accessibility.calls.alter.pauseCall" = "Reanudar llamada";
 "accessibility.calls.alter.hangUpCall" = "Colgar";
 "accessibility.calls.alter.addParticipant" = "Agregar participante";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Colgar";
 "accessibility.conference.lowerHand" = "Bajar la mano";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Código QR de token";
diff --git a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
index 0c7bb0524b77cc0cc90b20f43eebd0d64569c9e9..66f96991ce90ff8f3f9d7f4b56aa13a2db4c3235 100644
--- a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Tiempo";
 "global.editPassword" = "Editar contraseña";
 "global.confirmPassword" = "Confirmar contraseña";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.cameraDisabled" = "El acceso a la cámara está deshabilitado. Habilítelo en la configuración del dispositivo para usar esta función.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.connect" = "Conectarse";
 
 // Scan
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Una cuenta Jami se crea y almacena localmente solo en este dispositivo como un archivo que contiene sus claves de cuenta. El acceso al archivo puede protegerse opcionalmente con una contraseña.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.importAccount" = "Importar cuenta";
+"linkToAccount.showQrCode" = "Código QR";
+"linkToAccount.showPinCode" = "Código de autenticación";
+"linkToAccount.actionRequired" = "Acción requerida.\nConfirmar la cuenta en el dispositivo de origen.";
+"linkToAccount.allSet" = "Cuenta importada correctamente.";
+"linkToAccount.goToAccounts" = "Ir a la cuenta importada";
+"linkToAccount.exportInstructions" = "En el dispositivo de origen, inicie la exportación.";
+"linkToAccount.exportInstructionsPath" = "Seleccionar Cuenta > Configurar la cuenta > Vincular nuevo dispositivo.";
+"linkToAccount.scanQrCode" = "Cuando esté listo, escanee el código QR.";
+"linkToAccount.enterProvidedCode" = "Cuando esté listo, ingrese el código de autenticación.";
+"linkToAccount.accountLockedWithPassword" = "La cuenta está protegida con una contraseña.\nPara continuar, ingrese la contraseña de la cuenta.";
+"linkToAccount.exit" = "Salir";
+"linkToAccount.shareMessage" = "Su código es: %@";
+"linkToAccount.alertTile" = "¿Quieres salir?";
+"linkToAccount.alertMessage" = "Al salir, se cancelará la operación de importación de la cuenta.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar la cuenta Jami desde el archivo de almacenamiento local.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Vincular nuevo dispositivo";
 "linkDevice.networkError" = "Se produjo un error de red al exportar la cuenta.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Se produjo un error de autenticación.\nPor favor, verifique la contraseña.";
+"linkDevice.errorNetwork" = "Se produjo un error de red.\nVerifique la conexión.";
+"linkDevice.errorTimeout" = "Se agotó el tiempo de espera de la operación.\nPor favor, inténtelo de nuevo.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Se produjo un error al exportar la cuenta.número\nPor favor, inténtelo de nuevo.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Cuando esté listo, escanee el código QR.";
+"linkDevice.infoCode" = "Cuando esté listo, ingrese el código y presione ' Conectar`.";
+"linkDevice.connecting" = "Conexión a su nuevo dispositivo...";
+"linkDevice.authenticationInfo" = "Nuevo dispositivo encontrado en la dirección IP. ¿Eres tú?\nPara continuar transfiriendo la cuenta, clic en`Confirmar'.";
+"linkDevice.newDeviceIP" = "Nueva dirección IP del dispositivo: %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "El nuevo identificador de dispositivo no se reconoce.\nPor favor, siga las instrucciones anteriores.";
+"linkDevice.exportInProgress" = "La operación de exportación de la cuenta al nuevo dispositivo está en curso.\nConfirmar la importación en el nuevo dispositivo.";
+"linkDevice.completed" = "Cuenta importada correctamente en el nuevo dispositivo.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Iniciar una llamada con audio";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ mensajes no leídos.";
 "accessibility.conversationRowBlocked" = "Conversación bloqueada";
 "accessibility.conversationRowSyncing" = "Sincronización en curso";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Último mensaje en%@";
 "accessibility.userPresenceOnline" = "En línea";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitaciones recibidas: %@ invitaciones pendientes";
 "accessibility.pendingRequestsRowSingular" = "Invitación recibida: %@ invitación pendiente";
 "accessibility.pendingRequestsRowHint" = "Doble clic para revisar y responder a las invitaciones que recibiste.";
 "accessibility.pendingRequestsListBlockUser" = "Bloquear remitente de invitación";
@@ -565,16 +564,16 @@
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Leer";
 "accessibility.messageBubbleUnread" = "Sin leer";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Mensaje de texto vacío recibido en %@. Es posible que esto no se haya enviado correctamente.";
 "accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
 "accessibility.inReply" = "En respuesta al mensaje";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.text.receivedOn" = "%1@, mensaje recibido el %2@";
+"accessibility.text.sentOn" = "%1@, mensaje enviado el %2@";
+"accessibility.fileTransfer.receivedOn" = "Archivo: %1@ , recibido el %2@";
+"accessibility.fileTransfer.sentOn" = "Archivo: %1@, enviado el %2@";
+"accessibility.call.lasted" = "Duración %@";
+"accessibility.calls.default.toggleAudio" = "Enmudecer micrófono";
+"accessibility.calls.default.toggleVideo" = "Iniciar cámara";
 "accessibility.calls.default.pauseCall" = "Pausar llamada";
 "accessibility.calls.default.hangUpCall" = "Colgar";
 "accessibility.calls.default.addParticipant" = "Agregar participante";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Levanta tu mano";
 
 "accessibility.calls.alter.toggleAudio" = "Activar micrófono";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Detener cámara";
 "accessibility.calls.alter.pauseCall" = "Reanudar llamada";
 "accessibility.calls.alter.hangUpCall" = "Colgar";
 "accessibility.calls.alter.addParticipant" = "Agregar participante";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Colgar";
 "accessibility.conference.lowerHand" = "Bajar la mano";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Código QR de token";
diff --git a/Ring/Ring/Resources/et.lproj/Localizable.strings b/Ring/Ring/Resources/et.lproj/Localizable.strings
index 317b91632e09540796f7b3111edff2cd0ebc34a9..b6f2d68372a235268c3d59c41f221f3a4bdbf298 100644
--- a/Ring/Ring/Resources/et.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/et.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Aeg";
 "global.editPassword" = "Muuda salasõna";
 "global.confirmPassword" = "Korda salasõna";
-"global.confirm" = "Confirm";
+"global.confirm" = "Kinnita";
 "global.cameraDisabled" = "Puuduvad õigused kaamera kasutamiseks. Selle funktsionaalsuse jaoks anna nutiseadme seadistustest vastavad õigused.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Kinnita";
 "global.connect" = "Ühenda";
 
 // Scan
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Jami kasutajakonto on registreeritud ja salvestatud vaid selles nutiseadmes ja olemuselt on tegemist arhiiviga, kus leiduvad sinu krüptovõtmed. Ligipääsu sellele arhiivile saad soovi korral turvata salasõnaga.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
-"linkToAccount.showQrCode" = "QR code";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.importAccount" = "Impordi kasutajakonto";
+"linkToAccount.showQrCode" = "QR-kood";
+"linkToAccount.showPinCode" = "Autentimiskood";
+"linkToAccount.actionRequired" = "Sinu osalemine on vajalik.\nPalun kinnita kasutajakonto lähteseadmes.";
+"linkToAccount.allSet" = "Kasutajakonto importimine õnnestus. ";
+"linkToAccount.goToAccounts" = "Suundu imporditud kasutajakonto juurde";
+"linkToAccount.exportInstructions" = "Algata lähteseadmes eksportimine.";
+"linkToAccount.exportInstructionsPath" = "Vali „Kasutajakontod“ > „Kasutajakonto seadistused“ > „Seo uus seade“. ";
+"linkToAccount.scanQrCode" = "Kui oled valmis, siis skaneeri QR-koodi";
+"linkToAccount.enterProvidedCode" = "Kui oled valmis, siis sisesta autentimiskood.";
+"linkToAccount.accountLockedWithPassword" = "See kasutajakonto on kaitstud salasõnaga.\nJätkamiseks palun sisesta konto salasõna.";
+"linkToAccount.exit" = "Välju";
+"linkToAccount.shareMessage" = "Sinu kood on: %@";
+"linkToAccount.alertTile" = "Kas sa soovid väljuda?";
+"linkToAccount.alertMessage" = "Väljumisel katkeb importimine.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Impordi Jami kasutajakonto kohaliku varukoopia arhiivifailist..";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Seo uus seade";
 "linkDevice.networkError" = "Kasutajakonto eksportimisel tekkis võrguviga.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Autentimisel tekkis viga.\nPalun kontrolli et salasõna on õige ja proovi uuesti.";
+"linkDevice.errorNetwork" = "Tekkis võrguühenduse viga.\nPalun kontrolli, et võrguühendus toimib.";
+"linkDevice.errorTimeout" = "Tegevus aegus.\nPalun proovi uuesti.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Kasutajakonto eksportimisel tekkis viga.\nPalun proovi uuesti.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Kui oled valmis, siis skaneeri QR-koodi";
+"linkDevice.infoCode" = "Kui oled valmis, siis sisesta kood ja vajuta „Kinnita“.";
+"linkDevice.connecting" = "Loome ühendust sinu uue seadmega…";
+"linkDevice.authenticationInfo" = "Leidsime uue seadme allpooltoodud aadressil. Kas see oled sina?\nKui klõpsid „Kinnita“, siis jätkame kasutajakonto teisaldamisega.";
+"linkDevice.newDeviceIP" = "Uue seadme ip-aadress: %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Uue seadme tunnus pole tuvastatav.\nPalun järgi eelpooltoodud juhendit.";
+"linkDevice.exportInProgress" = "Kasutajakonto eksportimine uude seadmesse on pooleli.\nJätkamiseks palun kinnita importimine uues seadmes.";
+"linkDevice.completed" = "Kasutajakonto importimine sellesse seadmesse õnnestus. ";
 
 // Contact Page
 "contactPage.startAudioCall" = "Alusta häälkõnet";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ lugemata sõnumit.";
 "accessibility.conversationRowBlocked" = "Vestlus on blokeeritud";
 "accessibility.conversationRowSyncing" = "Sünkroniseerimine on pooleli";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Viimane sõnum: %@";
 "accessibility.userPresenceOnline" = "Võrgus";
 "accessibility.userPresenceAvailable" = "Saadaval";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Saabunud kutsed: %@ ootel kutset";
 "accessibility.pendingRequestsRowSingular" = "Saabunud kutse: %@ ootel kutse";
 "accessibility.pendingRequestsRowHint" = "Saadud kutsete vaatamiseks ja neile vastamiseks topeltklõpsi";
 "accessibility.pendingRequestsListBlockUser" = "Blokeeri kutse saatja";
@@ -565,16 +564,16 @@
 "accessibility.messageBubbleEdited" = "Muudetud";
 "accessibility.messageBubbleRead" = "Loetud";
 "accessibility.messageBubbleUnread" = "Lugemata";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Tühi tekstisõnum vastuvõetud %@. Võib-olla saatmine polnud korrektne.";
 "accessibility.fileTransferNoName" = "Fail on vastu võetud %@, aga sisu pole saadaval";
 "accessibility.inReply" = "Vastuseks sõnumile";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.text.receivedOn" = "%1@, sõnum vastuvõetud %2@";
+"accessibility.text.sentOn" = "%1@, sõnum saadetud %2@";
+"accessibility.fileTransfer.receivedOn" = "Fail: %1@, vastuvõetud %2@";
+"accessibility.fileTransfer.sentOn" = "Fail: %1@, saadetud %2@";
+"accessibility.call.lasted" = "Kestus: %@";
+"accessibility.calls.default.toggleAudio" = "Summuta mikrofon";
+"accessibility.calls.default.toggleVideo" = "Käivita kaamera";
 "accessibility.calls.default.pauseCall" = "Peata kõne";
 "accessibility.calls.default.hangUpCall" = "Lõpeta kõne";
 "accessibility.calls.default.addParticipant" = "Lisa osaleja";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Anna käega märku";
 
 "accessibility.calls.alter.toggleAudio" = "Lõpeta mikrofoni summutamine";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Peata kaamera";
 "accessibility.calls.alter.pauseCall" = "Jätka kõnet";
 "accessibility.calls.alter.hangUpCall" = "Lõpeta kõne";
 "accessibility.calls.alter.addParticipant" = "Lisa osaleja";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Lõpeta kõne";
 "accessibility.conference.lowerHand" = "Lase käsi alla";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Tunnusloa QR-kood";
diff --git a/Ring/Ring/Resources/eu.lproj/Localizable.strings b/Ring/Ring/Resources/eu.lproj/Localizable.strings
index aa0f25e953f2007075d7cee1a6a0bfe89b67375c..74899f11d8b17f356c797afde5629eee4e0bf927 100644
--- a/Ring/Ring/Resources/eu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eu.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Berretsi pasahitza";
-"global.confirm" = "Confirm";
+"global.confirm" = "Baieztatu.";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Baieztatu.";
 "global.connect" = "Konektatu";
 
 // Scan
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "Irten";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Mututu mikrofonoa";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Dei-pausa bat";
 "accessibility.calls.default.hangUpCall" = "Eseki";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Altxa eskua.";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Geldi kamera";
 "accessibility.calls.alter.pauseCall" = "Deialdia berrikusi";
 "accessibility.calls.alter.hangUpCall" = "Eseki";
 "accessibility.calls.alter.addParticipant" = "Partaide gehitu";
diff --git a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
index 703b643044fe42be93d48481ae9b32a6d12d1eab..ded73ad0d93bbe045e08e63e41e0c2b939007300 100644
--- a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "زمان";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "تأیید گذرواژه";
-"global.confirm" = "Confirm";
+"global.confirm" = "تایید";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
+"global.confirm" = "تایید";
 "global.connect" = "اتصال";
 
 // Scan
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "خروج";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "قطع میکروفون";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "توقف تماس";
 "accessibility.calls.default.hangUpCall" = "قطع‌کردن";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "بالا بردن دست ";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "دوربین توقف";
 "accessibility.calls.alter.pauseCall" = "ازسرگیری تماس";
 "accessibility.calls.alter.hangUpCall" = "قطع‌کردن";
 "accessibility.calls.alter.addParticipant" = "افزودن شرکت کننده";
diff --git a/Ring/Ring/Resources/fa.lproj/Localizable.strings b/Ring/Ring/Resources/fa.lproj/Localizable.strings
index 990b6b648c83171eb1c062333f87eab72ee3a8dc..cdafcf77cae42e049c807794d61817792755a3bd 100644
--- a/Ring/Ring/Resources/fa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "زمان";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "تأیید گذرواژه";
-"global.confirm" = "Confirm";
+"global.confirm" = "تایید";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
+"global.confirm" = "تایید";
 "global.connect" = "اتصال";
 
 // Scan
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "خروج";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "قطع میکروفون";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "توقف تماس";
 "accessibility.calls.default.hangUpCall" = "قطع‌کردن";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "بالا بردن دست ";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "دوربین توقف";
 "accessibility.calls.alter.pauseCall" = "ازسرگیری تماس";
 "accessibility.calls.alter.hangUpCall" = "قطع‌کردن";
 "accessibility.calls.alter.addParticipant" = "افزودن شرکت کننده";
diff --git a/Ring/Ring/Resources/fi.lproj/Localizable.strings b/Ring/Ring/Resources/fi.lproj/Localizable.strings
index 0b072ad4e5c81617d6368b17c5963b36a186c074..51af22f987ea35077f8b350ab89877991bec62eb 100644
--- a/Ring/Ring/Resources/fi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fi.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Aika";
 "global.editPassword" = "Muokkaa salasanaa";
 "global.confirmPassword" = "Varmista salasana";
-"global.confirm" = "Confirm";
+"global.confirm" = "Vahvista";
 "global.cameraDisabled" = "Kameran käyttö on estetty. Ota se käyttöön laitteen asetuksissa, jotta voit käyttää tätä ominaisuutta.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Vahvista";
 "global.connect" = "Yhdistä";
 
 // Scan
@@ -195,10 +195,10 @@
 "createAccount.encryptExplanation" = "Jami-tili luodaan ja tallennetaan paikallisesti vain tälle laitteelle. Tilin avain on pakattuna ja pääsy tähän voidaan valinnaisesti suojata salasanalla.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Tuo tunnus";
 "linkToAccount.showQrCode" = "QR-koodi";
 "linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
+"linkToAccount.actionRequired" = "Toimenpiteitä tarvitaan.\nVahvista tili toisella laitteella.";
 "linkToAccount.allSet" = "Account imported successfully.";
 "linkToAccount.goToAccounts" = "Go to imported account";
 "linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
@@ -206,10 +206,10 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "Poistu";
 "linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.alertTile" = "Haluatko poistua?";
+"linkToAccount.alertMessage" = "Poistuminen peruuttaa tilin tuomisen.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Tuo Jami-tili varmuuskopiosta";
@@ -427,21 +427,20 @@
 "linkDevice.title" = "Linkitä uusi laite";
 "linkDevice.networkError" = "Tiliä vietäessä tapahtui verkkovirhe.";
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorNetwork" = "Tapahtui verkkovirhe.\nTarkista internetyhteytesi.";
+"linkDevice.errorTimeout" = "Toiminto on aikakatkaistu. Yritä uudelleen.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
+"linkDevice.connecting" = "Yhdistetään uuteen laitteeseen…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.newDeviceIP" = "Uuden laitteen ip-osoite: %1@";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.completed" = "Tilin tuonti uuteen laitteeseen onnistui.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Aloita äänipuhelu";
@@ -573,19 +572,19 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.toggleAudio" = "Mykistä mikrofoni";
+"accessibility.calls.default.toggleVideo" = "Avaa kamera";
 "accessibility.calls.default.pauseCall" = "Puhelu pitoon";
 "accessibility.calls.default.hangUpCall" = "Katkaise puhelu";
 "accessibility.calls.default.addParticipant" = "Lisää osannottaja";
 "accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
+"accessibility.calls.default.toggleSpeaker" = "Kytke kaiutin";
 "accessibility.calls.default.openConversation" = "Avaa keskustelu";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Nosta käsi";
 
 "accessibility.calls.alter.toggleAudio" = "Poista mikrofonin mykistys";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Sulje kamera";
 "accessibility.calls.alter.pauseCall" = "Jatka puhelua";
 "accessibility.calls.alter.hangUpCall" = "Katkaise puhelu";
 "accessibility.calls.alter.addParticipant" = "Lisää osannottaja";
diff --git a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
index 04f265c16b98094053f0c4d55bbf98481f4f49c6..828719cf74b3dc7ff84646eca4b1bcc9d8a90833 100644
--- a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Heure";
 "global.editPassword" = "Modifier le mot de passe";
 "global.confirmPassword" = "Confirmer le mot de passe";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmer";
 "global.cameraDisabled" = "L'accès à votre caméra est désactivé. Veuillez l'activer dans les paramètres.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmer";
 "global.connect" = "Se connecter";
 
 // Scan
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Un compte Jami est créé et stocké localement uniquement sur cet appareil, sous la forme d'une archive contenant les clés de votre compte. L'accès à cette archive peut éventuellement être protégé par un mot de passe.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Importer un compte";
 "linkToAccount.showQrCode" = "Code QR";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
+"linkToAccount.showPinCode" = "Code d'authentication code";
+"linkToAccount.actionRequired" = "Action requise.\nVeuillez confirmer le compte sur l'appareil source.";
+"linkToAccount.allSet" = "Compte importé avec succès.";
+"linkToAccount.goToAccounts" = "Aller sur le compte importé";
+"linkToAccount.exportInstructions" = "Sur l'appareil source, lancez l'exportation.";
 "linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.scanQrCode" = "Une fois prêt, scannez le code QR.";
+"linkToAccount.enterProvidedCode" = "Une fois prêt, saisissez le code d'authentification.";
+"linkToAccount.accountLockedWithPassword" = "Le compte est protégé par un mot de passe.\nPour continuer, entrez le mot de passe du compte.";
+"linkToAccount.exit" = "Sortir";
+"linkToAccount.shareMessage" = "Votre code est : %@";
+"linkToAccount.alertTile" = "Voulez-vous sortir ?";
+"linkToAccount.alertMessage" = "La sortie annule l'opération d'importation du compte.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importer un compte Jami à partir d'un fichier d'archives local.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Lier un nouvel appareil";
 "linkDevice.networkError" = "Une erreur inconnue s'est produite lors de l'exportation du compte.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Une erreur d'authentification s'est produite. Veuillez vérifier votre mot de passe.";
+"linkDevice.errorNetwork" = "Une erreur réseau s'est produite.\nVérifier votre connectivité réseau.";
+"linkDevice.errorTimeout" = "L'opération a été interrompue.\nVeuillez réessayer.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Une erreur s'est produite pendant l'exportation du compte.\nVérifiez et réessayez.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Une fois prêt, scannez le code QR.";
+"linkDevice.infoCode" = "Une fois prêt, saisissez le code d'authentification.";
+"linkDevice.connecting" = "Connexion à votre nouvel appareil ...";
+"linkDevice.authenticationInfo" = "Nouvel appareil trouvé à l'adresse ci-dessous. Est-ce vous ?\nEn cliquant sur confirmer, le transfert du compte se poursuivra.";
+"linkDevice.newDeviceIP" = "Nouvelle adresse IP de l'appareil : %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Le nouvel identifiant de l'appareil n'est pas reconnu.\nVeuillez suivre les instructions ci-dessus.";
+"linkDevice.exportInProgress" = "L'opération d'exportation du compte vers le nouvel appareil est en cours.\nVeuillez confirmer l'importation sur le nouvel appareil.";
+"linkDevice.completed" = "Compte importé avec succès sur le nouvel appareil.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Démarrer appel audio";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ messages non lus";
 "accessibility.conversationRowBlocked" = "Conversation bloquées";
 "accessibility.conversationRowSyncing" = "Synchronisation en cours";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Dernier message sur %@";
 "accessibility.userPresenceOnline" = "En ligne";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitation reçues : %@ invitation(s) en attente";
 "accessibility.pendingRequestsRowSingular" = "Invitation reçues : %@ invitation en attente";
 "accessibility.pendingRequestsRowHint" = "Double tap pour consulter les invitations que vous avez reçues et y répondre.";
 "accessibility.pendingRequestsListBlockUser" = "Bloquer l'expéditeur de l'invitation";
@@ -565,16 +564,16 @@
 "accessibility.messageBubbleEdited" = "Modifié";
 "accessibility.messageBubbleRead" = "Lu";
 "accessibility.messageBubbleUnread" = "Non lu";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Message vide reçu le %@. Il se peut que ce message n'ait pas été envoyé correctement.";
 "accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
 "accessibility.inReply" = "En réponse au message";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.text.receivedOn" = "%1@, message reçu le %2@";
+"accessibility.text.sentOn" = "%1@, message envoyé le %2@";
+"accessibility.fileTransfer.receivedOn" = "Fichier : %1@ , reçu le %2@";
+"accessibility.fileTransfer.sentOn" = "Fichier : %1@, envoyé le %2@";
+"accessibility.call.lasted" = "Dernier %@";
+"accessibility.calls.default.toggleAudio" = "Couper le microphone";
+"accessibility.calls.default.toggleVideo" = "Allumer la caméra";
 "accessibility.calls.default.pauseCall" = "Mettre l'appel en pause";
 "accessibility.calls.default.hangUpCall" = "Raccrochez";
 "accessibility.calls.default.addParticipant" = "Ajouter un participant";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Lever la main";
 
 "accessibility.calls.alter.toggleAudio" = "Réouvrir le microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Arrêt de la caméra";
 "accessibility.calls.alter.pauseCall" = "Reprendre l'appel";
 "accessibility.calls.alter.hangUpCall" = "Raccrochez";
 "accessibility.calls.alter.addParticipant" = "Ajouter un participant";
diff --git a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
index c17f60a2939c32c40bbe8ff7c24a2a80515fce4f..7add0c4624b2cbcbb00881085bd902dabff34974 100644
--- a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Heure";
 "global.editPassword" = "Modifier le mot de passe";
 "global.confirmPassword" = "Confirmer le mot de passe";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmer";
 "global.cameraDisabled" = "L'accès à votre caméra est désactivé. Veuillez l'activer dans les paramètres.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmer";
 "global.connect" = "Se connecter";
 
 // Scan
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Un compte Jami est créé et stocké localement uniquement sur cet appareil, sous la forme d'une archive contenant les clés de votre compte. L'accès à cette archive peut éventuellement être protégé par un mot de passe.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Importer un compte";
 "linkToAccount.showQrCode" = "Code QR";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
+"linkToAccount.showPinCode" = "Code d'authentication code";
+"linkToAccount.actionRequired" = "Action requise.\nVeuillez confirmer le compte sur l'appareil source.";
+"linkToAccount.allSet" = "Compte importé avec succès.";
+"linkToAccount.goToAccounts" = "Aller sur le compte importé";
+"linkToAccount.exportInstructions" = "Sur l'appareil source, lancez l'exportation.";
 "linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.scanQrCode" = "Une fois prêt, scannez le code QR.";
+"linkToAccount.enterProvidedCode" = "Une fois prêt, saisissez le code d'authentification.";
+"linkToAccount.accountLockedWithPassword" = "Le compte est protégé par un mot de passe.\nPour continuer, entrez le mot de passe du compte.";
+"linkToAccount.exit" = "Quitter";
+"linkToAccount.shareMessage" = "Votre code est : %@";
+"linkToAccount.alertTile" = "Voulez-vous sortir ?";
+"linkToAccount.alertMessage" = "La sortie annule l'opération d'importation du compte.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importer un compte Jami à partir d'un fichier d'archives local.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Lier un Appareil";
 "linkDevice.networkError" = "Une erreur inconnue s'est produite lors de l'exportation du compte.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Une erreur d'authentification s'est produite. Veuillez vérifier votre mot de passe.";
+"linkDevice.errorNetwork" = "Une erreur réseau s'est produite.\nVérifier votre connectivité réseau.";
+"linkDevice.errorTimeout" = "L'opération a été interrompue.\nVeuillez réessayer.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Une erreur s'est produite pendant l'exportation du compte.\nVérifiez et réessayez.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Une fois prêt, scannez le code QR.";
+"linkDevice.infoCode" = "Une fois prêt, saisissez le code d'authentification.";
+"linkDevice.connecting" = "Connexion à votre nouvel appareil ...";
+"linkDevice.authenticationInfo" = "Nouvel appareil trouvé à l'adresse ci-dessous. Est-ce vous ?\nEn cliquant sur confirmer, le transfert du compte se poursuivra.";
+"linkDevice.newDeviceIP" = "Nouvelle adresse IP de l'appareil : %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Le nouvel identifiant de l'appareil n'est pas reconnu.\nVeuillez suivre les instructions ci-dessus.";
+"linkDevice.exportInProgress" = "L'opération d'exportation du compte vers le nouvel appareil est en cours.\nVeuillez confirmer l'importation sur le nouvel appareil.";
+"linkDevice.completed" = "Compte importé avec succès sur le nouvel appareil.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Démarrer appel audio";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ messages non lus";
 "accessibility.conversationRowBlocked" = "Conversation bloquées";
 "accessibility.conversationRowSyncing" = "Synchronisation en cours";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Dernier message sur %@";
 "accessibility.userPresenceOnline" = "En ligne";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitation reçues : %@ invitation(s) en attente";
 "accessibility.pendingRequestsRowSingular" = "Invitation reçues : %@ invitation en attente";
 "accessibility.pendingRequestsRowHint" = "Double tap pour consulter les invitations que vous avez reçues et y répondre.";
 "accessibility.pendingRequestsListBlockUser" = "Bloquer l'expéditeur de l'invitation";
@@ -565,15 +564,15 @@
 "accessibility.messageBubbleEdited" = "Modifié";
 "accessibility.messageBubbleRead" = "Lu";
 "accessibility.messageBubbleUnread" = "Non lu";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Message vide reçu le %@. Il se peut que ce message n'ait pas été envoyé correctement.";
 "accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
 "accessibility.inReply" = "En réponse au message";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.text.receivedOn" = "%1@, message reçu le %2@";
+"accessibility.text.sentOn" = "%1@, message envoyé le %2@";
+"accessibility.fileTransfer.receivedOn" = "Fichier : %1@ , reçu le %2@";
+"accessibility.fileTransfer.sentOn" = "Fichier : %1@, envoyé le %2@";
+"accessibility.call.lasted" = "Dernier %@";
+"accessibility.calls.default.toggleAudio" = "Couper le microphone";
 "accessibility.calls.default.toggleVideo" = "Allumer la caméra";
 "accessibility.calls.default.pauseCall" = "Mettre l'appel en pause";
 "accessibility.calls.default.hangUpCall" = "Raccrocher";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Lever la main";
 
 "accessibility.calls.alter.toggleAudio" = "Réouvrir le microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Arrêt de la caméra";
 "accessibility.calls.alter.pauseCall" = "Reprendre l'appel";
 "accessibility.calls.alter.hangUpCall" = "Raccrocher";
 "accessibility.calls.alter.addParticipant" = "Ajouter un participant";
diff --git a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
index 1bb382f33303afc0da8bfe9b92dfb440b5726da8..998f9c4e548e262bbb76abccf13c40f1df28acf1 100644
--- a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Heure";
 "global.editPassword" = "Modifier le mot de passe";
 "global.confirmPassword" = "Confirmer le mot de passe";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmer";
 "global.cameraDisabled" = "L'accès à votre caméra est désactivé. Veuillez l'activer dans les paramètres.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmer";
 "global.connect" = "Se connecter";
 
 // Scan
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Un compte Jami est créé et stocké localement uniquement sur cet appareil, sous la forme d'une archive contenant les clés de votre compte. L'accès à cette archive peut éventuellement être protégé par un mot de passe.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Importer un compte";
 "linkToAccount.showQrCode" = "Code QR";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
+"linkToAccount.showPinCode" = "Code d'authentication code";
+"linkToAccount.actionRequired" = "Action requise.\nVeuillez confirmer le compte sur l'appareil source.";
+"linkToAccount.allSet" = "Compte importé avec succès.";
+"linkToAccount.goToAccounts" = "Aller sur le compte importé";
+"linkToAccount.exportInstructions" = "Sur l'appareil source, lancez l'exportation.";
 "linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.scanQrCode" = "Une fois prêt, scannez le code QR.";
+"linkToAccount.enterProvidedCode" = "Une fois prêt, saisissez le code d'authentification.";
+"linkToAccount.accountLockedWithPassword" = "Le compte est protégé par un mot de passe.\nPour continuer, entrez le mot de passe du compte.";
+"linkToAccount.exit" = "Sortir";
+"linkToAccount.shareMessage" = "Votre code est : %@";
+"linkToAccount.alertTile" = "Voulez-vous sortir ?";
+"linkToAccount.alertMessage" = "La sortie annule l'opération d'importation du compte.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importer un compte Jami à partir d'un fichier d'archives local.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Lier un nouvel appareil";
 "linkDevice.networkError" = "Une erreur inconnue s'est produite lors de l'exportation du compte.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Une erreur d'authentification s'est produite. Veuillez vérifier votre mot de passe.";
+"linkDevice.errorNetwork" = "Une erreur réseau s'est produite.\nVérifier votre connectivité réseau.";
+"linkDevice.errorTimeout" = "L'opération a été interrompue.\nVeuillez réessayer.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Une erreur s'est produite pendant l'exportation du compte.\nVérifiez et réessayez.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Une fois prêt, scannez le code QR.";
+"linkDevice.infoCode" = "Une fois prêt, saisissez le code d'authentification.";
+"linkDevice.connecting" = "Connexion à votre nouvel appareil ...";
+"linkDevice.authenticationInfo" = "Nouvel appareil trouvé à l'adresse ci-dessous. Est-ce vous ?\nEn cliquant sur confirmer, le transfert du compte se poursuivra.";
+"linkDevice.newDeviceIP" = "Nouvelle adresse IP de l'appareil : %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Le nouvel identifiant de l'appareil n'est pas reconnu.\nVeuillez suivre les instructions ci-dessus.";
+"linkDevice.exportInProgress" = "L'opération d'exportation du compte vers le nouvel appareil est en cours.\nVeuillez confirmer l'importation sur le nouvel appareil.";
+"linkDevice.completed" = "Compte importé avec succès sur le nouvel appareil.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Démarrer appel audio";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ messages non lus";
 "accessibility.conversationRowBlocked" = "Conversation bloquées";
 "accessibility.conversationRowSyncing" = "Synchronisation en cours";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Dernier message sur %@";
 "accessibility.userPresenceOnline" = "En ligne";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitation reçues : %@ invitation(s) en attente";
 "accessibility.pendingRequestsRowSingular" = "Invitation reçues : %@ invitation en attente";
 "accessibility.pendingRequestsRowHint" = "Double tap pour consulter les invitations que vous avez reçues et y répondre.";
 "accessibility.pendingRequestsListBlockUser" = "Bloquer l'expéditeur de l'invitation";
@@ -565,15 +564,15 @@
 "accessibility.messageBubbleEdited" = "Modifié";
 "accessibility.messageBubbleRead" = "Lu";
 "accessibility.messageBubbleUnread" = "Non lu";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Message vide reçu le %@. Il se peut que ce message n'ait pas été envoyé correctement.";
 "accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
 "accessibility.inReply" = "En réponse au message";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.text.receivedOn" = "%1@, message reçu le %2@";
+"accessibility.text.sentOn" = "%1@, message envoyé le %2@";
+"accessibility.fileTransfer.receivedOn" = "Fichier : %1@ , reçu le %2@";
+"accessibility.fileTransfer.sentOn" = "Fichier : %1@, envoyé le %2@";
+"accessibility.call.lasted" = "Dernier %@";
+"accessibility.calls.default.toggleAudio" = "Rendre votre microphone muet";
 "accessibility.calls.default.toggleVideo" = "Allumer la caméra";
 "accessibility.calls.default.pauseCall" = "Mettre l'appel en pause";
 "accessibility.calls.default.hangUpCall" = "Raccrochez";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Lever la main";
 
 "accessibility.calls.alter.toggleAudio" = "Réouvrir le microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Arrêt de la caméra";
 "accessibility.calls.alter.pauseCall" = "Reprendre l'appel";
 "accessibility.calls.alter.hangUpCall" = "Raccrochez";
 "accessibility.calls.alter.addParticipant" = "Ajouter un participant";
diff --git a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
index d89fac96d7f736e3e1f705251326cf562f835ecb..74d044daa537866f3b7cf8a16c891cff6ec6b784 100644
--- a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Durée";
 "global.editPassword" = "Modifier le mot de passe";
 "global.confirmPassword" = "Confirmer le mot de passe";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmer";
 "global.cameraDisabled" = "L'accès à votre caméra est désactivé. Veuillez l'activer dans les paramètres.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmer";
 "global.connect" = "Se connecter";
 
 // Scan
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Un compte Jami est créé et stocké localement uniquement sur cet appareil, sous la forme d'une archive contenant les clés de votre compte. L'accès à cette archive peut éventuellement être protégé par un mot de passe.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Importer un compte";
 "linkToAccount.showQrCode" = "Code QR";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
+"linkToAccount.showPinCode" = "Code d'authentication code";
+"linkToAccount.actionRequired" = "Action requise.\nVeuillez confirmer le compte sur l'appareil source.";
+"linkToAccount.allSet" = "Compte importé avec succès.";
+"linkToAccount.goToAccounts" = "Aller sur le compte importé";
+"linkToAccount.exportInstructions" = "Sur l'appareil source, lancez l'exportation.";
 "linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.scanQrCode" = "Une fois prêt, scannez le code QR.";
+"linkToAccount.enterProvidedCode" = "Une fois prêt, saisissez le code d'authentification.";
+"linkToAccount.accountLockedWithPassword" = "Le compte est protégé par un mot de passe.\nPour continuer, entrez le mot de passe du compte.";
+"linkToAccount.exit" = "Sortir";
+"linkToAccount.shareMessage" = "Votre code est : %@";
+"linkToAccount.alertTile" = "Voulez-vous sortir ?";
+"linkToAccount.alertMessage" = "La sortie annule l'opération d'importation du compte.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importer un compte Jami à partir d'un fichier d'archives local.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Lier un nouvel appareil";
 "linkDevice.networkError" = "Une erreur inconnue s'est produite lors de l'exportation du compte.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Une erreur d'authentification s'est produite. Veuillez vérifier votre mot de passe.";
+"linkDevice.errorNetwork" = "Une erreur réseau s'est produite.\nVérifier votre connectivité réseau.";
+"linkDevice.errorTimeout" = "L'opération a été interrompue.\nVeuillez réessayer.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Une erreur s'est produite pendant l'exportation du compte.\nVérifiez et réessayez.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Une fois prêt, scannez le code QR.";
+"linkDevice.infoCode" = "Une fois prêt, saisissez le code d'authentification.";
+"linkDevice.connecting" = "Connexion à votre nouvel appareil ...";
+"linkDevice.authenticationInfo" = "Nouvel appareil trouvé à l'adresse ci-dessous. Est-ce vous ?\nEn cliquant sur confirmer, le transfert du compte se poursuivra.";
+"linkDevice.newDeviceIP" = "Nouvelle adresse IP de l'appareil : %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Le nouvel identifiant de l'appareil n'est pas reconnu.\nVeuillez suivre les instructions ci-dessus.";
+"linkDevice.exportInProgress" = "L'opération d'exportation du compte vers le nouvel appareil est en cours.\nVeuillez confirmer l'importation sur le nouvel appareil.";
+"linkDevice.completed" = "Compte importé avec succès sur le nouvel appareil.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Démarrer appel audio";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ messages non lus";
 "accessibility.conversationRowBlocked" = "Conversation bloquées";
 "accessibility.conversationRowSyncing" = "Synchronisation en cours";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Dernier message sur %@";
 "accessibility.userPresenceOnline" = "En ligne";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitation reçues : %@ invitation(s) en attente";
 "accessibility.pendingRequestsRowSingular" = "Invitation reçues : %@ invitation en attente";
 "accessibility.pendingRequestsRowHint" = "Double tap pour consulter les invitations que vous avez reçues et y répondre.";
 "accessibility.pendingRequestsListBlockUser" = "Bloquer l'expéditeur de l'invitation";
@@ -565,15 +564,15 @@
 "accessibility.messageBubbleEdited" = "Modifié";
 "accessibility.messageBubbleRead" = "Lu";
 "accessibility.messageBubbleUnread" = "Non lu";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Message vide reçu le %@. Il se peut que ce message n'ait pas été envoyé correctement.";
 "accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
 "accessibility.inReply" = "En réponse au message";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.text.receivedOn" = "%1@, message reçu le %2@";
+"accessibility.text.sentOn" = "%1@, message envoyé le %2@";
+"accessibility.fileTransfer.receivedOn" = "Fichier : %1@ , reçu le %2@";
+"accessibility.fileTransfer.sentOn" = "Fichier : %1@, envoyé le %2@";
+"accessibility.call.lasted" = "Dernier %@";
+"accessibility.calls.default.toggleAudio" = "Couper le micro";
 "accessibility.calls.default.toggleVideo" = "Allumer la caméra";
 "accessibility.calls.default.pauseCall" = "Mettre l'appel en pause";
 "accessibility.calls.default.hangUpCall" = "Raccrocher";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Lever la main";
 
 "accessibility.calls.alter.toggleAudio" = "Réouvrir le microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Arrêt de la caméra";
 "accessibility.calls.alter.pauseCall" = "Reprendre l'appel";
 "accessibility.calls.alter.hangUpCall" = "Raccrocher";
 "accessibility.calls.alter.addParticipant" = "Ajouter un participant";
diff --git a/Ring/Ring/Resources/fr.lproj/Localizable.strings b/Ring/Ring/Resources/fr.lproj/Localizable.strings
index 6ba0db656bc33e6d4324b3c95a35b17a6f128d07..49cec491882288dc4feaa0cd699ebcf51225224b 100644
--- a/Ring/Ring/Resources/fr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Durée";
 "global.editPassword" = "Modifier le mot de passe";
 "global.confirmPassword" = "Confirmer le mot de passe";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmer";
 "global.cameraDisabled" = "L'accès à votre caméra est désactivé. Veuillez l'activer dans les paramètres.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmer";
 "global.connect" = "Se connecter";
 
 // Scan
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Un compte Jami est créé et stocké localement uniquement sur cet appareil, sous la forme d'une archive contenant les clés de votre compte. L'accès à cette archive peut éventuellement être protégé par un mot de passe.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Importer un compte";
 "linkToAccount.showQrCode" = "Code QR";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
+"linkToAccount.showPinCode" = "Code d'authentification code";
+"linkToAccount.actionRequired" = "Action requise.\nVeuillez confirmer le compte sur l'appareil source.";
+"linkToAccount.allSet" = "Compte importé avec succès.";
+"linkToAccount.goToAccounts" = "Aller sur le compte importé";
+"linkToAccount.exportInstructions" = "Sur l'appareil source, lancez l'exportation.";
 "linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.scanQrCode" = "Une fois prêt, scannez le code QR.";
+"linkToAccount.enterProvidedCode" = "Une fois prêt, saisissez le code d'authentification.";
+"linkToAccount.accountLockedWithPassword" = "Le compte est protégé par un mot de passe.\nPour continuer, entrez le mot de passe du compte.";
+"linkToAccount.exit" = "Sortir";
+"linkToAccount.shareMessage" = "Votre code est : %@";
+"linkToAccount.alertTile" = "Voulez-vous sortir ?";
+"linkToAccount.alertMessage" = "La sortie annule l'opération d'importation du compte.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importer un compte Jami à partir d'un fichier d'archives local.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Associer un nouvel appareil";
 "linkDevice.networkError" = "Une erreur inconnue s'est produite lors de l'exportation du compte.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Une erreur d'authentification s'est produite. Veuillez vérifier votre mot de passe.";
+"linkDevice.errorNetwork" = "Une erreur réseau s'est produite.\nVérifier votre connectivité réseau.";
+"linkDevice.errorTimeout" = "L'opération a été interrompue.\nVeuillez réessayer.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Une erreur s'est produite pendant l'exportation du compte.\nVérifiez et réessayez.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Une fois prêt, scannez le code QR.";
+"linkDevice.infoCode" = "Une fois prêt, saisissez le code d'authentification.";
+"linkDevice.connecting" = "Connexion à votre nouvel appareil ...";
+"linkDevice.authenticationInfo" = "Nouvel appareil trouvé à l'adresse ci-dessous. Est-ce vous ?\nEn cliquant sur confirmer, le transfert du compte se poursuivra.";
+"linkDevice.newDeviceIP" = "Nouvelle adresse IP de l'appareil : %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Le nouvel identifiant de l'appareil n'est pas reconnu.\nVeuillez suivre les instructions ci-dessus.";
+"linkDevice.exportInProgress" = "L'opération d'exportation du compte vers le nouvel appareil est en cours.\nVeuillez confirmer l'importation sur le nouvel appareil.";
+"linkDevice.completed" = "Compte importé avec succès sur le nouvel appareil.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Démarrer un appel audio";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ messages non lus";
 "accessibility.conversationRowBlocked" = "Conversation bloquées";
 "accessibility.conversationRowSyncing" = "Synchronisation en cours";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Dernier message sur %@";
 "accessibility.userPresenceOnline" = "En ligne";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitations reçues : %@ invitation(s) en attente";
 "accessibility.pendingRequestsRowSingular" = "Invitation reçues : %@ invitation en attente";
 "accessibility.pendingRequestsRowHint" = "Double tap pour consulter les invitations que vous avez reçues et y répondre.";
 "accessibility.pendingRequestsListBlockUser" = "Bloquer l'expéditeur de l'invitation";
@@ -565,16 +564,16 @@
 "accessibility.messageBubbleEdited" = "Modifié";
 "accessibility.messageBubbleRead" = "Lu";
 "accessibility.messageBubbleUnread" = "Non lu";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Message vide reçu le %@. Il se peut que ce message n'ait pas été envoyé correctement.";
 "accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
 "accessibility.inReply" = "En réponse au message";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
-"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.text.receivedOn" = "%1@, message reçu le %2@";
+"accessibility.text.sentOn" = "%1@, message envoyé le %2@";
+"accessibility.fileTransfer.receivedOn" = "Fichier : %1@ , reçu le %2@";
+"accessibility.fileTransfer.sentOn" = "Fichier : %1@, envoyé le %2@";
+"accessibility.call.lasted" = "Dernier %@";
+"accessibility.calls.default.toggleAudio" = "Couper le micro";
+"accessibility.calls.default.toggleVideo" = "Allumer la caméra";
 "accessibility.calls.default.pauseCall" = "Mettre l'appel en attente";
 "accessibility.calls.default.hangUpCall" = "Raccrocher";
 "accessibility.calls.default.addParticipant" = "Ajouter un participant";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Lever la main";
 
 "accessibility.calls.alter.toggleAudio" = "Réouvrir le microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Arrêt de la caméra";
 "accessibility.calls.alter.pauseCall" = "Reprendre l'appel";
 "accessibility.calls.alter.hangUpCall" = "Raccrocher";
 "accessibility.calls.alter.addParticipant" = "Ajouter un participant";
diff --git a/Ring/Ring/Resources/ga.lproj/Localizable.strings b/Ring/Ring/Resources/ga.lproj/Localizable.strings
index a0c2cff93408d542ab00299331663a0b0e8e531d..398c040eca62f6143688c6c09b3170958ebdcb04 100644
--- a/Ring/Ring/Resources/ga.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ga.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Pasfhocal a dhearbhú";
-"global.confirm" = "Confirm";
+"global.confirm" = "Cinntíonn";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Cinntíonn";
 "global.connect" = "Déan nasc";
 
 // Scan
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Micrófón muinte";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Calla stop";
 "accessibility.calls.default.hangUpCall" = "Hang up";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Cuir lámh suas";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Stop ceamara";
 "accessibility.calls.alter.pauseCall" = "Déan athghníomhú glao";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
 "accessibility.calls.alter.addParticipant" = "Cuid a chur le rannpháirtí";
diff --git a/Ring/Ring/Resources/gl.lproj/Localizable.strings b/Ring/Ring/Resources/gl.lproj/Localizable.strings
index 5ec5b28265d709085a2deb45af972d508de3c1b6..00cd8997cbad759a32cf0f4dd414bcb56a76dbd0 100644
--- a/Ring/Ring/Resources/gl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/gl.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Confirmar contrasinal";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
+"global.confirm" = "Confirmar";
 "global.connect" = "Conectar";
 
 // Scan
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Apagar micrófono";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Pausa chamada";
 "accessibility.calls.default.hangUpCall" = "Colgar";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "Ergue a man";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "Parar cámara";
 "accessibility.calls.alter.pauseCall" = "Reanudar a chamada";
 "accessibility.calls.alter.hangUpCall" = "Colgar";
 "accessibility.calls.alter.addParticipant" = "Engadir participante";
diff --git a/Ring/Ring/Resources/gu.lproj/Localizable.strings b/Ring/Ring/Resources/gu.lproj/Localizable.strings
index 975fea7a25c4ea42657ad1e61effbb91586e2751..01b6a2a80a99ef227239e6a6e8f5a9e703a3136d 100644
--- a/Ring/Ring/Resources/gu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/gu.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "મ્યૂટ માઇક્રોફોન";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "વિરામ કૉલ";
 "accessibility.calls.default.hangUpCall" = "બંધ કરો";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "હાથ ઉઠાવો";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "સ્ટોપ કેમેરા";
 "accessibility.calls.alter.pauseCall" = "કૉલ પુનઃ શરૂ કરો";
 "accessibility.calls.alter.hangUpCall" = "બંધ કરો";
 "accessibility.calls.alter.addParticipant" = "ઉમેરો સહભાગી";
diff --git a/Ring/Ring/Resources/hak.lproj/Localizable.strings b/Ring/Ring/Resources/hak.lproj/Localizable.strings
index 49840d14292c18dbd65d426b57d4bd16812c56fc..f41b7f29b632e6bed3ecd8e85d2603aa1a6f0447 100644
--- a/Ring/Ring/Resources/hak.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hak.lproj/Localizable.strings
@@ -57,9 +57,9 @@
 "global.time" = "时间";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "确认密码";
-"global.confirm" = "Confirm";
+"global.confirm" = "確認";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
-"global.confirm" = "Confirm";
+"global.confirm" = "確認";
 "global.connect" = "连接";
 
 // Scan
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "離開";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "关闭麦克风";
 "accessibility.calls.default.toggleVideo" = "启动摄像头";
 "accessibility.calls.default.pauseCall" = "暫停通話";
 "accessibility.calls.default.hangUpCall" = "挂断";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "举手";
 
 "accessibility.calls.alter.toggleAudio" = "麦克风静音";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "关闭摄像头";
 "accessibility.calls.alter.pauseCall" = "恢复通话";
 "accessibility.calls.alter.hangUpCall" = "挂断";
 "accessibility.calls.alter.addParticipant" = "添加参与者";
diff --git a/Ring/Ring/Resources/he.lproj/Localizable.strings b/Ring/Ring/Resources/he.lproj/Localizable.strings
index caf0f4e3c2059d684a5326175ff2c98b5b2064d4..c395254700cc089fac038ff962e0904673a9d819 100644
--- a/Ring/Ring/Resources/he.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/he.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "מיקרופון שקט";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "הפסקת שיחת";
 "accessibility.calls.default.hangUpCall" = "   ניתוק";
@@ -585,7 +584,7 @@
 "accessibility.calls.default.raiseHand" = "תרים את היד.";
 
 "accessibility.calls.alter.toggleAudio" = "Unmute microphone";
-"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.toggleVideo" = "מצלמה עצירה";
 "accessibility.calls.alter.pauseCall" = "קם שוב";
 "accessibility.calls.alter.hangUpCall" = "   ניתוק";
 "accessibility.calls.alter.addParticipant" = "הוסף משתתף";
diff --git a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
index c7cfa4de6d16a547412915a28a6ee443ff64227d..5c5a1ac363efe4250cdc041ef9e372d943db1cbe 100644
--- a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "मूक माइक्रोफोन";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "विराम कॉल";
 "accessibility.calls.default.hangUpCall" = "फोन रख दे";
diff --git a/Ring/Ring/Resources/hi.lproj/Localizable.strings b/Ring/Ring/Resources/hi.lproj/Localizable.strings
index cbbe4c9a9e9282c8ac5c2d083414165afad71070..2d9762d39fd7c6d71b73c1ed91b28c908250bd89 100644
--- a/Ring/Ring/Resources/hi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hi.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "मूक माइक्रोफोन";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "विराम कॉल";
 "accessibility.calls.default.hangUpCall" = "फोन रख दे";
diff --git a/Ring/Ring/Resources/hr.lproj/Localizable.strings b/Ring/Ring/Resources/hr.lproj/Localizable.strings
index ee5731718f45321635cd09143e7d45d642e4c2d5..3b40b1f70bdb7a2f6a4da2534edc289138968393 100644
--- a/Ring/Ring/Resources/hr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hr.lproj/Localizable.strings
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "Izađi";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Utišaj mikrofon";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Pauza poziv";
 "accessibility.calls.default.hangUpCall" = "Poklopi";
diff --git a/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings b/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
index ee5731718f45321635cd09143e7d45d642e4c2d5..3b40b1f70bdb7a2f6a4da2534edc289138968393 100644
--- a/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
@@ -206,7 +206,7 @@
 "linkToAccount.scanQrCode" = "When ready, scan the QR code.";
 "linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
 "linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.exit" = "Izađi";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Utišaj mikrofon";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Pauza poziv";
 "accessibility.calls.default.hangUpCall" = "Poklopi";
diff --git a/Ring/Ring/Resources/hu.lproj/Localizable.strings b/Ring/Ring/Resources/hu.lproj/Localizable.strings
index 03086acd6df8cc934fbfb1cdee492a4a2ca9dd40..60bd2ddfc913b4e4e93acdb631468b48ab3dd8c9 100644
--- a/Ring/Ring/Resources/hu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hu.lproj/Localizable.strings
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami-fiók csak helyileg jön létre és tárolódik ezen az eszközön a fiókkulcsokat tartalmazó archívumként. Az archívumhoz való hozzáférés választható jelszóval védhető.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Fiók importálása";
 "linkToAccount.showQrCode" = "QR-kód";
-"linkToAccount.showPinCode" = "Authentication code";
+"linkToAccount.showPinCode" = "Hitelesítési kód";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
+"linkToAccount.allSet" = "A fiók importálása sikerült.";
 "linkToAccount.goToAccounts" = "Go to imported account";
 "linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
 "linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
+"linkToAccount.scanQrCode" = "Ha készen áll, olvassa be a QR-kódot.";
+"linkToAccount.enterProvidedCode" = "Ha készen áll, adja meg a hitelesítési kódot.";
+"linkToAccount.accountLockedWithPassword" = "A fiók jelszóval van védve. A folytatáshoz adja meg a fiók jelszavát.";
 "linkToAccount.exit" = "Kilépés";
 "linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.alertTile" = "Leállítja a fiók összekapcsolását?";
+"linkToAccount.alertMessage" = "A leállítás megszakítja a fiók importálási műveletét.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Jami-fiók importálása a helyi archívfájlból.";
@@ -333,7 +333,7 @@
 "accountPage.boothModeExplanation" = "A fülke üzemmódban a beszélgetési előzmények nem kerülnek mentésre, és a Jami funkcionalitása korlátozott a kimenő hívások kezdeményezésekor. Ha a fülke üzemmód engedélyezve van, az összes beszélgetés törlődik.";
 "accountPage.noBoothMode" = "A fülke üzemmód engedélyezéséhez először titkosítsa a fiókot.";
 "accountPage.boothModeAlertMessage" = "A fülke üzemmód engedélyezése után az összes beszélgetés eltávolításra kerül.";
-"accountPage.peerDiscovery" = "Helyi partner felderítése engedélyezése";
+"accountPage.peerDiscovery" = "Helyi társ felderítése engedélyezése";
 "accountPage.peerDiscoveryExplanation" = "Csatlakozás más DHT-csomópontokhoz, amelyek a helyi hálózaton hirdetnek";
 "accountPage.autoRegistration" = "Önműködő bejegyzése a lejárat után";
 "accountPage.connectivityHeader" = "Kapcsolódás";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Új eszköz összekapcsolása";
 "linkDevice.networkError" = "Hálózati hiba történt a fiók exportálása közben.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.errorWrongPassword" = "Hitelesítési hiba történt az eszköz összekapcsolása közben. Kérjük, ellenőrizze jelszavát, és próbálkozzon újra.";
+"linkDevice.errorNetwork" = "Hálózati hiba történt a fiók összekapcsolása közben. Ellenőrizze a kapcsolatot, majd próbálkozzon újra.";
+"linkDevice.errorTimeout" = "Művelet időtúllépése. Próbálkozzon újra.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Hiba történt a fiók exportálása közben. Próbálkozzon újra.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Ha készen áll, olvassa be a QR-kódot.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
+"linkDevice.newDeviceIP" = "Új eszköz IP-címe: %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Ismeretlen új eszközazonosító. Kérjük, kövesse a fenti utasításokat.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.completed" = "A fiók importálása sikerült az új eszközön.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Hanghívás indítása";
@@ -552,7 +551,7 @@
 "accessibility.conversationRowUnreadCount" = "%@ olvasatlan üzenet.";
 "accessibility.conversationRowBlocked" = "Beszélgetés letiltva";
 "accessibility.conversationRowSyncing" = "Összehangolás folyamatban";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Utolsó üzenet időpontja: %@";
 "accessibility.userPresenceOnline" = "Elérhető";
 "accessibility.userPresenceAvailable" = "Elérhető";
 "accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
@@ -565,15 +564,15 @@
 "accessibility.messageBubbleEdited" = "Szerkesztve";
 "accessibility.messageBubbleRead" = "Olvasott";
 "accessibility.messageBubbleUnread" = "Olvasatlan";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Üres szöveges üzenet érkezésének ideje: %@. Lehet, hogy az üzenetet nem küldték el megfelelően.";
 "accessibility.fileTransferNoName" = "Fájl érkezésének ideje: %@, nincs elérhető név";
 "accessibility.inReply" = "Válasz az üzenetre";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.text.receivedOn" = "%1@, az üzenet érkezésének ideje: %2@";
+"accessibility.text.sentOn" = "%1@, az üzenet küldésének ideje: %2@";
+"accessibility.fileTransfer.receivedOn" = "A(z) %1@ fájl érkezésének ideje: %2@";
+"accessibility.fileTransfer.sentOn" = "A(z) %1@ fájl küldésének ideje: %2@";
+"accessibility.call.lasted" = "%@ tartott";
+"accessibility.calls.default.toggleAudio" = "Mikrofon elnémítása";
 "accessibility.calls.default.toggleVideo" = "Fényképezőgép indítása";
 "accessibility.calls.default.pauseCall" = "Hívás tartása";
 "accessibility.calls.default.hangUpCall" = "Hívás befejezése";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Hívás befejezése";
 "accessibility.conference.lowerHand" = "Kéz leengedése";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Jogkivonat QR-kód";
diff --git a/Ring/Ring/Resources/hy.lproj/Localizable.strings b/Ring/Ring/Resources/hy.lproj/Localizable.strings
index 4293b569a183612dc2cbf621e2ffcf51d935c191..25a8baa42e5927ab12632b799df8aa10fcd11a92 100644
--- a/Ring/Ring/Resources/hy.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hy.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Միկրոֆոն անջատ";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Հանգիստ զանգ";
 "accessibility.calls.default.hangUpCall" = "Բացեք։";
diff --git a/Ring/Ring/Resources/id.lproj/Localizable.strings b/Ring/Ring/Resources/id.lproj/Localizable.strings
index ea8b762345a67e3904f4404a42c9095d99c6754e..39a4e48802be5806e6f3ee7eb94e38ed7f3ebfee 100644
--- a/Ring/Ring/Resources/id.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/id.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Senyapkan mikrofon";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Jeda panggilan";
 "accessibility.calls.default.hangUpCall" = "Angkat";
diff --git a/Ring/Ring/Resources/ig.lproj/Localizable.strings b/Ring/Ring/Resources/ig.lproj/Localizable.strings
index 84914cc0b9bb7594d66a03e605380754b778018e..5b5a92a6d11d75db80ff15a5ee133bcad58c4a20 100644
--- a/Ring/Ring/Resources/ig.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ig.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Igwe okwu na-adịghị arụ ọrụ";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Nkwupụta nkwụsịtụ";
 "accessibility.calls.default.hangUpCall" = "Hang up";
diff --git a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
index de75b75d47ece71456954c62c64079e0c92f886a..620030e8f1434f903486ace1676e68b523a2704c 100644
--- a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Disattiva microfono";
 "accessibility.calls.default.toggleVideo" = "Avvia fotocamera";
 "accessibility.calls.default.pauseCall" = "Metti in pausa la chiamata";
 "accessibility.calls.default.hangUpCall" = "Chiudi";
diff --git a/Ring/Ring/Resources/it.lproj/Localizable.strings b/Ring/Ring/Resources/it.lproj/Localizable.strings
index 3602fc15ef750e4dd0c956ef315abf6e27ad6de0..171807d67247ee1d36aa72d65ed0452ba413e6dc 100644
--- a/Ring/Ring/Resources/it.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Disattiva microfono";
 "accessibility.calls.default.toggleVideo" = "Avvia fotocamera";
 "accessibility.calls.default.pauseCall" = "Metti in pausa la chiamata";
 "accessibility.calls.default.hangUpCall" = "Chiudi";
diff --git a/Ring/Ring/Resources/ja.lproj/Localizable.strings b/Ring/Ring/Resources/ja.lproj/Localizable.strings
index 6a735a6d4a825cd27eadabf7c1f0f0f876dee637..ae782193d17dc55ccf7b8bde8786037d9bdb2ad6 100644
--- a/Ring/Ring/Resources/ja.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ja.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "マイクをミュート";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "通話を一時停止";
 "accessibility.calls.default.hangUpCall" = "通話終了";
diff --git a/Ring/Ring/Resources/kk.lproj/Localizable.strings b/Ring/Ring/Resources/kk.lproj/Localizable.strings
index 0eac8f5af5e33cd8a157e2f18f3e491c195f7e29..8834e59ca34ce57d851181e6cdf9a410593c70f3 100644
--- a/Ring/Ring/Resources/kk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/kk.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "Ақысыз микрофон";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Тындық шақыру";
 "accessibility.calls.default.hangUpCall" = "Ашыңыз";
diff --git a/Ring/Ring/Resources/kn.lproj/Localizable.strings b/Ring/Ring/Resources/kn.lproj/Localizable.strings
index 744662f1dfaaa0ca4cd9043c461762ce7d93e9c4..4db2114634169731d74bc4443ca30f37e18cead8 100644
--- a/Ring/Ring/Resources/kn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/kn.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "ಮೂಕ ಮೈಕ್ರೊಫೋನ್";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "ವಿರಾಮ ಕರೆ";
 "accessibility.calls.default.hangUpCall" = "ಮುಚ್ಚಿ";
diff --git a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
index 9b5ef88dca51cb27e3c32ed3967e58794bd39039..0f8969c43b51350612eeae9f4e930485a6ef655a 100644
--- a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/ko.lproj/Localizable.strings b/Ring/Ring/Resources/ko.lproj/Localizable.strings
index 6fac12c2d2c821c8eb67726e9f7d4efd6145a652..0f8969c43b51350612eeae9f4e930485a6ef655a 100644
--- a/Ring/Ring/Resources/ko.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ko.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
@@ -573,7 +572,7 @@
 "accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
 "accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
 "accessibility.call.lasted" = "Lasted %@";
-"accessibility.calls.default.toggleAudio" = "Mute microphone";
+"accessibility.calls.default.toggleAudio" = "무음 마이크";
 "accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "휴식 통화";
 "accessibility.calls.default.hangUpCall" = "- ";
diff --git a/Ring/Ring/Resources/lt.lproj/Localizable.strings b/Ring/Ring/Resources/lt.lproj/Localizable.strings
index d9c1893d9dc5af5384f89af70a887926ddab4030..d9a66b8a3e2b5dedad0895d1226064448d0767b9 100644
--- a/Ring/Ring/Resources/lt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/lt.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/ml.lproj/Localizable.strings b/Ring/Ring/Resources/ml.lproj/Localizable.strings
index 35c4d0d11873f202d3f2de0e95f0b5147424c22d..9221193edb47407a07b0c8a9445fddcd059e80b6 100644
--- a/Ring/Ring/Resources/ml.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ml.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings b/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
index 0b3abbf0bd0221648bdb7a64a5d715f042c49a97..39277e57ee3888f8d819b2822ec9d2af63224035 100644
--- a/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/mr.lproj/Localizable.strings b/Ring/Ring/Resources/mr.lproj/Localizable.strings
index 730f377fbeb17747a3f6fa261ae32e62ab342463..1f8ebe9e3e1fee91b12d8781d9a9964f5a4e0dbb 100644
--- a/Ring/Ring/Resources/mr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/mr.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/ms.lproj/Localizable.strings b/Ring/Ring/Resources/ms.lproj/Localizable.strings
index 29cf7ca9dbdd68c5b869208d8521f561f9188acf..8eaaece8c35d87cf2060bba8eeeb24cb08be1be5 100644
--- a/Ring/Ring/Resources/ms.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ms.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/nan.lproj/Localizable.strings b/Ring/Ring/Resources/nan.lproj/Localizable.strings
index dc25b013c39aedd3d649052ea2d25dc78f0f5273..7b49de97e179b8b222455c22619b148b8b0e4d0e 100644
--- a/Ring/Ring/Resources/nan.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nan.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/nb.lproj/Localizable.strings b/Ring/Ring/Resources/nb.lproj/Localizable.strings
index afb3ca252d8b379e760dcb25ccdbd259519325ad..bf09749f72aca0a8c19905e793405a91cf20da15 100644
--- a/Ring/Ring/Resources/nb.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nb.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/ne.lproj/Localizable.strings b/Ring/Ring/Resources/ne.lproj/Localizable.strings
index 9d4847ad316d6f9ec2bb15a1c90a5bab3ceaa327..ac8f225af39f6af427bb2a3d152d80abb687f639 100644
--- a/Ring/Ring/Resources/ne.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ne.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/nl.lproj/Localizable.strings b/Ring/Ring/Resources/nl.lproj/Localizable.strings
index 5582c10c86a612975c43d20177a7c69b7a13c02b..475cb73656ca374ceb3fafe7651bc0b8fad7f66e 100644
--- a/Ring/Ring/Resources/nl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/nn.lproj/Localizable.strings b/Ring/Ring/Resources/nn.lproj/Localizable.strings
index 35793cf173f2a3ee08a81201bcae11cd7cb1bc70..4989475d97ac11205b63f4eb44d0e5ad3435f5d2 100644
--- a/Ring/Ring/Resources/nn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nn.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/oc.lproj/Localizable.strings b/Ring/Ring/Resources/oc.lproj/Localizable.strings
index aa16452497d93bd7d793f8177775770dbe30f305..71f79c072f150fe4e2f5cb90bfcf51ab0d196d39 100644
--- a/Ring/Ring/Resources/oc.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/oc.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/or.lproj/Localizable.strings b/Ring/Ring/Resources/or.lproj/Localizable.strings
index f64d2421950cbbf41ad0320c8f17fa1bbd235ace..d7431f4a2b20a2f050c6744ae0ca6335e87d2b1f 100644
--- a/Ring/Ring/Resources/or.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/or.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/pa.lproj/Localizable.strings b/Ring/Ring/Resources/pa.lproj/Localizable.strings
index 2b27c51bd1e82967b66d69580af943ebb3beae45..31b34351eb6e40e1a5fb31f8b894405c3fc99e52 100644
--- a/Ring/Ring/Resources/pa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pa.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/pl.lproj/Localizable.strings b/Ring/Ring/Resources/pl.lproj/Localizable.strings
index cbc503d909af719a7f281eed13e7c8935c8898db..e89fefefdd0a4cb0d4935867174dbadae782c55a 100644
--- a/Ring/Ring/Resources/pl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
index 97afce450c772246898d8f86ae177186d8d8924e..382510f9e35f3f90f840f119962921bdf5cc8f5b 100644
--- a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
index 1ca9a9e9ea77b80801355a16f1ad08a4d1fe0ba8..f505d91e3e23adbc902dbe95a4db8d672e3f03cc 100644
--- a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/pt.lproj/Localizable.strings b/Ring/Ring/Resources/pt.lproj/Localizable.strings
index 9c8455b995a76da5936101986a06a5bdffa198d1..5c3a5ee978093f4507cbf11c4753877ab8aecc2b 100644
--- a/Ring/Ring/Resources/pt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
index 965f3c2e716edd800665c09fb47295c618fd9c7f..77fd9248d7f75b6d89642f28b3b14250679327bf 100644
--- a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/ro.lproj/Localizable.strings b/Ring/Ring/Resources/ro.lproj/Localizable.strings
index 190406631e4994e42e4d4545a01c83eff11208ac..fd96c453be0bca656dd59806752c2e189fc10654 100644
--- a/Ring/Ring/Resources/ro.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro.lproj/Localizable.strings
@@ -195,7 +195,7 @@
 "createAccount.encryptExplanation" = "Un cont Jami este creat și stocat local numai în acest aparat, sub forma unei arhive care conține cheile contului. Accesul la această arhivă poate fi protejat facultativ cu o parolă.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Importă contul";
 "linkToAccount.showQrCode" = "Cod QR";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
index 040bc9b28a5ad9ba95f2302d0aaf7e1389c8bc3b..9999befd9fc3313c66e77466b68604fd03b051ac 100644
--- a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
@@ -195,7 +195,7 @@
 "createAccount.encryptExplanation" = "Un cont Jami este creat și stocat local numai în acest aparat, sub forma unei arhive care conține cheile contului. Accesul la această arhivă poate fi protejat facultativ cu o parolă.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Importă contul";
 "linkToAccount.showQrCode" = "Cod QR";
 "linkToAccount.showPinCode" = "Authentication code";
 "linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
index 53c2d5f06b0f2f8242b47e651cb16297977c54fd..a457b9e021331ba8765165faad795b107a7382a5 100644
--- a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Аккаунт Джами создаётся локально и хранится только на этом устройстве в форме архива, содержащего ключи от вашей учётной записи. По желанию, доступ к архиву может быть защищён паролем.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Импорт учетной записи";
 "linkToAccount.showQrCode" = "QR-код";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
+"linkToAccount.showPinCode" = "Код аутентификации";
+"linkToAccount.actionRequired" = "Требуется действие.\nПодтвердите учетную запись на исходном устройстве.";
+"linkToAccount.allSet" = "Учетная запись успешно импортирована.";
+"linkToAccount.goToAccounts" = "Перейти к импортированной учетной записи";
+"linkToAccount.exportInstructions" = "На исходном устройстве инициируйте экспорт.";
+"linkToAccount.exportInstructionsPath" = "Выберите Учетная запись > Настройки учетной записи > Привязать новое устройство.";
+"linkToAccount.scanQrCode" = "Когда будете готовы, отсканируйте QR-код.";
+"linkToAccount.enterProvidedCode" = "По готовности введите код аутентификации.";
+"linkToAccount.accountLockedWithPassword" = "Учетная запись защищена паролем.\nЧтобы продолжить, введите пароль учетной записи.";
 "linkToAccount.exit" = "Выход";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.shareMessage" = "Ваш код:%@";
+"linkToAccount.alertTile" = "Вы хотите выйти?";
+"linkToAccount.alertMessage" = "Выход отменит операцию импорта учетной записи.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Импортируйте аккаунт Jami из локального архивного файла.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Привязать новое устройство";
 "linkDevice.networkError" = "При экспорте учетной записи возникла ошибка сети.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Произошла ошибка аутентификации.\nПожалуйста, проверьте свой пароль.";
+"linkDevice.errorNetwork" = "Произошла ошибка сети.\nПроверьте подключение.";
+"linkDevice.errorTimeout" = "Время операции истекло.\nПопробуйте еще раз.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Произошла ошибка при экспорте аккаунта.\nПопробуйте снова.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Когда будете готовы, отсканируйте QR-код.";
+"linkDevice.infoCode" = "Когда будете готовы, введите код и нажмите \"Подключиться\".";
+"linkDevice.connecting" = "Подключение к новому устройству…";
+"linkDevice.authenticationInfo" = "Новое устройство найдено по указанному ниже IP-адресу. Это вы?\nЧтобы продолжить перенос аккаунта, нажмите \"Подтвердить\".";
+"linkDevice.newDeviceIP" = "IP-адрес нового устройства:%1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Новый идентификатор устройства не распознан.\nСледуйте инструкциям выше.";
+"linkDevice.exportInProgress" = "Выполняется операция экспорта учетной записи на новое устройство.\nПодтвердите импорт на новом устройстве.";
+"linkDevice.completed" = "Учетная запись успешно импортирована на новое устройство.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Начать аудиозвонок";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@непрочитанных сообщений.";
 "accessibility.conversationRowBlocked" = "Беседа заблокирована";
 "accessibility.conversationRowSyncing" = "Выполняется синхронизация";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Последнее сообщение в %@";
 "accessibility.userPresenceOnline" = "В сети";
 "accessibility.userPresenceAvailable" = "Доступно";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Получено приглашений:  %@ожидающие приглашения";
 "accessibility.pendingRequestsRowSingular" = "Получено приглашение: %@ожидает приглашения";
 "accessibility.pendingRequestsRowHint" = "Коснитесь дважды, чтобы просмотреть и ответить на полученные приглашения";
 "accessibility.pendingRequestsListBlockUser" = "Блокировать отправителя приглашения";
@@ -565,14 +564,14 @@
 "accessibility.messageBubbleEdited" = "Отредактировано";
 "accessibility.messageBubbleRead" = "Прочитано";
 "accessibility.messageBubbleUnread" = "Непрочитано";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Получено пустое текстовое сообщение на %@ . Возможно, оно было отправлено неправильно.";
 "accessibility.fileTransferNoName" = "Файл получен на %@, имя недоступно";
 "accessibility.inReply" = "В ответ на сообщение";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
+"accessibility.text.receivedOn" = "%1@, сообщение получено на %2@";
+"accessibility.text.sentOn" = "%1@ , сообщение отправлено на %2@";
+"accessibility.fileTransfer.receivedOn" = "Файл: %1@, получен на %2@";
+"accessibility.fileTransfer.sentOn" = "Файл: %1@, отправлен на %2@";
+"accessibility.call.lasted" = "Длилось %@";
 "accessibility.calls.default.toggleAudio" = "Отключить микрофон";
 "accessibility.calls.default.toggleVideo" = "Включить камеру";
 "accessibility.calls.default.pauseCall" = "Приостановить звонок";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Завершить";
 "accessibility.conference.lowerHand" = "Опущенная рука";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "QR-код токена";
diff --git a/Ring/Ring/Resources/ru.lproj/Localizable.strings b/Ring/Ring/Resources/ru.lproj/Localizable.strings
index 99acd50c22fa1d408fb437401e0de9d47f2e994a..df0219b60d464965f0c2584703f0b25eb0bba881 100644
--- a/Ring/Ring/Resources/ru.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru.lproj/Localizable.strings
@@ -195,21 +195,21 @@
 "createAccount.encryptExplanation" = "Аккаунт Джами создаётся локально и хранится только на этом устройстве в форме архива, содержащего ключи от вашей учётной записи. При желании доступ к архиву может быть защищён паролем.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Импорт учетной записи";
 "linkToAccount.showQrCode" = "QR-код";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
+"linkToAccount.showPinCode" = "Код аутентификации";
+"linkToAccount.actionRequired" = "Требуется действие.\nПодтвердите учетную запись на исходном устройстве.";
+"linkToAccount.allSet" = "Учетная запись успешно импортирована.";
+"linkToAccount.goToAccounts" = "Перейти к импортированной учетной записи";
+"linkToAccount.exportInstructions" = "На исходном устройстве инициируйте экспорт.";
+"linkToAccount.exportInstructionsPath" = "Выберите Учетная запись > Настройки учетной записи > Привязать новое устройство.";
+"linkToAccount.scanQrCode" = "Когда будете готовы, отсканируйте QR-код.";
+"linkToAccount.enterProvidedCode" = "По готовности введите код аутентификации.";
+"linkToAccount.accountLockedWithPassword" = "Учетная запись защищена паролем.\nЧтобы продолжить, введите пароль учетной записи.";
 "linkToAccount.exit" = "Выход";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.shareMessage" = "Ваш код:%@";
+"linkToAccount.alertTile" = "Вы хотите выйти?";
+"linkToAccount.alertMessage" = "Выход отменит операцию импорта учетной записи.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Импортируйте аккаунт Джами из локального архивного файла.";
@@ -426,22 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Привязать новое устройство";
 "linkDevice.networkError" = "При экспорте учетной записи возникла ошибка сети.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "Произошла ошибка аутентификации.\nПожалуйста, проверьте свой пароль.";
+"linkDevice.errorNetwork" = "Произошла ошибка сети.\nПроверьте подключение.";
+"linkDevice.errorTimeout" = "Время операции истекло.\nПопробуйте еще раз.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Произошла ошибка при экспорте аккаунта.\nПопробуйте снова.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Когда будете готовы, отсканируйте QR-код.";
+"linkDevice.infoCode" = "Когда будете готовы, введите код и нажмите \"Подключиться\".";
+"linkDevice.connecting" = "Подключение к новому устройству…";
+"linkDevice.authenticationInfo" = "Новое устройство найдено по указанному ниже IP-адресу. Это вы?\nЧтобы продолжить перенос аккаунта, нажмите \"Подтвердить\".";
+"linkDevice.newDeviceIP" = "IP-адрес нового устройства:%1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Новый идентификатор устройства не распознан.\nСледуйте инструкциям выше.";
+"linkDevice.exportInProgress" = "Выполняется операция экспорта учетной записи на новое устройство.\nПодтвердите импорт на новом устройстве.";
+"linkDevice.completed" = "Учетная запись успешно импортирована на новое устройство.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Начать голосовой вызов";
@@ -552,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@непрочитанных сообщений.";
 "accessibility.conversationRowBlocked" = "Беседа заблокирована";
 "accessibility.conversationRowSyncing" = "Выполняется синхронизация";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Последнее сообщение в %@";
 "accessibility.userPresenceOnline" = "В сети";
 "accessibility.userPresenceAvailable" = "Доступно";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Получено приглашений:  %@ожидающие приглашения";
 "accessibility.pendingRequestsRowSingular" = "Получено приглашение: %@ожидает приглашения";
 "accessibility.pendingRequestsRowHint" = "Коснитесь дважды, чтобы просмотреть и ответить на полученные приглашения";
 "accessibility.pendingRequestsListBlockUser" = "Блокировать отправителя приглашения";
@@ -565,14 +564,14 @@
 "accessibility.messageBubbleEdited" = "Отредактировано";
 "accessibility.messageBubbleRead" = "Прочитано";
 "accessibility.messageBubbleUnread" = "Непрочитано";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Получено пустое текстовое сообщение на %@ . Возможно, оно было отправлено неправильно.";
 "accessibility.fileTransferNoName" = "Файл получен на %@, имя недоступно";
 "accessibility.inReply" = "В ответ на сообщение";
-"accessibility.text.receivedOn" = "%1@, message received on %2@";
-"accessibility.text.sentOn" = "%1@, message sent on %2@";
-"accessibility.fileTransfer.receivedOn" = "File: %1@ , received on %2@";
-"accessibility.fileTransfer.sentOn" = "File: %1@, sent on %2@";
-"accessibility.call.lasted" = "Lasted %@";
+"accessibility.text.receivedOn" = "%1@, сообщение получено на %2@";
+"accessibility.text.sentOn" = "%1@ , сообщение отправлено на  %2@";
+"accessibility.fileTransfer.receivedOn" = "Файл: %1@, получено на %2@";
+"accessibility.fileTransfer.sentOn" = "Файл: %1@, отправлен на %2@";
+"accessibility.call.lasted" = "Длилось %@";
 "accessibility.calls.default.toggleAudio" = "Выключить микрофон";
 "accessibility.calls.default.toggleVideo" = "Включить камеру";
 "accessibility.calls.default.pauseCall" = "Приостановить вызов";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Повесить трубку";
 "accessibility.conference.lowerHand" = "Опущенная рука";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "QR-код токена";
diff --git a/Ring/Ring/Resources/si.lproj/Localizable.strings b/Ring/Ring/Resources/si.lproj/Localizable.strings
index 687ea830f3c37f8fea8e59c8d71516b84c166d7f..4c8865e41bacb2bc17d2cafe793d1deb2c8f492c 100644
--- a/Ring/Ring/Resources/si.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/si.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
index 9f3f5c2c682fa4427aed9227f1c38b2d79141e92..702bb27e42c1d382e90faa9327c00935774d3c66 100644
--- a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/sk.lproj/Localizable.strings b/Ring/Ring/Resources/sk.lproj/Localizable.strings
index ba232e14625b54c80e4bf10abf7aed71b9643d80..984d61835ffd75e9d7f5748f06636d7bbce8bf25 100644
--- a/Ring/Ring/Resources/sk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/sl.lproj/Localizable.strings b/Ring/Ring/Resources/sl.lproj/Localizable.strings
index 41562b196ba2d0f081d2eab028ac0003cbb70cb2..bbcbd80a9771b63ca9c6fe4dec4fde2b50aaf2af 100644
--- a/Ring/Ring/Resources/sl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sl.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
index 5fbfa16c3f1552e1954b27a3f9260cfefa631d73..72455e68002f306a98a492e77b99852571c4e77e 100644
--- a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
@@ -197,19 +197,19 @@
 // Link To Account form
 "linkToAccount.importAccount" = "Importoni llogari";
 "linkToAccount.showQrCode" = "Kod QR";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
+"linkToAccount.showPinCode" = "Kod mirëfilltësimi";
+"linkToAccount.actionRequired" = "Lypset veprim.\nJu lutemi, ripohoni llogarinë në pajisjen burim.";
+"linkToAccount.allSet" = "Llogaria u importua me sukses.";
+"linkToAccount.goToAccounts" = "Kalo te llogaria e importuar";
+"linkToAccount.exportInstructions" = "Te pajisja burim, filloni eksportimin.";
+"linkToAccount.exportInstructionsPath" = "Përzgjidhni Llogari > Rregullime Llogarie > Lidhni pajisje të re.";
+"linkToAccount.scanQrCode" = "Kur të jeni gati, skanoni kodin QR.";
+"linkToAccount.enterProvidedCode" = "Kur të jeni gati, jepni kodin e mirëfilltësimit.";
+"linkToAccount.accountLockedWithPassword" = "Llogaria është e mbrojtur me një fjalëkalim.\nQë të vazhdohet, jepni fjalëkalimin e llogarisë.";
 "linkToAccount.exit" = "Dalje";
-"linkToAccount.shareMessage" = "Your code is: %@";
-"linkToAccount.alertTile" = "Do you want to exit?";
-"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
+"linkToAccount.shareMessage" = "Kodi juaj është: %@";
+"linkToAccount.alertTile" = "Doni të dilet?";
+"linkToAccount.alertMessage" = "Dalja do të anulojë veprimin e importimit të llogarisë.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importo llogari Jami prej një kartele vendore arkiv";
@@ -426,21 +426,20 @@
 // Link New Device
 "linkDevice.title" = "Lidhni pajisje të re";
 "linkDevice.networkError" = "Ndodhi një gabim rrjeti teksa eksportohej llogaria.";
-"linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
-"linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
-"linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
+"linkDevice.errorWrongPassword" = "Ndodhi një gabim mirëfilltësimi.\nJu lutemi, verifikoni fjalëkalimin tuaj.";
+"linkDevice.errorNetwork" = "Ndodhi një gabim rrjeti.\nJu lutemi, verifikoni lidhjen tuaj.";
+"linkDevice.errorTimeout" = "Veprimit i mbaroi koha.\nJu lutemi, riprovoni.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorWrongData" = "Ndodhi një gabim teksa eksportohej llogaria.\nJu lutemi, riprovoni.";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "Kur të jeni gati, skanoni kodin QR.";
+"linkDevice.infoCode" = "Kur të jeni gati, jepni kodin dhe shtypni `Lidhu`.";
+"linkDevice.connecting" = "Po bëhet lidhja te pajisja juaj e re…";
+"linkDevice.authenticationInfo" = "Te adresa IP më poshtë u gjet pajisje e re. A jeni ju?\nQë të vazhdohet shpërngulja e llogarisë, klikoni mbi `Ripohojeni`.";
+"linkDevice.newDeviceIP" = "Adresë IP e pajisjes së re: %1@";
+"linkDevice.code" = "code";
+"linkDevice.wrongEntry" = "Identifikuesi i pajisjes së re është i papranuar.\nJu lutemi, ndiqni udhëzimin më sipër.";
+"linkDevice.exportInProgress" = "Veprimi i eksportimit të llogarisë te pajisja e re është në kryerje e sipër.\nJu lutemi, ripohoni importimin te pajisja e re.";
 "linkDevice.completed" = "Llogaria u importua me sukses te pajisja e re.";
 
 // Contact Page
@@ -555,7 +554,7 @@
 "accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Në linjë";
 "accessibility.userPresenceAvailable" = "I lirë";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "U morën ftesa: %@ ftesa pezull";
 "accessibility.pendingRequestsRowSingular" = "U mor ftesë: %@ ftesë pezull";
 "accessibility.pendingRequestsRowHint" = "Prekeni dy herë që të shqyrtoni dhe t’u përgjigjeni ftesave që morët";
 "accessibility.pendingRequestsListBlockUser" = "Blloko dërgues ftese";
@@ -603,4 +602,4 @@
 "accessibility.conference.hangup" = "Mbylle thirrjen";
 "accessibility.conference.lowerHand" = "Uleni dorën";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Kod QR token-i";
diff --git a/Ring/Ring/Resources/sr.lproj/Localizable.strings b/Ring/Ring/Resources/sr.lproj/Localizable.strings
index 57ed89a2ecd153a9ef469bbff9327bec856e24cb..ec2493a85843f9bc3723cc77ec57ec585407ceaf 100644
--- a/Ring/Ring/Resources/sr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings b/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
index c58d1aa7e422f162040db778407f0c21dc88e896..e0426279ded523858838f119e923fd9aea22adfd 100644
--- a/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/sv.lproj/Localizable.strings b/Ring/Ring/Resources/sv.lproj/Localizable.strings
index 448d30cf3cabb4eca9ec84275006eaae66d136cd..e5d8e70d9974a69a1fbfc3cc457e4a6c3a6c8f3b 100644
--- a/Ring/Ring/Resources/sv.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sv.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/sw.lproj/Localizable.strings b/Ring/Ring/Resources/sw.lproj/Localizable.strings
index 4f9a4b4529921b538781398a804aabe03234b32e..018be58bba8b5e39ed205666b6daa99c381a151c 100644
--- a/Ring/Ring/Resources/sw.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sw.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/ta.lproj/Localizable.strings b/Ring/Ring/Resources/ta.lproj/Localizable.strings
index 264408ef8189dfdec8077b4bac1f2665e7162938..f751b4b7e7b0bcbaae8fa0f0623c1f84e768d885 100644
--- a/Ring/Ring/Resources/ta.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ta.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/te.lproj/Localizable.strings b/Ring/Ring/Resources/te.lproj/Localizable.strings
index 7b09b95f9d01a4fbcf251b92053975daff103dfe..ba3c65c165db18d0d9b535f50fc567d92d91faf1 100644
--- a/Ring/Ring/Resources/te.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/te.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/th.lproj/Localizable.strings b/Ring/Ring/Resources/th.lproj/Localizable.strings
index d5594b2fc1ed5f085cef5dee4979d7593b7a549e..fec226cccacf2df21726bc9039889466037a10cd 100644
--- a/Ring/Ring/Resources/th.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/th.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/tr.lproj/Localizable.strings b/Ring/Ring/Resources/tr.lproj/Localizable.strings
index 2a51fc25b53889538d6e187ba926ecc70d4a04aa..2b8f0045b3f2f8fc0e5ee3375927bae2498a32cf 100644
--- a/Ring/Ring/Resources/tr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tr.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/tt.lproj/Localizable.strings b/Ring/Ring/Resources/tt.lproj/Localizable.strings
index 49620abc17a9755d61adfcddfdfd747691eb033b..731edb5f5280c7073cdd32479a3ec9fb956c7105 100644
--- a/Ring/Ring/Resources/tt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tt.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/uk.lproj/Localizable.strings b/Ring/Ring/Resources/uk.lproj/Localizable.strings
index d875b442134ed44d1b683870691c46405a92a67b..ffa6f4ea74584d964c526495aaa9a61fabda9584 100644
--- a/Ring/Ring/Resources/uk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/uk.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/vi.lproj/Localizable.strings b/Ring/Ring/Resources/vi.lproj/Localizable.strings
index 7f85d9fb999d29e9c75534319f4df794ef555b18..24bae241eb5b30740a36f9f1383e900c1332aa82 100644
--- a/Ring/Ring/Resources/vi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/vi.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
index ae2e592fe2025031befbc2b40903a8fee945d1fd..cfc05877f513cf1bc31e7c163545d2bc893f426c 100644
--- a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
index 818734d86cb9bec06ec58dcc50f452a2f5a74817..37c4e6ef35125f544aa16e8c532c1cc0b3b8e3e1 100644
--- a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
index dc25b013c39aedd3d649052ea2d25dc78f0f5273..7b49de97e179b8b222455c22619b148b8b0e4d0e 100644
--- a/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/zh.lproj/Localizable.strings b/Ring/Ring/Resources/zh.lproj/Localizable.strings
index 08c4d4013c9e9ea9c2b0a19eb24b31aa57660412..66780d2773639453923743bc3c1e903d0e7a7470 100644
--- a/Ring/Ring/Resources/zh.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";
diff --git a/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings b/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
index 53f55d0fa1256f415db3c5b9cfab202d54ed9595..1691b4eb26e2c414b6c1152cd23aa3933b7b6aa5 100644
--- a/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
@@ -429,16 +429,15 @@
 "linkDevice.errorWrongPassword" = "An authentication error occurred.\nPlease verify your password.";
 "linkDevice.errorNetwork" = "A network error occurred.\nPlease verify your connection.";
 "linkDevice.errorTimeout" = "The operation has timed out.\nPlease try again.";
-"linkDevice.errorToken" = "An error occurred while generating the token.\nPlease try again.";
+"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\n";
-"linkDevice.infoAddAccount" = "Select Add Account > Connect from another device.\n";
-"linkDevice.infoQRCode" = "When ready, scan the QR code";
+"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
 "linkDevice.connecting" = "Connecting to your new device…";
 "linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
 "linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.token" = "token";
+"linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
 "linkDevice.completed" = "Account imported successfully on the new device.";