From 13431bd412f5b5214f8d857d7c639054b92df969 Mon Sep 17 00:00:00 2001
From: Jenkins <jenkins@ring-packaging.cx>
Date: Mon, 10 Mar 2025 15:53:49 -0400
Subject: [PATCH] l10n: automatic bump

Change-Id: Ic4a00fef371c46fb7c887a1bb46395960de18dfe
---
 .../Resources/ace.lproj/Localizable.strings   | 107 +++++++-----
 .../Resources/ar.lproj/Localizable.strings    | 113 +++++++-----
 .../Resources/ar_EG.lproj/Localizable.strings | 113 +++++++-----
 .../ast_ES.lproj/Localizable.strings          | 113 +++++++-----
 .../Resources/az.lproj/Localizable.strings    | 113 +++++++-----
 .../Resources/az_IR.lproj/Localizable.strings | 113 +++++++-----
 .../Resources/be.lproj/Localizable.strings    | 107 +++++++-----
 .../Resources/be_BY.lproj/Localizable.strings | 107 +++++++-----
 .../Resources/bg.lproj/Localizable.strings    | 113 +++++++-----
 .../Resources/bg_BG.lproj/Localizable.strings | 113 +++++++-----
 .../Resources/bn.lproj/Localizable.strings    | 113 +++++++-----
 .../Resources/ca.lproj/Localizable.strings    | 113 +++++++-----
 .../Resources/cmn.lproj/Localizable.strings   | 123 +++++++------
 .../Resources/cs-CZ.lproj/Localizable.strings | 113 +++++++-----
 .../Resources/da.lproj/Localizable.strings    | 113 +++++++-----
 .../Resources/de-DE.lproj/Localizable.strings | 163 ++++++++++--------
 .../Resources/de.lproj/Localizable.strings    | 163 ++++++++++--------
 .../Resources/el.lproj/Localizable.strings    | 113 +++++++-----
 .../Resources/eo.lproj/Localizable.strings    | 113 +++++++-----
 .../Resources/es.lproj/Localizable.strings    | 163 ++++++++++--------
 .../es_419.lproj/Localizable.strings          | 163 ++++++++++--------
 .../Resources/es_AR.lproj/Localizable.strings | 163 ++++++++++--------
 .../Resources/es_CO.lproj/Localizable.strings | 163 ++++++++++--------
 .../Resources/es_MX.lproj/Localizable.strings | 161 +++++++++--------
 .../Resources/et.lproj/Localizable.strings    | 161 +++++++++--------
 .../Resources/eu.lproj/Localizable.strings    | 111 +++++++-----
 .../Resources/fa-IR.lproj/Localizable.strings | 111 +++++++-----
 .../Resources/fa.lproj/Localizable.strings    | 111 +++++++-----
 .../Resources/fi.lproj/Localizable.strings    | 121 +++++++------
 .../Resources/fr-BE.lproj/Localizable.strings | 159 +++++++++--------
 .../Resources/fr-CA.lproj/Localizable.strings | 159 +++++++++--------
 .../Resources/fr-CH.lproj/Localizable.strings | 159 +++++++++--------
 .../Resources/fr-FR.lproj/Localizable.strings | 157 ++++++++++-------
 .../Resources/fr.lproj/Localizable.strings    | 159 +++++++++--------
 .../Resources/ga.lproj/Localizable.strings    | 103 ++++++-----
 .../Resources/gl.lproj/Localizable.strings    | 109 +++++++-----
 .../Resources/gu.lproj/Localizable.strings    | 109 +++++++-----
 .../Resources/hak.lproj/Localizable.strings   | 117 ++++++++-----
 .../Resources/he.lproj/Localizable.strings    | 109 +++++++-----
 .../Resources/hi-IN.lproj/Localizable.strings | 109 +++++++-----
 .../Resources/hi.lproj/Localizable.strings    | 109 +++++++-----
 .../Resources/hr.lproj/Localizable.strings    | 109 +++++++-----
 .../Resources/hr_HR.lproj/Localizable.strings | 109 +++++++-----
 .../Resources/hu.lproj/Localizable.strings    | 159 +++++++++--------
 .../Resources/hy.lproj/Localizable.strings    | 109 +++++++-----
 .../Resources/id.lproj/Localizable.strings    | 109 +++++++-----
 .../Resources/ig.lproj/Localizable.strings    | 101 ++++++-----
 .../Resources/it-IT.lproj/Localizable.strings | 153 +++++++++-------
 .../Resources/it.lproj/Localizable.strings    | 153 +++++++++-------
 .../Resources/ja.lproj/Localizable.strings    | 105 ++++++-----
 .../Resources/kk.lproj/Localizable.strings    | 105 ++++++-----
 .../Resources/kn.lproj/Localizable.strings    | 105 ++++++-----
 .../Resources/ko-KR.lproj/Localizable.strings | 105 ++++++-----
 .../Resources/ko.lproj/Localizable.strings    | 105 ++++++-----
 .../Resources/lt.lproj/Localizable.strings    | 105 ++++++-----
 .../Resources/ml.lproj/Localizable.strings    | 105 ++++++-----
 .../Resources/mn_MN.lproj/Localizable.strings | 105 ++++++-----
 .../Resources/mr.lproj/Localizable.strings    | 105 ++++++-----
 .../Resources/ms.lproj/Localizable.strings    | 105 ++++++-----
 .../Resources/nan.lproj/Localizable.strings   | 113 +++++++-----
 .../Resources/nb.lproj/Localizable.strings    | 103 ++++++-----
 .../Resources/ne.lproj/Localizable.strings    | 103 ++++++-----
 .../Resources/nl.lproj/Localizable.strings    | 103 ++++++-----
 .../Resources/nn.lproj/Localizable.strings    |  99 +++++++----
 .../Resources/oc.lproj/Localizable.strings    | 101 ++++++-----
 .../Resources/or.lproj/Localizable.strings    |  75 +++++---
 .../Resources/pa.lproj/Localizable.strings    |  83 +++++----
 .../Resources/pl.lproj/Localizable.strings    | 101 ++++++-----
 .../Resources/pl_PL.lproj/Localizable.strings | 101 ++++++-----
 .../Resources/pt-BR.lproj/Localizable.strings | 103 ++++++-----
 .../Resources/pt.lproj/Localizable.strings    | 103 ++++++-----
 .../Resources/pt_PT.lproj/Localizable.strings | 103 ++++++-----
 .../Resources/ro.lproj/Localizable.strings    | 145 +++++++++-------
 .../Resources/ro_RO.lproj/Localizable.strings | 143 ++++++++-------
 .../Resources/ru-RU.lproj/Localizable.strings | 145 +++++++++-------
 .../Resources/ru.lproj/Localizable.strings    | 143 ++++++++-------
 .../Resources/si.lproj/Localizable.strings    |  75 +++++---
 .../Resources/sk-SK.lproj/Localizable.strings |  99 +++++++----
 .../Resources/sk.lproj/Localizable.strings    |  99 +++++++----
 .../Resources/sl.lproj/Localizable.strings    | 101 ++++++-----
 .../Resources/sq-AL.lproj/Localizable.strings | 145 +++++++++-------
 .../Resources/sr.lproj/Localizable.strings    |  97 +++++++----
 .../sr@Cyrl.lproj/Localizable.strings         |  97 +++++++----
 .../Resources/sv.lproj/Localizable.strings    |  95 ++++++----
 .../Resources/sw.lproj/Localizable.strings    |  95 ++++++----
 .../Resources/ta.lproj/Localizable.strings    |  95 ++++++----
 .../Resources/te.lproj/Localizable.strings    |  95 ++++++----
 .../Resources/th.lproj/Localizable.strings    |  95 ++++++----
 .../Resources/tr.lproj/Localizable.strings    |  95 ++++++----
 .../Resources/tt.lproj/Localizable.strings    |  89 ++++++----
 .../Resources/uk.lproj/Localizable.strings    |  95 ++++++----
 .../Resources/vi.lproj/Localizable.strings    |  87 ++++++----
 .../zh-Hans-CN.lproj/Localizable.strings      |  99 +++++++----
 .../zh-Hans.lproj/Localizable.strings         |  99 +++++++----
 .../zh-Hant.lproj/Localizable.strings         | 101 ++++++-----
 .../Resources/zh.lproj/Localizable.strings    | 101 ++++++-----
 .../Resources/zh_HK.lproj/Localizable.strings |  99 +++++++----
 97 files changed, 6714 insertions(+), 4483 deletions(-)

diff --git a/Ring/Ring/Resources/ace.lproj/Localizable.strings b/Ring/Ring/Resources/ace.lproj/Localizable.strings
index 4e13361d7..220b6be99 100644
--- a/Ring/Ring/Resources/ace.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ace.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "ڤرليمن ڤرساتوان";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "كود QR يڠ براوسيا";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "ساي تله مڠهادڤكن";
 "welcome.linkDevice" = "ڤڠاجرن دري ڤڠاجرن لاين";
 "welcome.linkBackup" = "ڤڠمبيلن دري ڤڠمبيلن ارشيڤ";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "منوليس ايكون Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "ڤڠاجرن حساب";
-"linkToAccount.linkButtonTitle" = "لينك";
-"linkToAccount.linkDeviceTitle" = "ڤڠڬيلن ڤڠڬيلن";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "سكين كود QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "مڠمبيل كاونت Jami دري مڠيكوت مريك.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "دڠن ڤڠاجرن ڤڠاجرن";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "ڤمباچ";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ڤرودوک ڤرودوک";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "اونلاين";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "ڤڠاجرن";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
+"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.calls.default.pauseCall" = "ڤڠاجين ڤڠاجين";
 "accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"accessibility.calls.default.addParticipant" = "مڠمبيل ڤڠوربان";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "ڤڠاجرن يڠ برلالو";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "كرانڽ";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "ڤڠاجين ڤڠاجين";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.addParticipant" = "مڠمبيل ڤڠوربان";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "ڤڠاجرن يڠ برلالو";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
+"accessibility.calls.alter.raiseHand" = "يڠ دالم لالو";
+"accessibility.conference.minimize" = "مڠهادڤي";
+"accessibility.conference.maximize" = "ممبنتو ڤڠاجرن";
+"accessibility.conference.setModerator" = "مودراتور دتڠڬوڠ";
+"accessibility.conference.unsetModerator" = "مودراتور دڤرچايا?? ي";
+"accessibility.conference.muteAudio" = "صوتي ساكن";
+"accessibility.conference.unmuteAudio" = "صوت غير محكم";
 "accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.lowerHand" = "يڠ دالم لالو";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ar.lproj/Localizable.strings b/Ring/Ring/Resources/ar.lproj/Localizable.strings
index 670f08656..8afcdb79c 100644
--- a/Ring/Ring/Resources/ar.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ar.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "الوقت";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "تأكيد كلمة المرور";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "رمز QR غير صالح";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "لدي حساب بالفعل";
 "welcome.linkDevice" = "الاستيراد من جهاز آخر";
 "welcome.linkBackup" = "الاستيراد من النسخة الاحتياطية";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "إعداد حساب جامي";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "ربط الحساب";
-"linkToAccount.linkButtonTitle" = "ربط";
-"linkToAccount.linkDeviceTitle" = "اربط جهاز";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "قم بتسجيل رمز QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "استيراد حساب جامي من ملف أرشيف محلي.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "اربط جهاز جديد";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "جاري التحقق";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "بدأ مكالمة صوتية";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "نشط";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "تحرير";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "وقفة المكالمة";
+"accessibility.calls.default.hangUpCall" = "إنهاء";
+"accessibility.calls.default.addParticipant" = "أضف مشارك";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "محادثة مفتوحة";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "رفع اليد";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "استئناف المكالمة";
+"accessibility.calls.alter.hangUpCall" = "إنهاء";
+"accessibility.calls.alter.addParticipant" = "أضف مشارك";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "محادثة مفتوحة";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "اليد السفلى";
+"accessibility.conference.minimize" = "خفض";
+"accessibility.conference.maximize" = "تكبير";
+"accessibility.conference.setModerator" = "حدد المدير";
+"accessibility.conference.unsetModerator" = "إزالة المدير";
+"accessibility.conference.muteAudio" = "كتم الصوت";
+"accessibility.conference.unmuteAudio" = "صوت غير محكم";
+"accessibility.conference.hangup" = "إنهاء";
+"accessibility.conference.lowerHand" = "اليد السفلى";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings b/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
index a1b31f13a..9ac93b064 100644
--- a/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "الوقت";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "تأكيد كلمة المرور";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "رمز QR غير صالح";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "لدي حساب بالفعل";
 "welcome.linkDevice" = "الاستيراد من جهاز آخر";
 "welcome.linkBackup" = "الاستيراد من النسخة الاحتياطية";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "إعداد حساب جامي";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "ربط الحساب";
-"linkToAccount.linkButtonTitle" = "ربط";
-"linkToAccount.linkDeviceTitle" = "اربط جهاز";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "قم بتسجيل رمز QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "استيراد حساب جامي من ملف أرشيف محلي.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "اربط جهاز جديد";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "جاري التحقق";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "بدأ مكالمة صوتية";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "نشط";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "تحرير";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "وقفة المكالمة";
+"accessibility.calls.default.hangUpCall" = "إنهاء";
+"accessibility.calls.default.addParticipant" = "أضف مشارك";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "محادثة مفتوحة";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "رفع اليد";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "استئناف المكالمة";
+"accessibility.calls.alter.hangUpCall" = "إنهاء";
+"accessibility.calls.alter.addParticipant" = "أضف مشارك";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "محادثة مفتوحة";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "اليد السفلى";
+"accessibility.conference.minimize" = "خفض";
+"accessibility.conference.maximize" = "تكبير";
+"accessibility.conference.setModerator" = "حدد المدير";
+"accessibility.conference.unsetModerator" = "إزالة المدير";
+"accessibility.conference.muteAudio" = "كتم الصوت";
+"accessibility.conference.unmuteAudio" = "صوت غير محكم";
+"accessibility.conference.hangup" = "إنهاء";
+"accessibility.conference.lowerHand" = "اليد السفلى";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings b/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
index d7941de3a..ab1788ad3 100644
--- a/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Confirmar contraseña";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Un codiciu QR malo";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Nun hai nada que ver con esto.";
 "welcome.linkDevice" = "Importación dende otru dispositivu";
 "welcome.linkBackup" = "Importación dende archivos de copia de seguridad";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Crear cuenta Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "La vinculación de cuentas";
-"linkToAccount.linkButtonTitle" = "Enllaz";
-"linkToAccount.linkDeviceTitle" = "Dispositivu de enllaz";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Escanu del codiciu QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importa la cuenta Jami del archivu local.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Enlaza'l nuevu dispositivu";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verificación";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Iniciativa pa la defensa del asturianu";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En línea";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Ediciones";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "Pausa llamada";
+"accessibility.calls.default.hangUpCall" = "Enfermedaes.";
+"accessibility.calls.default.addParticipant" = "Aúna de les partes";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "La conversación abierta";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Ellí ye la mano.";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reanudar la llamada";
+"accessibility.calls.alter.hangUpCall" = "Enfermedaes.";
+"accessibility.calls.alter.addParticipant" = "Aúna de les partes";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "La conversación abierta";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "La mano inferior";
+"accessibility.conference.minimize" = "La so capacidá de control ye de 5 a 10 años.";
+"accessibility.conference.maximize" = "La mayor parte de los casos";
+"accessibility.conference.setModerator" = "Establecimientu inscritu nel Rexistru d'Actividaes Turístiques del Principáu d'Asturies col códigu DGT CA0831.";
+"accessibility.conference.unsetModerator" = "Moderador desactiváu";
+"accessibility.conference.muteAudio" = "El soníu mudo";
+"accessibility.conference.unmuteAudio" = "El soníu nun silenciáu";
+"accessibility.conference.hangup" = "Enfermedaes.";
+"accessibility.conference.lowerHand" = "La mano inferior";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/az.lproj/Localizable.strings b/Ring/Ring/Resources/az.lproj/Localizable.strings
index aff691ef0..82b6d5a81 100644
--- a/Ring/Ring/Resources/az.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/az.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "رمز لری تصدیق ائدیر";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "سيخين QR کد";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "منیم حسابوم وار";
 "welcome.linkDevice" = "باشقا آلاتدان واردات";
 "welcome.linkBackup" = "آرشیو آرخایینلاشماسیندان واردات";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami حسابي يارادين";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "حساب باغلاماسی";
-"linkToAccount.linkButtonTitle" = "لینک";
-"linkToAccount.linkDeviceTitle" = "آلاچیقلاشما";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR کد سکن";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "جامی حسابینی یئرلی آرکائیو فایل لاریندان واردات ائدیرم.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "یئنی آلینانی باغلا";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "چکمه";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "صداي زنگي باشلا";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "اونلاين";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "ترمیم";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "توقف تماس";
+"accessibility.calls.default.hangUpCall" = "باغلا";
+"accessibility.calls.default.addParticipant" = "شرکتچی قوش";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "آچيق مکالمه";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "ال قالديريب";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "تماسونو تکرار ائتمک";
+"accessibility.calls.alter.hangUpCall" = "باغلا";
+"accessibility.calls.alter.addParticipant" = "شرکتچی قوش";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "آچيق مکالمه";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "آلتی ال";
+"accessibility.conference.minimize" = "آزالماق";
+"accessibility.conference.maximize" = "حددن آرتيق";
+"accessibility.conference.setModerator" = "مودراتور قوی";
+"accessibility.conference.unsetModerator" = "مودئراتورون دَییشدیرمه سی";
+"accessibility.conference.muteAudio" = "سئلک آدیو";
+"accessibility.conference.unmuteAudio" = "سس لری بیز";
+"accessibility.conference.hangup" = "باغلا";
+"accessibility.conference.lowerHand" = "آلتی ال";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/az_IR.lproj/Localizable.strings b/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
index 651950a8f..a0d3eb186 100644
--- a/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "رمز لری تصدیق ائدیر";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "سيخين QR کد";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "منیم حسابوم وار";
 "welcome.linkDevice" = "باشقا آلاتدان واردات";
 "welcome.linkBackup" = "آرشیو آرخایینلاشماسیندان واردات";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami حسابي يارادين";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "حساب باغلاماسی";
-"linkToAccount.linkButtonTitle" = "لینک";
-"linkToAccount.linkDeviceTitle" = "آلاچیقلاشما";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR کد سکن";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "جامی حسابینی یئرلی آرکائیو فایل لاریندان واردات ائدیرم.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "یئنی آلینانی باغلا";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "چکمه";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "صداي زنگي باشلا";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "اونلاين";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "ترمیم";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "توقف تماس";
+"accessibility.calls.default.hangUpCall" = "باغلا";
+"accessibility.calls.default.addParticipant" = "شرکتچی قوش";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "آچيق مکالمه";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "ال قالديريب";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "تماسونو تکرار ائتمک";
+"accessibility.calls.alter.hangUpCall" = "باغلا";
+"accessibility.calls.alter.addParticipant" = "شرکتچی قوش";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "آچيق مکالمه";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "آلتی ال";
+"accessibility.conference.minimize" = "آزالماق";
+"accessibility.conference.maximize" = "حددن آرتيق";
+"accessibility.conference.setModerator" = "مودراتور قوی";
+"accessibility.conference.unsetModerator" = "مودئراتورون دَییشدیرمه سی";
+"accessibility.conference.muteAudio" = "سئلک آدیو";
+"accessibility.conference.unmuteAudio" = "سس لری بیز";
+"accessibility.conference.hangup" = "باغلا";
+"accessibility.conference.lowerHand" = "آلتی ال";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/be.lproj/Localizable.strings b/Ring/Ring/Resources/be.lproj/Localizable.strings
index 3dce4216e..3a51d8c4c 100644
--- a/Ring/Ring/Resources/be.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/be.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Пацвердзіць пароль";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Дрэнны QR-код";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "У мяне ўжо ёсць рахунак";
 "welcome.linkDevice" = "Імпарт з іншага прылады";
 "welcome.linkBackup" = "Імпарт з архіва рэзервовага капіявання";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Стварэнне ўліковага запісу Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Звязванне рахункаў";
-"linkToAccount.linkButtonTitle" = "Звязка";
-"linkToAccount.linkDeviceTitle" = "Прылада злучэння";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Сканаваць QR-код";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Імпартуем рахунак Jami з мясцовага архіва файла.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Звязаць новае прылада";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Праверка";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Пачатак аўдыё-запаведзі";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Інтэрнэт";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Рэдагаваны";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
+"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.calls.default.pauseCall" = "Паза званок";
 "accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"accessibility.calls.default.addParticipant" = "Дадаць удзельніка";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Адкрытая размова";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Падыміце руку";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Падключыць званок";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.addParticipant" = "Дадаць удзельніка";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Адкрытая размова";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
+"accessibility.calls.alter.raiseHand" = "Ніжняя рука";
+"accessibility.conference.minimize" = "Мінімізаваць";
+"accessibility.conference.maximize" = "Максімальнае";
+"accessibility.conference.setModerator" = "Падставіце мадэратар";
+"accessibility.conference.unsetModerator" = "Адключыць модулятар";
+"accessibility.conference.muteAudio" = "Непаслухмяны аўдыё";
+"accessibility.conference.unmuteAudio" = "Неўключаны аўдыё";
 "accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.lowerHand" = "Ніжняя рука";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/be_BY.lproj/Localizable.strings b/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
index 3dce4216e..3a51d8c4c 100644
--- a/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Пацвердзіць пароль";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Дрэнны QR-код";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "У мяне ўжо ёсць рахунак";
 "welcome.linkDevice" = "Імпарт з іншага прылады";
 "welcome.linkBackup" = "Імпарт з архіва рэзервовага капіявання";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Стварэнне ўліковага запісу Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Звязванне рахункаў";
-"linkToAccount.linkButtonTitle" = "Звязка";
-"linkToAccount.linkDeviceTitle" = "Прылада злучэння";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Сканаваць QR-код";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Імпартуем рахунак Jami з мясцовага архіва файла.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Звязаць новае прылада";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Праверка";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Пачатак аўдыё-запаведзі";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Інтэрнэт";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Рэдагаваны";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
+"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.calls.default.pauseCall" = "Паза званок";
 "accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"accessibility.calls.default.addParticipant" = "Дадаць удзельніка";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Адкрытая размова";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Падыміце руку";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Падключыць званок";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.addParticipant" = "Дадаць удзельніка";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Адкрытая размова";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
+"accessibility.calls.alter.raiseHand" = "Ніжняя рука";
+"accessibility.conference.minimize" = "Мінімізаваць";
+"accessibility.conference.maximize" = "Максімальнае";
+"accessibility.conference.setModerator" = "Падставіце мадэратар";
+"accessibility.conference.unsetModerator" = "Адключыць модулятар";
+"accessibility.conference.muteAudio" = "Непаслухмяны аўдыё";
+"accessibility.conference.unmuteAudio" = "Неўключаны аўдыё";
 "accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.lowerHand" = "Ніжняя рука";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/bg.lproj/Localizable.strings b/Ring/Ring/Resources/bg.lproj/Localizable.strings
index 3275f6adc..85171692c 100644
--- a/Ring/Ring/Resources/bg.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bg.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Време";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Потвърдете паролата";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Грешен QR-код";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Вече имам сметка.";
 "welcome.linkDevice" = "Внос от друго устройство";
 "welcome.linkBackup" = "Импорт от архивния резерв";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Създаване на акаунт Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Свързване на профил";
-"linkToAccount.linkButtonTitle" = "Свързване";
-"linkToAccount.linkDeviceTitle" = "Свързване на устройство";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Сканиране на QR код";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Импортирайте акаунта на Джами от локалния архив.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Свържете ново устройство";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Проверка";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Започване на гласов разговор";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "На линия";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Издадено";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "Позвони на пауза";
+"accessibility.calls.default.hangUpCall" = "Затваряне";
+"accessibility.calls.default.addParticipant" = "Добавяне на участник";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Отворен разговор";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Вдигнете ръка";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Презачаване на обаждането";
+"accessibility.calls.alter.hangUpCall" = "Затваряне";
+"accessibility.calls.alter.addParticipant" = "Добавяне на участник";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Отворен разговор";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "Ниска ръка";
+"accessibility.conference.minimize" = "Минимизиране";
+"accessibility.conference.maximize" = "Максимизирайте";
+"accessibility.conference.setModerator" = "Настройка на модератор";
+"accessibility.conference.unsetModerator" = "Изключен модератор";
+"accessibility.conference.muteAudio" = "Заглушаване";
+"accessibility.conference.unmuteAudio" = "Неизключен аудио";
+"accessibility.conference.hangup" = "Затваряне";
+"accessibility.conference.lowerHand" = "Ниска ръка";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings b/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
index 3275f6adc..85171692c 100644
--- a/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Време";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Потвърдете паролата";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Грешен QR-код";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Вече имам сметка.";
 "welcome.linkDevice" = "Внос от друго устройство";
 "welcome.linkBackup" = "Импорт от архивния резерв";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Създаване на акаунт Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Свързване на профил";
-"linkToAccount.linkButtonTitle" = "Свързване";
-"linkToAccount.linkDeviceTitle" = "Свързване на устройство";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Сканиране на QR код";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Импортирайте акаунта на Джами от локалния архив.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Свържете ново устройство";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Проверка";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Започване на гласов разговор";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "На линия";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Издадено";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "Позвони на пауза";
+"accessibility.calls.default.hangUpCall" = "Затваряне";
+"accessibility.calls.default.addParticipant" = "Добавяне на участник";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Отворен разговор";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Вдигнете ръка";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Презачаване на обаждането";
+"accessibility.calls.alter.hangUpCall" = "Затваряне";
+"accessibility.calls.alter.addParticipant" = "Добавяне на участник";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Отворен разговор";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "Ниска ръка";
+"accessibility.conference.minimize" = "Минимизиране";
+"accessibility.conference.maximize" = "Максимизирайте";
+"accessibility.conference.setModerator" = "Настройка на модератор";
+"accessibility.conference.unsetModerator" = "Изключен модератор";
+"accessibility.conference.muteAudio" = "Заглушаване";
+"accessibility.conference.unmuteAudio" = "Неизключен аудио";
+"accessibility.conference.hangup" = "Затваряне";
+"accessibility.conference.lowerHand" = "Ниска ръка";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/bn.lproj/Localizable.strings b/Ring/Ring/Resources/bn.lproj/Localizable.strings
index 3f47e2cc6..36cefab41 100644
--- a/Ring/Ring/Resources/bn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bn.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "পাসওয়ার্ড নিশ্চিত করুন";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "খারাপ QR কোড";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "আমার একটা একাউন্ট আছে";
 "welcome.linkDevice" = "অন্য ডিভাইস থেকে আমদানি";
 "welcome.linkBackup" = "সংরক্ষণাগার ব্যাকআপ থেকে আমদানি";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "জামি অ্যাকাউন্ট তৈরি করুন";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "অ্যাকাউন্ট লিঙ্কিং";
-"linkToAccount.linkButtonTitle" = "লিঙ্ক";
-"linkToAccount.linkDeviceTitle" = "লিঙ্ক ডিভাইস";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR কোড স্ক্যান করুন";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "স্থানীয় আর্কাইভ ফাইল থেকে জামি অ্যাকাউন্ট আমদানি করুন।";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "নতুন ডিভাইস লিঙ্ক";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "যাচাইকরণ";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "অডিও কল শুরু করুন";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "অনলাইন";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "সম্পাদনা";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "বিরতি কল";
+"accessibility.calls.default.hangUpCall" = "বন্ধ করো";
+"accessibility.calls.default.addParticipant" = "অংশগ্রহণকারী যোগ করুন";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "খোলা কথোপকথন";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "হাত বাড়াও";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "পুনরায় কল";
+"accessibility.calls.alter.hangUpCall" = "বন্ধ করো";
+"accessibility.calls.alter.addParticipant" = "অংশগ্রহণকারী যোগ করুন";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "খোলা কথোপকথন";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "নীচের হাত";
+"accessibility.conference.minimize" = "কমিয়ে আনুন";
+"accessibility.conference.maximize" = "সর্বাধিক";
+"accessibility.conference.setModerator" = "সেট মডারেটর";
+"accessibility.conference.unsetModerator" = "অপসারণকারী";
+"accessibility.conference.muteAudio" = "নিঃশব্দ অডিও";
+"accessibility.conference.unmuteAudio" = "অডিও মুছে ফেলা";
+"accessibility.conference.hangup" = "বন্ধ করো";
+"accessibility.conference.lowerHand" = "নীচের হাত";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ca.lproj/Localizable.strings b/Ring/Ring/Resources/ca.lproj/Localizable.strings
index b49e504a1..15392dbb4 100644
--- a/Ring/Ring/Resources/ca.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ca.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Temps";
 "global.editPassword" = "Edita la contrasenya";
 "global.confirmPassword" = "Confirmi contrasenya";
+"global.confirm" = "Confirm";
 "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";
 
 // Scan
 "scan.badQrCode" = "Mal codi QR";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Jo ja tinc un compte";
 "welcome.linkDevice" = "Importació des d'un altre dispositiu";
 "welcome.linkBackup" = "Importa des d'una còpia de seguretat d'arxiu";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Creació de compte Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Enllaç de comptes";
-"linkToAccount.linkButtonTitle" = "Enllaç";
-"linkToAccount.linkDeviceTitle" = "Enllaça Dispositiu";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Escanir codi QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar el compte Jami des de l'arxiu local.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Coneix el nou dispositiu";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verificació";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Comença una trucada de veu.";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En línia";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Edicions";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "Pausa de trucada";
+"accessibility.calls.default.hangUpCall" = "Penja";
+"accessibility.calls.default.addParticipant" = "Afegir participant";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Obre conversa";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Aixeca la mà";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reanudar la trucada";
+"accessibility.calls.alter.hangUpCall" = "Penja";
+"accessibility.calls.alter.addParticipant" = "Afegir participant";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Obre conversa";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "Man baixa";
+"accessibility.conference.minimize" = "Minimitza";
+"accessibility.conference.maximize" = "Maximitza";
+"accessibility.conference.setModerator" = "Configuració de moderador";
+"accessibility.conference.unsetModerator" = "Moderador desactivat";
+"accessibility.conference.muteAudio" = "Silencia l'àudio";
+"accessibility.conference.unmuteAudio" = "Audió inmutat";
+"accessibility.conference.hangup" = "Penja";
+"accessibility.conference.lowerHand" = "Man baixa";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/cmn.lproj/Localizable.strings b/Ring/Ring/Resources/cmn.lproj/Localizable.strings
index 3ba95cd09..ec52111a5 100644
--- a/Ring/Ring/Resources/cmn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cmn.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "æ—¶é—´";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "确认密码";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "无效的二维码";
@@ -120,7 +123,7 @@
 "smartlist.inviteFriends" = "Invite friends";
 "smartlist.accounts" = "账户";
 "smartlist.disableDonation" = "现在不要";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "如果您喜欢使用 Jami 并相信我们的使命,您愿意捐款吗?";
 "smartlist.inSynchronization" = "conversation in synchronization";
 "smartlist.newMessage" = "新消息";
 
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "我已经有一个账户";
 "welcome.linkDevice" = "從其他裝置匯入";
 "welcome.linkBackup" = "从归档备份中导入";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "建立 Jami 帳號";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -173,7 +176,7 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "加入 Jami";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
+"createAccount.lookingForUsernameAvailability" = "检查用户名是否可用...";
 "createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
 "createAccount.usernameAlreadyTaken" = "已取得的使用者名稱";
 "createAccount.usernameValid" = "用户名可用。";
@@ -181,7 +184,7 @@
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
 "createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以便他人在 Jami 上找到并联系您。";
 "createAccount.newAccount" = "新增帳號";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "关联账户";
-"linkToAccount.linkButtonTitle" = "关联";
-"linkToAccount.linkDeviceTitle" = "关联设备";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "使用此设备上的现有Jami帐户需要PIN码。";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "输入PIN码";
-"linkToAccount.scanQRCode" = "扫描 QR 码";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "设备吊销出错";
 "accountPage.linkDeviceTitle" = "关联另一台设备";
 "accountPage.other" = "å…¶ä»–";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "如果该帐户未备份或添加到其他设备,则该帐户和注册用户名将不可找回地丢失。";
 "accountPage.inviteFriends" = "Invite friends";
 "accountPage.contactMeOnJamiTitle" = "在 Jami 上联系我!";
 "accountPage.contactMeOnJamiContant" = "Contact me using “%s” on the Jami distributed communication platform: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "关联新设备";
-"linkDevice.passwordError" = "使用该密码无法解锁您的账户。";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "正在驗證";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -531,53 +552,55 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "線上";
 "accessibility.userPresenceAvailable" = "可获得的";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "拒绝邀请";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accept invitation";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "已编辑";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "暫停通話";
+"accessibility.calls.default.hangUpCall" = "挂断";
+"accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "举手";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "麦克风静音";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "恢复通话";
+"accessibility.calls.alter.hangUpCall" = "挂断";
+"accessibility.calls.alter.addParticipant" = "添加参与者";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "打开会话";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "放下手";
+"accessibility.conference.minimize" = "最小化";
+"accessibility.conference.maximize" = "最大化";
+"accessibility.conference.setModerator" = "設定主持人";
+"accessibility.conference.unsetModerator" = "取消設定主持人";
+"accessibility.conference.muteAudio" = "静音";
+"accessibility.conference.unmuteAudio" = "取消静音";
+"accessibility.conference.hangup" = "挂断";
+"accessibility.conference.lowerHand" = "放下手";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
index 0ef4d93a5..f6e078b81 100644
--- a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "ÄŒas";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Potvrdit heslo";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Špatný kód QR";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Už účet mám";
 "welcome.linkDevice" = "Import z jiného zařízení";
 "welcome.linkBackup" = "Importovat ze záložního archivu";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Vytvoři Jami účet";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Připojení účtu";
-"linkToAccount.linkButtonTitle" = "Odkaz";
-"linkToAccount.linkDeviceTitle" = "Připojit zařízení";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Naskenovat QR kód";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Import účtu Jami z místního archivního souboru.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Připojit nové zařízení";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Ověřuje se";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Začít audio hovor";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Připojen";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Upraveno";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "Pozastavení volání";
+"accessibility.calls.default.hangUpCall" = "Zavěsit";
+"accessibility.calls.default.addParticipant" = "Přidat účastníka";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Otevřít konverzaci";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Zvednout ruku";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Pokračovat v hovoru";
+"accessibility.calls.alter.hangUpCall" = "Zavěsit";
+"accessibility.calls.alter.addParticipant" = "Přidat účastníka";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Otevřít konverzaci";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "Dát ruku dolů";
+"accessibility.conference.minimize" = "Zmenšit";
+"accessibility.conference.maximize" = "Maximalizovat";
+"accessibility.conference.setModerator" = "Nastavit moderátora";
+"accessibility.conference.unsetModerator" = "Nenastavený moderátor";
+"accessibility.conference.muteAudio" = "Ztlumit zvuk";
+"accessibility.conference.unmuteAudio" = "Zrušení ztlumení zvuku";
+"accessibility.conference.hangup" = "Zavěsit";
+"accessibility.conference.lowerHand" = "Dát ruku dolů";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/da.lproj/Localizable.strings b/Ring/Ring/Resources/da.lproj/Localizable.strings
index a49347896..0cb1676f8 100644
--- a/Ring/Ring/Resources/da.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/da.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Tid";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Bekræft adgangskode";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Ugyldigt QR-kode";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Jeg har allerede en konto.";
 "welcome.linkDevice" = "Import fra et andet udstyr";
 "welcome.linkBackup" = "Import fra backup";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Oprette Jami-konto";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Konto-tilknytning";
-"linkToAccount.linkButtonTitle" = "Tilknyt";
-"linkToAccount.linkDeviceTitle" = "Tilknyt enhed";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Scan QR-koder";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Import Jami-konto fra lokale arkiv.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Tilknyt ny enhed";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verificerer";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Start et audio opkald";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Forbundet";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Udfærdiget";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "Pause-opkald";
+"accessibility.calls.default.hangUpCall" = "Læg på";
+"accessibility.calls.default.addParticipant" = "Tilføj deltager";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Ã…bn samtale";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Løft hånden.";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Opkaldet genoptages";
+"accessibility.calls.alter.hangUpCall" = "Læg på";
+"accessibility.calls.alter.addParticipant" = "Tilføj deltager";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Ã…bn samtale";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "Nedre hånd";
+"accessibility.conference.minimize" = "Minimer";
+"accessibility.conference.maximize" = "Maksimer";
+"accessibility.conference.setModerator" = "Indstilling af moderator";
+"accessibility.conference.unsetModerator" = "Moderator";
+"accessibility.conference.muteAudio" = "Sluk Lyd";
+"accessibility.conference.unmuteAudio" = "Udybnet lyd";
+"accessibility.conference.hangup" = "Læg på";
+"accessibility.conference.lowerHand" = "Nedre hånd";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
index cf987da24..413e5611c 100644
--- a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Passwort bearbeiten";
 "global.confirmPassword" = "Konto bestätigen";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Der Kamerazugriff ist deaktiviert. Aktivieren Sie diesen in den Geräteeinstellungen, um diese Funktion zu nutzen.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Bad QR code";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Öffentlich einsehbares Verzeichnis";
 "smartlist.jamsResults" = "Suchergebnis";
 "smartlist.conversations" = "Conversations";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Es wurden keine Unterhaltungen gefunden, die der Suche entsprechen.";
 "smartlist.newContact" = "Neuer Kontakt";
 "smartlist.newGroup" = "Neue Gruppe";
 "smartlist.accounts" = "Accounts";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Namen eingeben…";
 "smartlist.searchBar" = "Search";
 "smartlist.noNetworkConnectivity" = "No network connectivity";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Stellen Sie sicher, dass in den Einstellungen der Mobilfunkzugriff erlaubt ist.";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Konto hinzufügen";
 "smartlist.noNumber" = "Selected contact does not have any number";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Invite friends";
 "smartlist.accounts" = "Accounts";
 "smartlist.disableDonation" = "Not now";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Wenn Sie gerne Jami nutzen und an unsere Mission glauben, möchten Sie eine Spende leisten?";
 "smartlist.inSynchronization" = "conversation in synchronization";
 "smartlist.newMessage" = "Neue Nachricht";
 
 // Conversation
 "conversation.addToContactsButton" = "Add to Contacts";
 "conversation.addToContactsLabel" = "Add to contacts?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ ist nicht in der Kontaktliste";
 "conversation.messagePlaceholder" = "Write to";
 "conversation.errorSavingImage" = "Beim Speichern des Bildes in der Galerie ist ein Fehler aufgetreten.";
 "conversation.receivedRequest" = "%@hat Ihnen eine Unterhaltungseinladung geschickt.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "I already have an account";
 "welcome.linkDevice" = "Import from another device";
 "welcome.linkBackup" = "Importieren aus Archivsicherung";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Erstellen Sie ein Jami-Konto";
 "welcome.connectToJAMS" = "Verbindung zum Jami Account Management Server (JAMS) herstellen";
 
 // Creation Profile Screen
@@ -173,15 +176,15 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Join Jami";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.lookingForUsernameAvailability" = "Verfügbarkeit des Benutzernamens wird geprüft…";
+"createAccount.invalidUsername" = "Ungültiger Benutzername. Bitte geben Sie den korrekten Benutzernamen ein.";
 "createAccount.usernameAlreadyTaken" = "Benutzername bereits vergeben";
 "createAccount.usernameValid" = "Der Benutzername ist verfügbar.";
 "createAccount.UsernameNotRegisteredTitle" = "Network error";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
 "createAccount.timeoutMessage" = "Die Registrierung des Benutzernamens ist im Gange. Bitte warten…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Vorhandenes SIP-Konto konfigurieren";
 "createAccount.creatingAccount" = "Konto erstellen";
 "createAccount.nameExplanation" = "Sie können einen Benutzernamen wählen, damit andere Sie auf Jami leichter finden und erreichen können.";
 "createAccount.newAccount" = "Neues Konto";
@@ -192,15 +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.waitLinkToAccountTitle" = "Account linking";
-"linkToAccount.linkButtonTitle" = "Link";
-"linkToAccount.linkDeviceTitle" = "Gerät verknüpfen";
-"linkToAccount.linkDeviceMessage" = "Wählen Sie „Neues Gerät verknüpfen“ in einer anderen Jami-App, um den QR-Code anzuzeigen oder einen PIN-Code zu generieren.";
-"linkToAccount.explanationMessage" = "Zur Nutzung eines bestehenden Jami-Kontos auf diesem Gerät ist ein PIN-Code erforderlich.";
-"linkToAccount.pinPlaceholder" = "PIN-Code";
-"linkToAccount.pinLabel" = "PIN-Code eingeben";
-"linkToAccount.scanQRCode" = "QR-Code scannen";
-"linkToAccount.explanationPinMessage" = "Um den PIN-Code zu generieren, gehen Sie zu den Kontoverwaltungseinstellungen auf dem Gerät, das das Konto enthält, mit dem Sie eine Verknüpfung herstellen möchten. Wählen Sie „Neues Gerät verknüpfen“. Sie erhalten den zum Ausfüllen dieses Formulars erforderlichen PIN-Code. Der PIN-Code läuft in 10 Minuten ab.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Ein Jami-Konto aus lokalen Archivdatei importieren.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Device revocation error";
 "accountPage.linkDeviceTitle" = "Link another device";
 "accountPage.other" = "Other";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Wenn das Konto nicht gesichert oder einem anderen Gerät hinzugefügt wurde, gehen das Konto und der registrierte Benutzername UNWIDERRUFLICH VERLOREN.";
 "accountPage.inviteFriends" = "Invite friends";
 "accountPage.contactMeOnJamiTitle" = "Contact me on Jami!";
 "accountPage.contactMeOnJamiContant" = "Kontaktieren Sie mich über „%s“ auf der Jami-Plattform für verteilte Kommunikation: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Ein neues Gerät verknüpfen";
-"linkDevice.passwordError" = "Falsches Passwort. Bitte versuchen Sie es erneut mit dem richtigen Passwort.";
 "linkDevice.networkError" = "Beim Exportieren des Kontos ist ein Netzwerkfehler aufgetreten.";
-"linkDevice.defaultError" = "Beim Exportieren des Kontos ist ein Fehler aufgetreten.";
-"linkDevice.explanationMessage" = "Öffnen Sie Jami auf dem neuen Gerät und wählen Sie „Dieses Gerät mit einem Konto verknüpfen“, um den Vorgang abzuschließen. Der PIN-Code läuft in 10 Minuten ab.";
-"linkDevice.hudMessage" = "Verifying";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Einen Audioanruf beginnen";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Schließen";
 "accessibility.smartListSwitchAccounts" = "Konto wechseln";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Das derzeitige Konto ist %@";
 "accessibility.smartListAddAccount" = "Konto hinzufügen";
 "accessibility.aboutJamiTitle" = "Über Jami";
 "accessibility.welcomeToJamiTitle" = "Willkommen bei Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Geben Sie den Benutzernamen ein, um die Verfügbarkeit zu prüfen.";
 "accessibility.profilePicturePicker" = "Profilbild";
 "accessibility.profilePicturePickerHint" = "Doppeltippen Sie, um ein Bild aufzunehmen, oder wählen Sie ein Bild aus der Bibliothek aus";
 "accessibility.swarmPicturePicker" = "Gruppenbild";
 "accessibility.swarmPicturePickerHint" = "Doppeltippen Sie, um ein Bild aufzunehmen, oder wählen Sie ein Bild aus der Bibliothek aus";
 "accessibility.accountSummaryQrCode" = "QR-Code";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Doppeltippen, um den QR-Code des Kontos anzuzeigen";
+"accessibility.accountSummaryEditProfileHint" = "Doppeltippen, um das Profil zu bearbeiten";
 "accessibility.accountSummaryEditSettingsButton" = "Einstellungen";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Audioanruf mit %@ starten";
+"accessibility.conversationStartVideoCall" = "Videoanruf mit %@ starten";
 "accessibility.conversationComposeMessage" = "Eine Nachricht verfassen";
 "accessibility.conversationShareMedia" = "Medien teilen";
 "accessibility.conversationCameraHint" = "Doppeltippen, um die Kamera zu öffnen";
 "accessibility.audioPlayerPlay" = "Wiedergeben";
 "accessibility.audioPlayerPause" = "Pause";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ ungelesene Nachrichten.";
 "accessibility.conversationRowBlocked" = "Unterhaltung blockiert";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Letzte Nachricht am %@";
+"accessibility.conversationRowSyncing" = "Synchronisierung im Gange";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Verfügbar";
-"accessibility.pendingRequestsRow" = "Einladung erhalten: %@ Einladung ausstehend";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Einladung ablehnen";
 "accessibility.pendingRequestsListAcceptInvitation" = "Einladung annehmen";
 "accessibility.messageBubbleDeleted" = "Nachricht gelöscht";
 "accessibility.messageBubbleEdited" = "Bearbeitet";
 "accessibility.messageBubbleRead" = "Gelesen";
 "accessibility.messageBubbleUnread" = "Ungelesen";
-"accessibility.textNotAvailable" = "Textnachricht erhalten am %@, Inhalt nicht verfügbar";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Datei empfangen am %@, Name nicht verfügbar";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, Nachricht erhalten am %@";
-"accessibility.text.sentOn" = "%@, Nachricht gesendet am %@";
-"accessibility.fileTransfer.receivedOn" = "Datei: %@ , erhalten am %@";
-"accessibility.fileTransfer.sentOn" = "Datei: %@, gesendet am %@";
-"accessibility.call.lasted" = "Dauerte";
-"accessibility.fileTransferNoName" = "Datei empfangen am %@, Name nicht verfügbar";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"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.calls.default.pauseCall" = "Gespräch Halten";
+"accessibility.calls.default.hangUpCall" = "Auflegen";
+"accessibility.calls.default.addParticipant" = "Teilnehmer hinzufügen";
+"accessibility.calls.default.switchCamera" = "Kamera wechseln";
+"accessibility.calls.default.toggleSpeaker" = "Lautsprecher einschalten";
+"accessibility.calls.default.openConversation" = "Konversation öffnen";
+"accessibility.calls.default.showDialpad" = "Wähltastatur anzeigen";
+"accessibility.calls.default.raiseHand" = "Ihre Hand heben";
+
+"accessibility.calls.alter.toggleAudio" = "Mikrofon-Stummschaltung aufheben";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Gespräch wieder aufnehmen";
+"accessibility.calls.alter.hangUpCall" = "Auflegen";
+"accessibility.calls.alter.addParticipant" = "Teilnehmer hinzufügen";
+"accessibility.calls.alter.switchCamera" = "Kamera wechseln";
+"accessibility.calls.alter.toggleSpeaker" = "Lautsprecher ausschalten";
+"accessibility.calls.alter.openConversation" = "Konversation öffnen";
+"accessibility.calls.alter.showDialpad" = "Wähltastatur anzeigen";
+"accessibility.calls.alter.raiseHand" = "Hand senken";
+"accessibility.conference.minimize" = "Minimieren";
+"accessibility.conference.maximize" = "Maximale Größe";
+"accessibility.conference.setModerator" = "Moderator festlegen";
+"accessibility.conference.unsetModerator" = "Moderator freistellen";
+"accessibility.conference.muteAudio" = "Stummschalten";
+"accessibility.conference.unmuteAudio" = "Stummschaltung aufheben";
+"accessibility.conference.hangup" = "Auflegen";
+"accessibility.conference.lowerHand" = "Hand senken";
+
+"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 9f2b05667..afb4ee1b2 100644
--- a/Ring/Ring/Resources/de.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Zeit";
 "global.editPassword" = "Passwort bearbeiten";
 "global.confirmPassword" = "Passwort bestätigen";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Der Kamerazugriff ist deaktiviert. Aktivieren Sie diesen in den Geräteeinstellungen, um diese Funktion zu nutzen.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "QR-Code ungültig";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Öffentliches Verzeichnis";
 "smartlist.jamsResults" = "Suchergebnis";
 "smartlist.conversations" = "Unterhaltungen";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Es wurden keine Unterhaltungen gefunden, die der Suche entsprechen.";
 "smartlist.newContact" = "Neuer Kontakt";
 "smartlist.newGroup" = "Neue Gruppe";
 "smartlist.accounts" = "Konten";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Namen eingeben…";
 "smartlist.searchBar" = "Suchen";
 "smartlist.noNetworkConnectivity" = "Keine Netzwerkverbindung";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Stellen Sie sicher, dass in den Einstellungen der Mobilfunkzugriff erlaubt ist.";
 "smartlist.accountsTitle" = "Konten";
 "smartlist.addAccountButton" = "+ Konto hinzufügen";
 "smartlist.noNumber" = "Der ausgewählte Kontakt hat keine Nummer";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Freunde einladen";
 "smartlist.accounts" = "Konten";
 "smartlist.disableDonation" = "Nicht jetzt";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Wenn Sie gerne Jami nutzen und an unsere Mission glauben, möchten Sie eine Spende leisten?";
 "smartlist.inSynchronization" = "Synchronisierung der Unterhaltung";
 "smartlist.newMessage" = "Neue Nachricht";
 
 // Conversation
 "conversation.addToContactsButton" = "Zu Kontakten hinzufügen";
 "conversation.addToContactsLabel" = "Zu Kontakten hinzufügen?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ ist nicht in der Kontaktliste";
 "conversation.messagePlaceholder" = "Schreiben an";
 "conversation.errorSavingImage" = "Beim Speichern des Bildes in der Galerie ist ein Fehler aufgetreten.";
 "conversation.receivedRequest" = "%@hat Ihnen eine Unterhaltungseinladung geschickt.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Ich habe bereits einen Account";
 "welcome.linkDevice" = "Von einem anderen Gerät importieren";
 "welcome.linkBackup" = "Backuparchiv importieren";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Erstellen Sie ein Jami-Konto";
 "welcome.connectToJAMS" = "Verbindung zum Jami Account Management Server (JAMS) herstellen";
 
 // Creation Profile Screen
@@ -173,15 +176,15 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Mitmachen bei Jami";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.lookingForUsernameAvailability" = "Verfügbarkeit des Benutzernamens wird geprüft…";
+"createAccount.invalidUsername" = "Ungültiger Benutzername. Bitte geben Sie den korrekten Benutzernamen ein.";
 "createAccount.usernameAlreadyTaken" = "Dieser Benutzername ist bereits vergeben";
 "createAccount.usernameValid" = "Der Benutzername ist verfügbar.";
 "createAccount.UsernameNotRegisteredTitle" = "Netzwerkfehler";
 "createAccount.UsernameNotRegisteredMessage" = "Konto wurde erstellt, aber der Benutzername wurde nicht registriert";
 "createAccount.timeoutTitle" = "Konto erstellt";
 "createAccount.timeoutMessage" = "Die Registrierung des Benutzernamens ist im Gange. Bitte warten…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Vorhandenes SIP-Konto konfigurieren";
 "createAccount.creatingAccount" = "Konto erstellen";
 "createAccount.nameExplanation" = "Sie können einen Benutzernamen wählen, damit andere Sie auf Jami leichter finden und erreichen können.";
 "createAccount.newAccount" = "Neues Konto";
@@ -192,15 +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.waitLinkToAccountTitle" = "Kontenverknüpfung";
-"linkToAccount.linkButtonTitle" = "Link";
-"linkToAccount.linkDeviceTitle" = "Verbinde Gerät";
-"linkToAccount.linkDeviceMessage" = "Wählen Sie „Neues Gerät verknüpfen“ in einer anderen Jami-App, um den QR-Code anzuzeigen oder einen PIN-Code zu generieren.";
-"linkToAccount.explanationMessage" = "Zur Nutzung eines bestehenden Jami-Kontos auf diesem Gerät ist ein PIN-Code erforderlich.";
-"linkToAccount.pinPlaceholder" = "PIN-Code";
-"linkToAccount.pinLabel" = "PIN-Code eingeben";
-"linkToAccount.scanQRCode" = "QR-Code scannen";
-"linkToAccount.explanationPinMessage" = "Um den PIN-Code zu generieren, gehen Sie zu den Kontoverwaltungseinstellungen auf dem Gerät, das das Konto enthält, mit dem Sie eine Verknüpfung herstellen möchten. Wählen Sie „Neues Gerät verknüpfen“. Sie erhalten den zum Ausfüllen dieses Formulars erforderlichen PIN-Code. Der PIN-Code läuft in 10 Minuten ab.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Ein Jami-Konto aus lokalen Archivdatei importieren.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Fehler beim Trennen des Gerätes";
 "accountPage.linkDeviceTitle" = "Weiteres Gerät verknüpfen";
 "accountPage.other" = "Anderes";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Wenn das Konto nicht gesichert oder einem anderen Gerät hinzugefügt wurde, gehen das Konto und der registrierte Benutzername UNWIDERRUFLICH VERLOREN.";
 "accountPage.inviteFriends" = "Freunde einladen";
 "accountPage.contactMeOnJamiTitle" = "Kontaktieren Sie mich über Jami!";
 "accountPage.contactMeOnJamiContant" = "Kontaktieren Sie mich über „%s“ auf der Jami-Plattform für verteilte Kommunikation: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Verbinde neues Gerät";
-"linkDevice.passwordError" = "Falsches Passwort. Bitte versuchen Sie es erneut mit dem richtigen Passwort.";
 "linkDevice.networkError" = "Beim Exportieren des Kontos ist ein Netzwerkfehler aufgetreten.";
-"linkDevice.defaultError" = "Beim Exportieren des Kontos ist ein Fehler aufgetreten.";
-"linkDevice.explanationMessage" = "Öffnen Sie Jami auf dem neuen Gerät und wählen Sie „Dieses Gerät mit einem Konto verknüpfen“, um den Vorgang abzuschließen. Der PIN-Code läuft in 10 Minuten ab.";
-"linkDevice.hudMessage" = "Verifiziere";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Audioanruf starten";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Schließen";
 "accessibility.smartListSwitchAccounts" = "Konto wechseln";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Das derzeitige Konto ist %@";
 "accessibility.smartListAddAccount" = "Konto hinzufügen";
 "accessibility.aboutJamiTitle" = "Über Jami";
 "accessibility.welcomeToJamiTitle" = "Willkommen bei Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Geben Sie den Benutzernamen ein, um die Verfügbarkeit zu prüfen.";
 "accessibility.profilePicturePicker" = "Profilbild";
 "accessibility.profilePicturePickerHint" = "Doppeltippen Sie, um ein Bild aufzunehmen, oder wählen Sie ein Bild aus der Bibliothek aus";
 "accessibility.swarmPicturePicker" = "Gruppenbild";
 "accessibility.swarmPicturePickerHint" = "Doppeltippen Sie, um ein Bild aufzunehmen, oder wählen Sie ein Bild aus der Bibliothek aus";
 "accessibility.accountSummaryQrCode" = "QR-Code";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Doppeltippen, um den QR-Code des Kontos anzuzeigen";
+"accessibility.accountSummaryEditProfileHint" = "Doppeltippen, um das Profil zu bearbeiten";
 "accessibility.accountSummaryEditSettingsButton" = "Einstellungen";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Audioanruf mit %@ starten";
+"accessibility.conversationStartVideoCall" = "Videoanruf mit %@ starten";
 "accessibility.conversationComposeMessage" = "Eine Nachricht verfassen";
 "accessibility.conversationShareMedia" = "Medien teilen";
 "accessibility.conversationCameraHint" = "Doppeltippen, um die Kamera zu öffnen";
 "accessibility.audioPlayerPlay" = "Abspielen";
 "accessibility.audioPlayerPause" = "Pause";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ ungelesene Nachrichten.";
 "accessibility.conversationRowBlocked" = "Unterhaltung blockiert";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Letzte Nachricht am %@";
+"accessibility.conversationRowSyncing" = "Synchronisierung im Gange";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Verfügbar";
-"accessibility.pendingRequestsRow" = "Einladung erhalten: %@ Einladung ausstehend";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Doppeltippen um erhaltene Einladungen zu überprüfen und darauf zu antworten";
 "accessibility.pendingRequestsListBlockUser" = "Absender der Einladung blockieren";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Einladung ablehnen";
 "accessibility.pendingRequestsListAcceptInvitation" = "Einladung annehmen";
 "accessibility.messageBubbleDeleted" = "Nachricht gelöscht";
 "accessibility.messageBubbleEdited" = "Bearbeitet";
 "accessibility.messageBubbleRead" = "Gelesen";
 "accessibility.messageBubbleUnread" = "Ungelesen";
-"accessibility.textNotAvailable" = "Textnachricht erhalten am %@, Inhalt nicht verfügbar";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Datei empfangen am %@, Name nicht verfügbar";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, Nachricht erhalten am %@";
-"accessibility.text.sentOn" = "%@, Nachricht gesendet am %@";
-"accessibility.fileTransfer.receivedOn" = "Datei: %@ , erhalten am %@";
-"accessibility.fileTransfer.sentOn" = "Datei: %@, gesendet am %@";
-"accessibility.call.lasted" = "Dauerte";
-"accessibility.fileTransferNoName" = "Datei empfangen am %@, Name nicht verfügbar";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"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.calls.default.pauseCall" = "Anruf pausieren";
+"accessibility.calls.default.hangUpCall" = "Auflegen";
+"accessibility.calls.default.addParticipant" = "Gesprächspartner hinzufügen";
+"accessibility.calls.default.switchCamera" = "Kamera wechseln";
+"accessibility.calls.default.toggleSpeaker" = "Lautsprecher einschalten";
+"accessibility.calls.default.openConversation" = "Unterhaltung öffnen";
+"accessibility.calls.default.showDialpad" = "Wähltastatur anzeigen";
+"accessibility.calls.default.raiseHand" = "Hand heben";
+
+"accessibility.calls.alter.toggleAudio" = "Mikrofon-Stummschaltung aufheben";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Anruf fortsetzen";
+"accessibility.calls.alter.hangUpCall" = "Auflegen";
+"accessibility.calls.alter.addParticipant" = "Gesprächspartner hinzufügen";
+"accessibility.calls.alter.switchCamera" = "Kamera wechseln";
+"accessibility.calls.alter.toggleSpeaker" = "Lautsprecher ausschalten";
+"accessibility.calls.alter.openConversation" = "Unterhaltung öffnen";
+"accessibility.calls.alter.showDialpad" = "Wähltastatur anzeigen";
+"accessibility.calls.alter.raiseHand" = "Hand senken";
+"accessibility.conference.minimize" = "Minimieren";
+"accessibility.conference.maximize" = "Maximieren";
+"accessibility.conference.setModerator" = "Moderator festlegen";
+"accessibility.conference.unsetModerator" = "Moderator entfernen";
+"accessibility.conference.muteAudio" = "Audio stummschalten";
+"accessibility.conference.unmuteAudio" = "Stummschaltung aufheben";
+"accessibility.conference.hangup" = "Auflegen";
+"accessibility.conference.lowerHand" = "Hand senken";
+
+"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 ce5f5ad0c..041d1889b 100644
--- a/Ring/Ring/Resources/el.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/el.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Ώρα";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Επιβεβαίωση κωδικού";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Κακό QR κωδικό";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Έχω ήδη λογαριασμό.";
 "welcome.linkDevice" = "Εισαγωγή από άλλη συσκευή";
 "welcome.linkBackup" = "Εισαγωγή απο αρχειοθετημένο αντίγραφο ασφαλείας";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Δημιουργήστε λογαριασμό Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Σύνδεση λογαριασμού";
-"linkToAccount.linkButtonTitle" = "Σύνδεσμος";
-"linkToAccount.linkDeviceTitle" = "Σύνδεση συσκευής";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Σκάρετε τον κωδικό QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Εισαγωγή λογαριασμού Jami από το τοπικό αρχείο αρχείου.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Σύνδεση νέας συσκευής";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Επαλήθευση";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Ξεκινάτε την οχητική κλήση";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Συνδεδεμένος";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Επορθωμένο";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "Παύση κλήσης";
+"accessibility.calls.default.hangUpCall" = "Κλείσιμο";
+"accessibility.calls.default.addParticipant" = "Προσθήκη συμμετέχοντος";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Επικοινωνία ανοιχτή";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Σηκώστε το χέρι σας";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Επαναφέρετε την κλήση";
+"accessibility.calls.alter.hangUpCall" = "Κλείσιμο";
+"accessibility.calls.alter.addParticipant" = "Προσθήκη συμμετέχοντος";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Επικοινωνία ανοιχτή";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "Κάτω χέρι";
+"accessibility.conference.minimize" = "Ελαχιστοποίηση";
+"accessibility.conference.maximize" = "Μεγιστοποίηση";
+"accessibility.conference.setModerator" = "Ρυθμίστε τον διαχειριστή";
+"accessibility.conference.unsetModerator" = "Ανακατάσταση διαχειριστή";
+"accessibility.conference.muteAudio" = "Σίγαση ήχου";
+"accessibility.conference.unmuteAudio" = "Ανεκλειστικό ήχο";
+"accessibility.conference.hangup" = "Κλείσιμο";
+"accessibility.conference.lowerHand" = "Κάτω χέρι";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/eo.lproj/Localizable.strings b/Ring/Ring/Resources/eo.lproj/Localizable.strings
index 93b034787..576d1c046 100644
--- a/Ring/Ring/Resources/eo.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eo.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Horo";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Konfirmu pasvorton";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Malbona QR-kodo";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Mi jam havas konton.";
 "welcome.linkDevice" = "Importado de alia aparato";
 "welcome.linkBackup" = "Importado de arkiva kopiado";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Kreu konto Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Ligas konton";
-"linkToAccount.linkButtonTitle" = "Rilato";
-"linkToAccount.linkDeviceTitle" = "Ligi aparaton";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skanu QR-kodojn";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importu la konton de Jami el loka arkivo.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Ligi novan aparaton";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Certigas";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Komenci la aÅ­dian alvokon";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Interreto";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Redaktita";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
+"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.calls.default.pauseCall" = "PaÅ­zo alvoko";
+"accessibility.calls.default.hangUpCall" = "Fini vokon";
+"accessibility.calls.default.addParticipant" = "Aldoni partoprenanton";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Malferma konversacio";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Levu la manon";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reviziu la telefonvokon";
+"accessibility.calls.alter.hangUpCall" = "Fini vokon";
+"accessibility.calls.alter.addParticipant" = "Aldoni partoprenanton";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Malferma konversacio";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "Malsupra mano";
+"accessibility.conference.minimize" = "Plejetigi";
+"accessibility.conference.maximize" = "Maksimumi";
+"accessibility.conference.setModerator" = "Seti moderilon";
+"accessibility.conference.unsetModerator" = "Malkonstruo moderilo";
+"accessibility.conference.muteAudio" = "Silentigi aÅ­dion";
+"accessibility.conference.unmuteAudio" = "Neŝaltita aŭdio";
+"accessibility.conference.hangup" = "Fini vokon";
+"accessibility.conference.lowerHand" = "Malsupra mano";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/es.lproj/Localizable.strings b/Ring/Ring/Resources/es.lproj/Localizable.strings
index 39909a22d..a4946af0e 100644
--- a/Ring/Ring/Resources/es.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Hora";
 "global.editPassword" = "Editar contraseña";
 "global.confirmPassword" = "Confirmar contraseña";
+"global.confirm" = "Confirm";
 "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";
 
 // Scan
 "scan.badQrCode" = "Código QR incorrecto";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Directorio público";
 "smartlist.jamsResults" = "Resultado de la búsqueda";
 "smartlist.conversations" = "Conversaciones";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Ninguna conversación coincide con la búsqueda.";
 "smartlist.newContact" = "Nuevo contacto";
 "smartlist.newGroup" = "Nuevo grupo";
 "smartlist.accounts" = "Cuentas";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Introducir nombre";
 "smartlist.searchBar" = "Buscar";
 "smartlist.noNetworkConnectivity" = "Sin conexión a la red";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Asegurarse de otorgar acceso celular en la configuración.";
 "smartlist.accountsTitle" = "Cuentas";
 "smartlist.addAccountButton" = "+ Agregar cuenta";
 "smartlist.noNumber" = "El contacto seleccionado no tiene ningún número";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Invitar amigos";
 "smartlist.accounts" = "Cuentas";
 "smartlist.disableDonation" = "Ahora no";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Si disfrutas usando Jami y crees en nuestra misión, ¿quieres hacer una donación?";
 "smartlist.inSynchronization" = "Sincronización de conversación";
 "smartlist.newMessage" = "Nuevo mensaje";
 
 // Conversation
 "conversation.addToContactsButton" = "Añadir a contactos";
 "conversation.addToContactsLabel" = "¿Añadir a contactos?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ no está en la lista de contactos";
 "conversation.messagePlaceholder" = "Escribir a";
 "conversation.errorSavingImage" = "Se produjo un error al guardar la imagen en la galería.";
 "conversation.receivedRequest" = "%@ te envió una invitación de conversación.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Ya tengo una cuenta";
 "welcome.linkDevice" = "Importar desde otro dispositivo";
 "welcome.linkBackup" = "Importar desde un archivo de respaldo";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Crear una cuenta en Jami";
 "welcome.connectToJAMS" = "Conectar a un Servidor de Gestión de Cuentas Jami (JAMS)";
 
 // Creation Profile Screen
@@ -173,15 +176,15 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unirse a Jami";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.lookingForUsernameAvailability" = "Comprobación de la disponibilidad del nombre de usuario…";
+"createAccount.invalidUsername" = "Nombre de usuario no válido. Por favor, introducir el nombre de usuario correcto.";
 "createAccount.usernameAlreadyTaken" = "El nombre de usuario ya está en uso";
 "createAccount.usernameValid" = "El nombre de usuario está disponible.";
 "createAccount.UsernameNotRegisteredTitle" = "Error en la red";
 "createAccount.UsernameNotRegisteredMessage" = "Registrado";
 "createAccount.timeoutTitle" = "Cuenta creada";
 "createAccount.timeoutMessage" = "Registro de nombre de usuario en proceso... Por favor espere...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurar una cuenta SIP existente";
 "createAccount.creatingAccount" = "Creando cuenta...";
 "createAccount.nameExplanation" = "Podés elegir un nombre de usuario que ayudará a que otras personas te encuentren más fácilmente en Jami.";
 "createAccount.newAccount" = "Cuenta nueva";
@@ -192,15 +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.waitLinkToAccountTitle" = "Asociación de la cuenta";
-"linkToAccount.linkButtonTitle" = "Conexión";
-"linkToAccount.linkDeviceTitle" = "Vincular dispositivo";
-"linkToAccount.linkDeviceMessage" = "Elige \"Vincular nuevo dispositivo\" desde otra aplicación Jami para mostrar el código QR o generar un código PIN.";
-"linkToAccount.explanationMessage" = "Se requiere un código PIN para usar una cuenta Jami existente en este dispositivo.";
-"linkToAccount.pinPlaceholder" = "Código PIN";
-"linkToAccount.pinLabel" = "Introducir el código PIN";
-"linkToAccount.scanQRCode" = "Escanear el código QR";
-"linkToAccount.explanationPinMessage" = "Para generar el código PIN, ir a la configuración de administración de cuentas en el dispositivo que contiene la cuenta a la que desea vincular. Seleccionar \"Vincular nuevo dispositivo\". Recibirá el código PIN necesario para completar este formulario. El código PIN caducará en 10 minutos.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar la cuenta Jami desde el archivo de almacenamiento local.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Error al anular el dispositivo";
 "accountPage.linkDeviceTitle" = "Vincular otro dispositivo";
 "accountPage.other" = "Otro";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Si no se ha realizado una copia de seguridad de la cuenta o no se ha agregado a otro dispositivo, la cuenta y el nombre de usuario registrado se PERDERÁN IRREVOCABLEMENTE.";
 "accountPage.inviteFriends" = "Invitar amigos";
 "accountPage.contactMeOnJamiTitle" = "¡Contáctame en Jami!";
 "accountPage.contactMeOnJamiContant" = "Contácteme usando “%s” en la plataforma de comunicación distribuida Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Vincular un dispositivo nuevo";
-"linkDevice.passwordError" = "Contraseña incorrecta. Por favor, inténtelo de nuevo con la contraseña correcta.";
 "linkDevice.networkError" = "Se produjo un error de red al exportar la cuenta.";
-"linkDevice.defaultError" = "Se produjo un error al exportar la cuenta.";
-"linkDevice.explanationMessage" = "Abra Jami en el nuevo dispositivo y elija \"Vincular este dispositivo a una cuenta\" para completar el proceso. El código PIN caducará en 10 minutos.";
-"linkDevice.hudMessage" = "Verificando";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Empezar llamada de audio";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Cerrar";
 "accessibility.smartListSwitchAccounts" = "Cambiar de cuenta";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "La cuenta corriente es %@";
 "accessibility.smartListAddAccount" = "Agregar cuenta";
 "accessibility.aboutJamiTitle" = "Acerca de Jami";
 "accessibility.welcomeToJamiTitle" = "Bienvenido a Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Ingrese su nombre de usuario para verificar la disponibilidad.";
 "accessibility.profilePicturePicker" = "Imagen de perfil";
 "accessibility.profilePicturePickerHint" = "Toca dos veces para tomar una foto o seleccionar una imagen de la biblioteca.";
 "accessibility.swarmPicturePicker" = "Foto de grupo";
 "accessibility.swarmPicturePickerHint" = "Toca dos veces para tomar una foto o seleccionar una imagen de la biblioteca.";
 "accessibility.accountSummaryQrCode" = "Código QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Doble clic para ver el código QR de la cuenta";
+"accessibility.accountSummaryEditProfileHint" = "Doble clic para editar el perfil.";
 "accessibility.accountSummaryEditSettingsButton" = "Configuración";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Iniciar una llamada de audio con %@";
+"accessibility.conversationStartVideoCall" = "Comenzar una vídeo llamada con%@";
 "accessibility.conversationComposeMessage" = "Redactar un mensaje";
 "accessibility.conversationShareMedia" = "Compartir medios";
 "accessibility.conversationCameraHint" = "Doble clic para abrir la cámara";
 "accessibility.audioPlayerPlay" = "Reproducir";
 "accessibility.audioPlayerPause" = "Pausar";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ mensajes no leídos.";
 "accessibility.conversationRowBlocked" = "Conversación bloqueada";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Último mensaje en %@";
+"accessibility.conversationRowSyncing" = "Sincronización en curso";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En línea";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRow" = "Invitación recibida: %@ invitación pendiente";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Rechazar invitación";
 "accessibility.pendingRequestsListAcceptInvitation" = "Aceptar invitación";
 "accessibility.messageBubbleDeleted" = "Mensaje eliminado";
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Leer";
 "accessibility.messageBubbleUnread" = "Sin leer";
-"accessibility.textNotAvailable" = "Mensaje de texto recibido en %@, contenido no disponible";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, mensaje recibido el %@";
-"accessibility.text.sentOn" = "%@, mensaje enviado el %@";
-"accessibility.fileTransfer.receivedOn" = "Archivo: %@ , recibido el %@";
-"accessibility.fileTransfer.sentOn" = "Archivo: %@, enviado el %@";
-"accessibility.call.lasted" = "Duración";
-"accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"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.calls.default.pauseCall" = "Pausar llamada";
+"accessibility.calls.default.hangUpCall" = "Colgar";
+"accessibility.calls.default.addParticipant" = "Agregar participante";
+"accessibility.calls.default.switchCamera" = "Cambiar cámara";
+"accessibility.calls.default.toggleSpeaker" = "Encender el altavoz";
+"accessibility.calls.default.openConversation" = "Conversación abierta";
+"accessibility.calls.default.showDialpad" = "Mostrar teclado de marcación";
+"accessibility.calls.default.raiseHand" = "Levanta tu mano";
+
+"accessibility.calls.alter.toggleAudio" = "Activar micrófono";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reanudar llamada";
+"accessibility.calls.alter.hangUpCall" = "Colgar";
+"accessibility.calls.alter.addParticipant" = "Agregar participante";
+"accessibility.calls.alter.switchCamera" = "Cambiar cámara";
+"accessibility.calls.alter.toggleSpeaker" = "Apagar el altavoz";
+"accessibility.calls.alter.openConversation" = "Conversación abierta";
+"accessibility.calls.alter.showDialpad" = "Mostrar teclado de marcación";
+"accessibility.calls.alter.raiseHand" = "Bajar la mano";
+"accessibility.conference.minimize" = "Minimizar";
+"accessibility.conference.maximize" = "Maximizar";
+"accessibility.conference.setModerator" = "Asignar moderador";
+"accessibility.conference.unsetModerator" = "Desasignar moderador";
+"accessibility.conference.muteAudio" = "Silenciar el audio";
+"accessibility.conference.unmuteAudio" = "Reactivar audio";
+"accessibility.conference.hangup" = "Colgar";
+"accessibility.conference.lowerHand" = "Bajar la mano";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/es_419.lproj/Localizable.strings b/Ring/Ring/Resources/es_419.lproj/Localizable.strings
index 6e9cc2c7d..56d129088 100644
--- a/Ring/Ring/Resources/es_419.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_419.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Hora";
 "global.editPassword" = "Editar contraseña";
 "global.confirmPassword" = "Confirmar contraseña";
+"global.confirm" = "Confirm";
 "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" = "Conectarse";
 
 // Scan
 "scan.badQrCode" = "Código QR erróneo";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Directorio Público";
 "smartlist.jamsResults" = "Resultado de la búsqueda";
 "smartlist.conversations" = "Conversaciones";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Ninguna conversación coincide con la búsqueda.";
 "smartlist.newContact" = "Nuevo contacto";
 "smartlist.newGroup" = "Nuevo grupo";
 "smartlist.accounts" = "Cuentas";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Introducir nombre";
 "smartlist.searchBar" = "Buscar";
 "smartlist.noNetworkConnectivity" = "Sin conexión de red";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Asegurarse de otorgar acceso celular en la configuración.";
 "smartlist.accountsTitle" = "Cuentas";
 "smartlist.addAccountButton" = "+ Agregar cuenta";
 "smartlist.noNumber" = "El contacto seleccionado no tiene ningún número";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Invitar amigos";
 "smartlist.accounts" = "Cuentas";
 "smartlist.disableDonation" = "Ahora no";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Si disfrutas usando Jami y crees en nuestra misión, ¿quieres hacer una donación?";
 "smartlist.inSynchronization" = "Sincronización de conversación";
 "smartlist.newMessage" = "Mensaje nuevo";
 
 // Conversation
 "conversation.addToContactsButton" = "Añadir a contactos";
 "conversation.addToContactsLabel" = "¿Agregar a contactos?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ no está en la lista de contactos";
 "conversation.messagePlaceholder" = "Escribir a";
 "conversation.errorSavingImage" = "Se produjo un error al guardar la imagen en la galería.";
 "conversation.receivedRequest" = "%@ te envió una invitación de conversación.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Ya tengo una cuenta";
 "welcome.linkDevice" = "Importar desde otro dispositivo";
 "welcome.linkBackup" = "Importar desde archivo de respaldo";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Crear una cuenta en Jami";
 "welcome.connectToJAMS" = "Conectar a un Servidor de Gestión de Cuentas Jami (JAMS)";
 
 // Creation Profile Screen
@@ -173,15 +176,15 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unirse a Jami";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.lookingForUsernameAvailability" = "Comprobación de la disponibilidad del nombre de usuario…";
+"createAccount.invalidUsername" = "Nombre de usuario no válido. Por favor, introducir el nombre de usuario correcto.";
 "createAccount.usernameAlreadyTaken" = "El nombre de usuario ya está ocupado";
 "createAccount.usernameValid" = "El nombre de usuario está disponible.";
 "createAccount.UsernameNotRegisteredTitle" = "Error de red";
 "createAccount.UsernameNotRegisteredMessage" = "La cuenta fue creada pero el nombre de usuario no fue registrado";
 "createAccount.timeoutTitle" = "Cuenta creada";
 "createAccount.timeoutMessage" = "Registro de nombre de usuario en proceso... Por favor espere...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurar una cuenta SIP existente";
 "createAccount.creatingAccount" = "Creando cuenta...";
 "createAccount.nameExplanation" = "Podés elegir un nombre de usuario que ayudará a que otras personas te encuentren más fácilmente en Jami.";
 "createAccount.newAccount" = "Cuenta nueva";
@@ -192,15 +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.waitLinkToAccountTitle" = "Asociación de la cuenta";
-"linkToAccount.linkButtonTitle" = "Vincular";
-"linkToAccount.linkDeviceTitle" = "Conectar dispositivo";
-"linkToAccount.linkDeviceMessage" = "Elige \"Vincular nuevo dispositivo\" desde otra aplicación Jami para mostrar el código QR o generar un código PIN.";
-"linkToAccount.explanationMessage" = "Se requiere un código PIN para usar una cuenta Jami existente en este dispositivo.";
-"linkToAccount.pinPlaceholder" = "Código PIN";
-"linkToAccount.pinLabel" = "Introducir el código PIN";
-"linkToAccount.scanQRCode" = "Escanear el código QR";
-"linkToAccount.explanationPinMessage" = "Para generar el código PIN, ir a la configuración de administración de cuentas en el dispositivo que contiene la cuenta a la que desea vincular. Seleccionar \"Vincular nuevo dispositivo\". Recibirá el código PIN necesario para completar este formulario. El código PIN caducará en 10 minutos.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar la cuenta Jami desde el archivo de almacenamiento local.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Error de revocación del dispositivo";
 "accountPage.linkDeviceTitle" = "Vincular otro dispositivo";
 "accountPage.other" = "Otro";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Si no se ha realizado una copia de seguridad de la cuenta o no se ha agregado a otro dispositivo, la cuenta y el nombre de usuario registrado se PERDERÁN IRREVOCABLEMENTE.";
 "accountPage.inviteFriends" = "Invitar amigos";
 "accountPage.contactMeOnJamiTitle" = "Contactame en Jami";
 "accountPage.contactMeOnJamiContant" = "Contácteme usando “%s” en la plataforma de comunicación distribuida Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Vincular nuevo dispositivo";
-"linkDevice.passwordError" = "Contraseña incorrecta. Por favor, inténtelo de nuevo con la contraseña correcta.";
 "linkDevice.networkError" = "Se produjo un error de red al exportar la cuenta.";
-"linkDevice.defaultError" = "Se produjo un error al exportar la cuenta.";
-"linkDevice.explanationMessage" = "Abra Jami en el nuevo dispositivo y elija \"Vincular este dispositivo a una cuenta\" para completar el proceso. El código PIN caducará en 10 minutos.";
-"linkDevice.hudMessage" = "Verificando";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Iniciar una llamada con audio";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Cerrar";
 "accessibility.smartListSwitchAccounts" = "Cambiar de cuenta";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "La cuenta corriente es %@";
 "accessibility.smartListAddAccount" = "Añadir cuenta";
 "accessibility.aboutJamiTitle" = "Acerca de Jami";
 "accessibility.welcomeToJamiTitle" = "Bienvenido a Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Ingrese su nombre de usuario para verificar la disponibilidad.";
 "accessibility.profilePicturePicker" = "Imagen de perfil";
 "accessibility.profilePicturePickerHint" = "Toca dos veces para tomar una foto o seleccionar una imagen de la biblioteca.";
 "accessibility.swarmPicturePicker" = "Foto de grupo";
 "accessibility.swarmPicturePickerHint" = "Toca dos veces para tomar una foto o seleccionar una imagen de la biblioteca.";
 "accessibility.accountSummaryQrCode" = "Código QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Doble clic para ver el código QR de la cuenta";
+"accessibility.accountSummaryEditProfileHint" = "Doble clic para editar el perfil.";
 "accessibility.accountSummaryEditSettingsButton" = "Configuraciones";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Iniciar una llamada de audio con %@";
+"accessibility.conversationStartVideoCall" = "Comenzar una vídeo llamada con%@";
 "accessibility.conversationComposeMessage" = "Redactar un mensaje";
 "accessibility.conversationShareMedia" = "Compartir medios";
 "accessibility.conversationCameraHint" = "Doble clic para abrir la cámara";
 "accessibility.audioPlayerPlay" = "Reproducir";
 "accessibility.audioPlayerPause" = "Pausa";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ mensajes no leídos.";
 "accessibility.conversationRowBlocked" = "Conversación bloqueada";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Último mensaje en %@";
+"accessibility.conversationRowSyncing" = "Sincronización en curso";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En línea";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRow" = "Invitación recibida: %@ invitación pendiente";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Rechazar invitación";
 "accessibility.pendingRequestsListAcceptInvitation" = "Aceptar invitación";
 "accessibility.messageBubbleDeleted" = "Mensaje eliminado";
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Leer";
 "accessibility.messageBubbleUnread" = "Sin leer";
-"accessibility.textNotAvailable" = "Mensaje de texto recibido en %@, contenido no disponible";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, mensaje recibido el %@";
-"accessibility.text.sentOn" = "%@, mensaje enviado el %@";
-"accessibility.fileTransfer.receivedOn" = "Archivo: %@ , recibido el %@";
-"accessibility.fileTransfer.sentOn" = "Archivo: %@, enviado el %@";
-"accessibility.call.lasted" = "Duró";
-"accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"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.calls.default.pauseCall" = "Pausar llamada";
+"accessibility.calls.default.hangUpCall" = "Colgar";
+"accessibility.calls.default.addParticipant" = "Agregar participante";
+"accessibility.calls.default.switchCamera" = "Cambiar cámara";
+"accessibility.calls.default.toggleSpeaker" = "Encender el altavoz";
+"accessibility.calls.default.openConversation" = "Abrir conversación";
+"accessibility.calls.default.showDialpad" = "Mostrar teclado de marcación";
+"accessibility.calls.default.raiseHand" = "Levanta tu mano";
+
+"accessibility.calls.alter.toggleAudio" = "Activar micrófono";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reanudar llamada";
+"accessibility.calls.alter.hangUpCall" = "Colgar";
+"accessibility.calls.alter.addParticipant" = "Agregar participante";
+"accessibility.calls.alter.switchCamera" = "Cambiar cámara";
+"accessibility.calls.alter.toggleSpeaker" = "Apagar el altavoz";
+"accessibility.calls.alter.openConversation" = "Abrir conversación";
+"accessibility.calls.alter.showDialpad" = "Mostrar teclado de marcación";
+"accessibility.calls.alter.raiseHand" = "Bajar la mano";
+"accessibility.conference.minimize" = "Minimizar";
+"accessibility.conference.maximize" = "Maximizar";
+"accessibility.conference.setModerator" = "Asignar moderador";
+"accessibility.conference.unsetModerator" = "Desasignar moderador";
+"accessibility.conference.muteAudio" = "Silenciar micrófono";
+"accessibility.conference.unmuteAudio" = "Reactivar audio";
+"accessibility.conference.hangup" = "Colgar";
+"accessibility.conference.lowerHand" = "Bajar la mano";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
index 70116ee2f..77a80cb31 100644
--- a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Hora";
 "global.editPassword" = "Editar contraseña";
 "global.confirmPassword" = "Confirmar contraseña";
+"global.confirm" = "Confirm";
 "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" = "Conectarse";
 
 // Scan
 "scan.badQrCode" = "Código QR erróneo";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Directorio público";
 "smartlist.jamsResults" = "Resultado de la búsqueda";
 "smartlist.conversations" = "Conversaciones";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Ninguna conversación coincide con la búsqueda.";
 "smartlist.newContact" = "Nuevo contacto";
 "smartlist.newGroup" = "Nuevo grupo";
 "smartlist.accounts" = "Cuentas";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Introducir nombre";
 "smartlist.searchBar" = "Buscar";
 "smartlist.noNetworkConnectivity" = "Sin conexión a la red";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Asegurarse de otorgar acceso celular en la configuración.";
 "smartlist.accountsTitle" = "Cuentas";
 "smartlist.addAccountButton" = "+ Agregar cuenta";
 "smartlist.noNumber" = "El contacto seleccionado no tiene ningún número";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Invitar amigos";
 "smartlist.accounts" = "Cuentas";
 "smartlist.disableDonation" = "Ahora no";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Si disfrutas usando Jami y crees en nuestra misión, ¿quieres hacer una donación?";
 "smartlist.inSynchronization" = "Sincronización de conversación";
 "smartlist.newMessage" = "Nuevo mensaje";
 
 // Conversation
 "conversation.addToContactsButton" = "Añadir a contactos";
 "conversation.addToContactsLabel" = "¿Agregar a contactos?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ no está en la lista de contactos";
 "conversation.messagePlaceholder" = "Escribir a";
 "conversation.errorSavingImage" = "Se produjo un error al guardar la imagen en la galería.";
 "conversation.receivedRequest" = "%@ te envió una invitación de conversación.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Ya tengo una cuenta";
 "welcome.linkDevice" = "Importar desde otro dispositivo";
 "welcome.linkBackup" = "Importar desde archivo de respaldo";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Crear una cuenta en Jami";
 "welcome.connectToJAMS" = "Conectar a un Servidor de Gestión de Cuentas Jami (JAMS)";
 
 // Creation Profile Screen
@@ -173,15 +176,15 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unirse a Jami";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.lookingForUsernameAvailability" = "Comprobación de la disponibilidad del nombre de usuario…";
+"createAccount.invalidUsername" = "Nombre de usuario no válido. Por favor, introducir el nombre de usuario correcto.";
 "createAccount.usernameAlreadyTaken" = "Nombre de usuario ya en uso";
 "createAccount.usernameValid" = "El nombre de usuario está disponible.";
 "createAccount.UsernameNotRegisteredTitle" = "Error de red";
 "createAccount.UsernameNotRegisteredMessage" = "La cuenta fue creada pero el nombre de usuario no fue registrado";
 "createAccount.timeoutTitle" = "Cuenta creada";
 "createAccount.timeoutMessage" = "Registro de nombre de usuario en proceso... Por favor espere...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurar una cuenta SIP existente";
 "createAccount.creatingAccount" = "Creando cuenta...";
 "createAccount.nameExplanation" = "Podés elegir un nombre de usuario que ayudará a que otras personas te encuentren más fácilmente en Jami.";
 "createAccount.newAccount" = "Cuenta nueva";
@@ -192,15 +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.waitLinkToAccountTitle" = "Vincular cuenta";
-"linkToAccount.linkButtonTitle" = "Vincular";
-"linkToAccount.linkDeviceTitle" = "Vincular dispositivo";
-"linkToAccount.linkDeviceMessage" = "Elige \"Vincular nuevo dispositivo\" desde otra aplicación Jami para mostrar el código QR o generar un código PIN.";
-"linkToAccount.explanationMessage" = "Se requiere un código PIN para usar una cuenta Jami existente en este dispositivo.";
-"linkToAccount.pinPlaceholder" = "Código PIN";
-"linkToAccount.pinLabel" = "Introducir el código PIN";
-"linkToAccount.scanQRCode" = "Escanear el código QR";
-"linkToAccount.explanationPinMessage" = "Para generar el código PIN, ir a la configuración de administración de cuentas en el dispositivo que contiene la cuenta a la que desea vincular. Seleccionar \"Vincular nuevo dispositivo\". Recibirá el código PIN necesario para completar este formulario. El código PIN caducará en 10 minutos.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar la cuenta Jami desde el archivo de almacenamiento local.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Error de revocación del dispositivo";
 "accountPage.linkDeviceTitle" = "Vincular otro dispositivo";
 "accountPage.other" = "Otro";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Si no se ha realizado una copia de seguridad de la cuenta o no se ha agregado a otro dispositivo, la cuenta y el nombre de usuario registrado se PERDERÁN IRREVOCABLEMENTE.";
 "accountPage.inviteFriends" = "Invitar amigos";
 "accountPage.contactMeOnJamiTitle" = "Contactame en Jami";
 "accountPage.contactMeOnJamiContant" = "Contácteme usando “%s” en la plataforma de comunicación distribuida Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Vincular nuevo dispositivo";
-"linkDevice.passwordError" = "Contraseña incorrecta. Por favor, inténtelo de nuevo con la contraseña correcta.";
 "linkDevice.networkError" = "Se produjo un error de red al exportar la cuenta.";
-"linkDevice.defaultError" = "Se produjo un error al exportar la cuenta.";
-"linkDevice.explanationMessage" = "Abra Jami en el nuevo dispositivo y elija \"Vincular este dispositivo a una cuenta\" para completar el proceso. El código PIN caducará en 10 minutos.";
-"linkDevice.hudMessage" = "Verificando";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Iniciar una llamada con audio";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Cerrar";
 "accessibility.smartListSwitchAccounts" = "Cambiar de cuenta";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "La cuenta corriente es %@";
 "accessibility.smartListAddAccount" = "Añadir cuenta";
 "accessibility.aboutJamiTitle" = "Acerca de Jami";
 "accessibility.welcomeToJamiTitle" = "Bienvenido a Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Ingrese su nombre de usuario para verificar la disponibilidad.";
 "accessibility.profilePicturePicker" = "Imagen de perfil";
 "accessibility.profilePicturePickerHint" = "Toca dos veces para tomar una foto o seleccionar una imagen de la biblioteca.";
 "accessibility.swarmPicturePicker" = "Foto de grupo";
 "accessibility.swarmPicturePickerHint" = "Toca dos veces para tomar una foto o seleccionar una imagen de la biblioteca.";
 "accessibility.accountSummaryQrCode" = "Código QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Doble clic para ver el código QR de la cuenta";
+"accessibility.accountSummaryEditProfileHint" = "Doble clic para editar el perfil.";
 "accessibility.accountSummaryEditSettingsButton" = "Ajustes";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Iniciar una llamada de audio con %@";
+"accessibility.conversationStartVideoCall" = "Comenzar una vídeo llamada con%@";
 "accessibility.conversationComposeMessage" = "Redactar un mensaje";
 "accessibility.conversationShareMedia" = "Compartir medios";
 "accessibility.conversationCameraHint" = "Doble clic para abrir la cámara";
 "accessibility.audioPlayerPlay" = "Reproducir";
 "accessibility.audioPlayerPause" = "Pausar";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ mensajes no leídos.";
 "accessibility.conversationRowBlocked" = "Conversación bloqueada";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Último mensaje en %@";
+"accessibility.conversationRowSyncing" = "Sincronización en curso";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En línea";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRow" = "Invitación recibida: %@ invitación pendiente";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Rechazar invitación";
 "accessibility.pendingRequestsListAcceptInvitation" = "Aceptar invitación";
 "accessibility.messageBubbleDeleted" = "Mensaje eliminado";
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Leer";
 "accessibility.messageBubbleUnread" = "Sin leer";
-"accessibility.textNotAvailable" = "Mensaje de texto recibido en %@, contenido no disponible";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, mensaje recibido el %@";
-"accessibility.text.sentOn" = "%@, mensaje enviado el %@";
-"accessibility.fileTransfer.receivedOn" = "Archivo: %@ , recibido el %@";
-"accessibility.fileTransfer.sentOn" = "Archivo: %@, enviado el %@";
-"accessibility.call.lasted" = "Duración";
-"accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"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.calls.default.pauseCall" = "Pausar llamada";
+"accessibility.calls.default.hangUpCall" = "Colgar";
+"accessibility.calls.default.addParticipant" = "Añadir participante";
+"accessibility.calls.default.switchCamera" = "Cambiar cámara";
+"accessibility.calls.default.toggleSpeaker" = "Encender el altavoz";
+"accessibility.calls.default.openConversation" = "Abrir conversación";
+"accessibility.calls.default.showDialpad" = "Mostrar teclado de marcación";
+"accessibility.calls.default.raiseHand" = "Levanta tu mano";
+
+"accessibility.calls.alter.toggleAudio" = "Activar micrófono";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reanudar llamada";
+"accessibility.calls.alter.hangUpCall" = "Colgar";
+"accessibility.calls.alter.addParticipant" = "Añadir participante";
+"accessibility.calls.alter.switchCamera" = "Cambiar cámara";
+"accessibility.calls.alter.toggleSpeaker" = "Apagar el altavoz";
+"accessibility.calls.alter.openConversation" = "Abrir conversación";
+"accessibility.calls.alter.showDialpad" = "Mostrar teclado de marcación";
+"accessibility.calls.alter.raiseHand" = "Bajar la mano";
+"accessibility.conference.minimize" = "Minimizar";
+"accessibility.conference.maximize" = "Maximizar";
+"accessibility.conference.setModerator" = "Asignar moderador";
+"accessibility.conference.unsetModerator" = "Desasignar moderador";
+"accessibility.conference.muteAudio" = "Silenciar audio";
+"accessibility.conference.unmuteAudio" = "Reactivar audio";
+"accessibility.conference.hangup" = "Colgar";
+"accessibility.conference.lowerHand" = "Bajar la mano";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
index b669de8e4..46ac6120c 100644
--- a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Tiempo";
 "global.editPassword" = "Editar contraseña";
 "global.confirmPassword" = "Confirmar contraseña";
+"global.confirm" = "Confirm";
 "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" = "Conectarse";
 
 // Scan
 "scan.badQrCode" = "Código QR erróneo";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Directorio Público";
 "smartlist.jamsResults" = "Resultado de la búsqueda";
 "smartlist.conversations" = "Conversaciones";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Ninguna conversación coincide con la búsqueda.";
 "smartlist.newContact" = "Nuevo contacto";
 "smartlist.newGroup" = "Nuevo grupo";
 "smartlist.accounts" = "Cuentas";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Introducir nombre";
 "smartlist.searchBar" = "Buscar";
 "smartlist.noNetworkConnectivity" = "Sin conexión de red";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Asegurarse de otorgar acceso celular en la configuración.";
 "smartlist.accountsTitle" = "Cuentas";
 "smartlist.addAccountButton" = "+ Agregar cuenta";
 "smartlist.noNumber" = "El contacto seleccionado no tiene ningún número";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Invitar amigos";
 "smartlist.accounts" = "Cuentas";
 "smartlist.disableDonation" = "Ahora no";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Si disfrutas usando Jami y crees en nuestra misión, ¿quieres hacer una donación?";
 "smartlist.inSynchronization" = "Sincronización de conversación";
 "smartlist.newMessage" = "Mensaje nuevo";
 
 // Conversation
 "conversation.addToContactsButton" = "Añadir a contactos";
 "conversation.addToContactsLabel" = "¿Agregar a contactos?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ no está en la lista de contactos";
 "conversation.messagePlaceholder" = "Escribir a";
 "conversation.errorSavingImage" = "Se produjo un error al guardar la imagen en la galería.";
 "conversation.receivedRequest" = "%@ te envió una invitación de conversación.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Ya tengo una cuenta";
 "welcome.linkDevice" = "Importar desde otro dispositivo";
 "welcome.linkBackup" = "Importar desde archivo de respaldo";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Crear una cuenta en Jami";
 "welcome.connectToJAMS" = "Conectar a un Servidor de Gestión de Cuentas Jami (JAMS)";
 
 // Creation Profile Screen
@@ -173,15 +176,15 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unirse a Jami";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.lookingForUsernameAvailability" = "Comprobación de la disponibilidad del nombre de usuario…";
+"createAccount.invalidUsername" = "Nombre de usuario no válido. Por favor, introducir el nombre de usuario correcto.";
 "createAccount.usernameAlreadyTaken" = "El nombre de usuario ya está ocupado";
 "createAccount.usernameValid" = "El nombre de usuario está disponible.";
 "createAccount.UsernameNotRegisteredTitle" = "Error de red";
 "createAccount.UsernameNotRegisteredMessage" = "La cuenta fue creada pero el nombre de usuario no fue registrado";
 "createAccount.timeoutTitle" = "Cuenta creada";
 "createAccount.timeoutMessage" = "Registro de nombre de usuario en proceso... Por favor espere...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurar una cuenta SIP existente";
 "createAccount.creatingAccount" = "Creando cuenta...";
 "createAccount.nameExplanation" = "Podés elegir un nombre de usuario que ayudará a que otras personas te encuentren más fácilmente en Jami.";
 "createAccount.newAccount" = "Cuenta nueva";
@@ -192,15 +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.waitLinkToAccountTitle" = "Asociación de la cuenta";
-"linkToAccount.linkButtonTitle" = "Vincular";
-"linkToAccount.linkDeviceTitle" = "Conectar dispositivo";
-"linkToAccount.linkDeviceMessage" = "Elige \"Vincular nuevo dispositivo\" desde otra aplicación Jami para mostrar el código QR o generar un código PIN.";
-"linkToAccount.explanationMessage" = "Se requiere un código PIN para usar una cuenta Jami existente en este dispositivo.";
-"linkToAccount.pinPlaceholder" = "Código PIN";
-"linkToAccount.pinLabel" = "Introducir el código PIN";
-"linkToAccount.scanQRCode" = "Escanear el código QR";
-"linkToAccount.explanationPinMessage" = "Para generar el código PIN, ir a la configuración de administración de cuentas en el dispositivo que contiene la cuenta a la que desea vincular. Seleccionar \"Vincular nuevo dispositivo\". Recibirá el código PIN necesario para completar este formulario. El código PIN caducará en 10 minutos.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar la cuenta Jami desde el archivo de almacenamiento local.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Error de revocación del dispositivo";
 "accountPage.linkDeviceTitle" = "Conectar otro dispositivo";
 "accountPage.other" = "Otro";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Si no se ha realizado una copia de seguridad de la cuenta o no se ha agregado a otro dispositivo, la cuenta y el nombre de usuario registrado se PERDERÁN IRREVOCABLEMENTE.";
 "accountPage.inviteFriends" = "Invitar amigos";
 "accountPage.contactMeOnJamiTitle" = "Contactame en Jami";
 "accountPage.contactMeOnJamiContant" = "Contácteme usando “%s” en la plataforma de comunicación distribuida Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Vincular nuevo dispositivo";
-"linkDevice.passwordError" = "Contraseña incorrecta. Por favor, inténtelo de nuevo con la contraseña correcta.";
 "linkDevice.networkError" = "Se produjo un error de red al exportar la cuenta.";
-"linkDevice.defaultError" = "Se produjo un error al exportar la cuenta.";
-"linkDevice.explanationMessage" = "Abra Jami en el nuevo dispositivo y elija \"Vincular este dispositivo a una cuenta\" para completar el proceso. El código PIN caducará en 10 minutos.";
-"linkDevice.hudMessage" = "Verificando";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Iniciar una llamada con audio";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Cerrar";
 "accessibility.smartListSwitchAccounts" = "Cambiar de cuenta";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "La cuenta corriente es %@";
 "accessibility.smartListAddAccount" = "Añadir cuenta";
 "accessibility.aboutJamiTitle" = "Acerca de Jami";
 "accessibility.welcomeToJamiTitle" = "Bienvenido a Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Ingrese su nombre de usuario para verificar la disponibilidad.";
 "accessibility.profilePicturePicker" = "Imagen de perfil";
 "accessibility.profilePicturePickerHint" = "Toca dos veces para tomar una foto o seleccionar una imagen de la biblioteca.";
 "accessibility.swarmPicturePicker" = "Foto de grupo";
 "accessibility.swarmPicturePickerHint" = "Toca dos veces para tomar una foto o seleccionar una imagen de la biblioteca.";
 "accessibility.accountSummaryQrCode" = "Código QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Doble clic para ver el código QR de la cuenta";
+"accessibility.accountSummaryEditProfileHint" = "Doble clic para editar el perfil.";
 "accessibility.accountSummaryEditSettingsButton" = "Configuración";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Iniciar una llamada de audio con %@";
+"accessibility.conversationStartVideoCall" = "Comenzar una vídeo llamada con%@";
 "accessibility.conversationComposeMessage" = "Redactar un mensaje";
 "accessibility.conversationShareMedia" = "Compartir medios";
 "accessibility.conversationCameraHint" = "Doble clic para abrir la cámara";
 "accessibility.audioPlayerPlay" = "Reproducir";
 "accessibility.audioPlayerPause" = "Pausa";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ mensajes no leídos.";
 "accessibility.conversationRowBlocked" = "Conversación bloqueada";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Último mensaje en %@";
+"accessibility.conversationRowSyncing" = "Sincronización en curso";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En línea";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRow" = "Invitación recibida: %@ invitación pendiente";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Rechazar invitación";
 "accessibility.pendingRequestsListAcceptInvitation" = "Aceptar invitación";
 "accessibility.messageBubbleDeleted" = "Mensaje eliminado";
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Leer";
 "accessibility.messageBubbleUnread" = "Sin leer";
-"accessibility.textNotAvailable" = "Mensaje de texto recibido en %@, contenido no disponible";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, mensaje recibido el %@";
-"accessibility.text.sentOn" = "%@, mensaje enviado el %@";
-"accessibility.fileTransfer.receivedOn" = "Archivo: %@ , recibido el %@";
-"accessibility.fileTransfer.sentOn" = "Archivo: %@, enviado el %@";
-"accessibility.call.lasted" = "Duró";
-"accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
-"accessibility.calls.default.addParticipant" = "Add participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"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.calls.default.pauseCall" = "Pausar llamada";
+"accessibility.calls.default.hangUpCall" = "Colgar";
+"accessibility.calls.default.addParticipant" = "Agregar participante";
+"accessibility.calls.default.switchCamera" = "Cambiar cámara";
+"accessibility.calls.default.toggleSpeaker" = "Encender el altavoz";
+"accessibility.calls.default.openConversation" = "Abrir conversación";
+"accessibility.calls.default.showDialpad" = "Mostrar teclado de marcación";
+"accessibility.calls.default.raiseHand" = "Levanta tu mano";
+
+"accessibility.calls.alter.toggleAudio" = "Activar micrófono";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reanudar llamada";
+"accessibility.calls.alter.hangUpCall" = "Colgar";
+"accessibility.calls.alter.addParticipant" = "Agregar participante";
+"accessibility.calls.alter.switchCamera" = "Cambiar cámara";
+"accessibility.calls.alter.toggleSpeaker" = "Apagar el altavoz";
+"accessibility.calls.alter.openConversation" = "Abrir conversación";
+"accessibility.calls.alter.showDialpad" = "Mostrar teclado de marcación";
+"accessibility.calls.alter.raiseHand" = "Bajar la mano";
+"accessibility.conference.minimize" = "Minimizar";
+"accessibility.conference.maximize" = "Maximizar";
+"accessibility.conference.setModerator" = "Asignar moderador";
+"accessibility.conference.unsetModerator" = "Desasignar moderador";
+"accessibility.conference.muteAudio" = "Silenciar micrófono";
+"accessibility.conference.unmuteAudio" = "Reactivar audio";
+"accessibility.conference.hangup" = "Colgar";
+"accessibility.conference.lowerHand" = "Bajar la mano";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
index 9d5d0072d..0c7bb0524 100644
--- a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Tiempo";
 "global.editPassword" = "Editar contraseña";
 "global.confirmPassword" = "Confirmar contraseña";
+"global.confirm" = "Confirm";
 "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" = "Conectarse";
 
 // Scan
 "scan.badQrCode" = "Código QR erróneo";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Directorio Público";
 "smartlist.jamsResults" = "Resultado de la búsqueda";
 "smartlist.conversations" = "Conversaciones";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Ninguna conversación coincide con la búsqueda.";
 "smartlist.newContact" = "Nuevo contacto";
 "smartlist.newGroup" = "Nuevo grupo";
 "smartlist.accounts" = "Cuentas";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Introducir nombre";
 "smartlist.searchBar" = "Buscar";
 "smartlist.noNetworkConnectivity" = "Sin conexión de red";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Asegurarse de otorgar acceso celular en la configuración.";
 "smartlist.accountsTitle" = "Cuentas";
 "smartlist.addAccountButton" = "+ Agregar cuenta";
 "smartlist.noNumber" = "El contacto seleccionado no tiene ningún número";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Invitar amigos";
 "smartlist.accounts" = "Cuentas";
 "smartlist.disableDonation" = "Ahora no";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Si disfrutas usando Jami y crees en nuestra misión, ¿quieres hacer una donación?";
 "smartlist.inSynchronization" = "Sincronización de conversación";
 "smartlist.newMessage" = "Mensaje nuevo";
 
 // Conversation
 "conversation.addToContactsButton" = "Añadir a contactos";
 "conversation.addToContactsLabel" = "¿Agregar a contactos?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ no está en la lista de contactos";
 "conversation.messagePlaceholder" = "Escribir a";
 "conversation.errorSavingImage" = "Se produjo un error al guardar la imagen en la galería.";
 "conversation.receivedRequest" = "%@ te envió una invitación de conversación.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Ya tengo una cuenta";
 "welcome.linkDevice" = "Importar desde otro dispositivo";
 "welcome.linkBackup" = "Importar desde archivo de respaldo";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Crear una cuenta en Jami";
 "welcome.connectToJAMS" = "Conectar a un Servidor de Gestión de Cuentas Jami (JAMS)";
 
 // Creation Profile Screen
@@ -173,15 +176,15 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unirse a Jami";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.lookingForUsernameAvailability" = "Comprobación de la disponibilidad del nombre de usuario…";
+"createAccount.invalidUsername" = "Nombre de usuario no válido. Por favor, introducir el nombre de usuario correcto.";
 "createAccount.usernameAlreadyTaken" = "El nombre de usuario ya está ocupado";
 "createAccount.usernameValid" = "El nombre de usuario está disponible.";
 "createAccount.UsernameNotRegisteredTitle" = "Error de red";
 "createAccount.UsernameNotRegisteredMessage" = "La cuenta fue creada pero el nombre de usuario no fue registrado";
 "createAccount.timeoutTitle" = "Cuenta creada";
 "createAccount.timeoutMessage" = "Registro de nombre de usuario en proceso... Por favor espere...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurar una cuenta SIP existente";
 "createAccount.creatingAccount" = "Creando cuenta...";
 "createAccount.nameExplanation" = "Podés elegir un nombre de usuario que ayudará a que otras personas te encuentren más fácilmente en Jami.";
 "createAccount.newAccount" = "Cuenta nueva";
@@ -192,15 +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.waitLinkToAccountTitle" = "Asociación de la cuenta";
-"linkToAccount.linkButtonTitle" = "Vincular";
-"linkToAccount.linkDeviceTitle" = "Conectar dispositivo";
-"linkToAccount.linkDeviceMessage" = "Elige \"Vincular nuevo dispositivo\" desde otra aplicación Jami para mostrar el código QR o generar un código PIN.";
-"linkToAccount.explanationMessage" = "Se requiere un código PIN para usar una cuenta Jami existente en este dispositivo.";
-"linkToAccount.pinPlaceholder" = "Código PIN";
-"linkToAccount.pinLabel" = "Introducir el código PIN";
-"linkToAccount.scanQRCode" = "Escanear el código QR";
-"linkToAccount.explanationPinMessage" = "Para generar el código PIN, ir a la configuración de administración de cuentas en el dispositivo que contiene la cuenta a la que desea vincular. Seleccionar \"Vincular nuevo dispositivo\". Recibirá el código PIN necesario para completar este formulario. El código PIN caducará en 10 minutos.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar la cuenta Jami desde el archivo de almacenamiento local.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Error de revocación del dispositivo";
 "accountPage.linkDeviceTitle" = "Vincular otro dispositivo";
 "accountPage.other" = "Otro";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Si no se ha realizado una copia de seguridad de la cuenta o no se ha agregado a otro dispositivo, la cuenta y el nombre de usuario registrado se PERDERÁN IRREVOCABLEMENTE.";
 "accountPage.inviteFriends" = "Invitar amigos";
 "accountPage.contactMeOnJamiTitle" = "Contactame en Jami";
 "accountPage.contactMeOnJamiContant" = "Contácteme usando “%s” en la plataforma de comunicación distribuida Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Vincular nuevo dispositivo";
-"linkDevice.passwordError" = "Contraseña incorrecta. Por favor, inténtelo de nuevo con la contraseña correcta.";
 "linkDevice.networkError" = "Se produjo un error de red al exportar la cuenta.";
-"linkDevice.defaultError" = "Se produjo un error al exportar la cuenta.";
-"linkDevice.explanationMessage" = "Abra Jami en el nuevo dispositivo y elija \"Vincular este dispositivo a una cuenta\" para completar el proceso. El código PIN caducará en 10 minutos.";
-"linkDevice.hudMessage" = "Verificando";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Iniciar una llamada con audio";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Cerrar";
 "accessibility.smartListSwitchAccounts" = "Cambiar de cuenta";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "La cuenta corriente es %@";
 "accessibility.smartListAddAccount" = "Añadir cuenta";
 "accessibility.aboutJamiTitle" = "Acerca de Jami";
 "accessibility.welcomeToJamiTitle" = "Bienvenido a Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Ingrese su nombre de usuario para verificar la disponibilidad.";
 "accessibility.profilePicturePicker" = "Imagen de perfil";
 "accessibility.profilePicturePickerHint" = "Toca dos veces para tomar una foto o seleccionar una imagen de la biblioteca.";
 "accessibility.swarmPicturePicker" = "Foto de grupo";
 "accessibility.swarmPicturePickerHint" = "Toca dos veces para tomar una foto o seleccionar una imagen de la biblioteca.";
 "accessibility.accountSummaryQrCode" = "Código QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Doble clic para ver el código QR de la cuenta";
+"accessibility.accountSummaryEditProfileHint" = "Doble clic para editar el perfil.";
 "accessibility.accountSummaryEditSettingsButton" = "Configuraciones";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Iniciar una llamada de audio con %@";
+"accessibility.conversationStartVideoCall" = "Comenzar una vídeo llamada con%@";
 "accessibility.conversationComposeMessage" = "Redactar un mensaje";
 "accessibility.conversationShareMedia" = "Compartir medios";
 "accessibility.conversationCameraHint" = "Doble clic para abrir la cámara";
 "accessibility.audioPlayerPlay" = "Reproducir";
 "accessibility.audioPlayerPause" = "Pausa";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ mensajes no leídos.";
 "accessibility.conversationRowBlocked" = "Conversación bloqueada";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Último mensaje en %@";
+"accessibility.conversationRowSyncing" = "Sincronización en curso";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En línea";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRow" = "Invitación recibida: %@ invitación pendiente";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Rechazar invitación";
 "accessibility.pendingRequestsListAcceptInvitation" = "Aceptar invitación";
 "accessibility.messageBubbleDeleted" = "Mensaje eliminado";
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Leer";
 "accessibility.messageBubbleUnread" = "Sin leer";
-"accessibility.textNotAvailable" = "Mensaje de texto recibido en %@, contenido no disponible";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, mensaje recibido el %@";
-"accessibility.text.sentOn" = "%@, mensaje enviado el %@";
-"accessibility.fileTransfer.receivedOn" = "Archivo: %@ , recibido el %@";
-"accessibility.fileTransfer.sentOn" = "Archivo: %@, enviado el %@";
-"accessibility.call.lasted" = "Duró";
-"accessibility.fileTransferNoName" = "Archivo recibido en %@, nombre no disponible";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "Pausar llamada";
+"accessibility.calls.default.hangUpCall" = "Colgar";
 "accessibility.calls.default.addParticipant" = "Agregar participante";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.default.switchCamera" = "Cambiar cámara";
+"accessibility.calls.default.toggleSpeaker" = "Encender el altavoz";
+"accessibility.calls.default.openConversation" = "Abrir conversación";
+"accessibility.calls.default.showDialpad" = "Mostrar teclado de marcación";
+"accessibility.calls.default.raiseHand" = "Levanta tu mano";
+
+"accessibility.calls.alter.toggleAudio" = "Activar micrófono";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reanudar llamada";
+"accessibility.calls.alter.hangUpCall" = "Colgar";
+"accessibility.calls.alter.addParticipant" = "Agregar participante";
+"accessibility.calls.alter.switchCamera" = "Cambiar cámara";
+"accessibility.calls.alter.toggleSpeaker" = "Apagar el altavoz";
+"accessibility.calls.alter.openConversation" = "Abrir conversación";
+"accessibility.calls.alter.showDialpad" = "Mostrar teclado de marcación";
+"accessibility.calls.alter.raiseHand" = "Bajar la mano";
+"accessibility.conference.minimize" = "Minimizar";
+"accessibility.conference.maximize" = "Maximizar";
+"accessibility.conference.setModerator" = "Asignar moderador";
+"accessibility.conference.unsetModerator" = "Desasignar moderador";
+"accessibility.conference.muteAudio" = "Silenciar micrófono";
+"accessibility.conference.unmuteAudio" = "Reactivar audio";
+"accessibility.conference.hangup" = "Colgar";
+"accessibility.conference.lowerHand" = "Bajar la mano";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/et.lproj/Localizable.strings b/Ring/Ring/Resources/et.lproj/Localizable.strings
index 16c97d5ce..317b91632 100644
--- a/Ring/Ring/Resources/et.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/et.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Aeg";
 "global.editPassword" = "Muuda salasõna";
 "global.confirmPassword" = "Korda salasõna";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Puuduvad õigused kaamera kasutamiseks. Selle funktsionaalsuse jaoks anna nutiseadme seadistustest vastavad õigused.";
+"global.confirm" = "Confirm";
+"global.connect" = "Ühenda";
 
 // Scan
 "scan.badQrCode" = "Vigane QR-kood";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Avalik kataloog";
 "smartlist.jamsResults" = "Otsingutulemus";
 "smartlist.conversations" = "Vestlused";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Ühtegi vestlust ei vasta sinu otsingule.";
 "smartlist.newContact" = "Uus kontakt";
 "smartlist.newGroup" = "Uus grupp";
 "smartlist.accounts" = "Kasutajakontod";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Sisesta nimi…";
 "smartlist.searchBar" = "Otsing";
 "smartlist.noNetworkConnectivity" = "Võrguühendus puudub";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Palun veendu, et nutiseadme seadistustes on lubatud juurdepääs mobiilivõrgule.";
 "smartlist.accountsTitle" = "Kasutajakontod";
 "smartlist.addAccountButton" = "+ Lisa kasutajakonto";
 "smartlist.noNumber" = "Valitud kontaktil ei ole ühtegi numbrit";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Kutsu sõpru";
 "smartlist.accounts" = "Kasutajakontod";
 "smartlist.disableDonation" = "Mitte praegu";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Kui sulle Jami meeldib ja sa usud meie visiooni, siis kas sa oleksid nõus meid rahaliselt toetama?";
 "smartlist.inSynchronization" = "vestlus on sünkroniseerimisel";
 "smartlist.newMessage" = "Uus sõnum";
 
 // Conversation
 "conversation.addToContactsButton" = "Lisa kontaktitele";
 "conversation.addToContactsLabel" = "Kas lisame kontaktina?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ pole sinu kontaktide loendis";
 "conversation.messagePlaceholder" = "Kirjuta kasutajale";
 "conversation.errorSavingImage" = "Pildi salvestamisel galeriisse tekkis viga.";
 "conversation.receivedRequest" = "%@ saatis sulle vestluskutse.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Mul on juba konto";
 "welcome.linkDevice" = "Impordi muust seadmest";
 "welcome.linkBackup" = "Impordi varukoopiast";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Loo Jami konto";
 "welcome.connectToJAMS" = "Loo ühendus Jami kontohaldusserveriga (JAMS)";
 
 // Creation Profile Screen
@@ -173,15 +176,15 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Liitu Jamiga";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.lookingForUsernameAvailability" = "Uurime kasutajanime kättesaadavust...";
+"createAccount.invalidUsername" = "Kasutajanimi on vigane. Palun sisesta korrektne kasutajanimi.";
 "createAccount.usernameAlreadyTaken" = "Kasutajanimi on juba võetud";
 "createAccount.usernameValid" = "Kasutajanimi on saadaval";
 "createAccount.UsernameNotRegisteredTitle" = "Võrgu viga";
 "createAccount.UsernameNotRegisteredMessage" = "Kasutajakonto on nüüd loodud, kuid kasutajanimi jäi registreereerimata";
 "createAccount.timeoutTitle" = "Kasutajakonto on loodud";
 "createAccount.timeoutMessage" = "Kasutajanime registreerimine on töös. See võib võtta paar hetke…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Seadista olemasolev SIP-konto";
 "createAccount.creatingAccount" = "Loome kasutajakontot";
 "createAccount.nameExplanation" = "Selleks, et teised kasutajad saaksid sind kergemini Jami võrgus leida, võid valida endale kasutajanime.";
 "createAccount.newAccount" = "Uus kasutajakonto";
@@ -192,15 +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.waitLinkToAccountTitle" = "Kontode sidumine";
-"linkToAccount.linkButtonTitle" = "Seo";
-"linkToAccount.linkDeviceTitle" = "Seo seade";
-"linkToAccount.linkDeviceMessage" = "Oma teisest Jami rakendusest vali „Seo uus seade“ ning kuva QR-koodi või sisesta PIN-kood";
-"linkToAccount.explanationMessage" = "Olemasoleva Jami konto kasutamiseks selles seadmes on vaja PIN-koodi.";
-"linkToAccount.pinPlaceholder" = "PIN-kood";
-"linkToAccount.pinLabel" = "Sisesta PIN-kood";
-"linkToAccount.scanQRCode" = "QR-koodi skanneerimine";
-"linkToAccount.explanationPinMessage" = "PIN-koodi loomiseks ava kasutajakonto halduse seadistused selles seadmes, kus asub kasutajakonto, mida soovid siduda uue seadmega. Vali „Seo uue seadmega“. Tulemuseks saad selle vormi andmete täitmiseks vajaliku PIN-koodi. Nimetatud kood kehtib vaid 10 minuti jooksul.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Impordi Jami kasutajakonto kohaliku varukoopia arhiivifailist..";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Viga seadme eemaldamisel";
 "accountPage.linkDeviceTitle" = "Seo veel üks seade";
 "accountPage.other" = "Muud";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Kui sinu kasutajakonto ei ole varundatud ega lisatud mõnda muusse seadmesse, siis sinu kasutajakonto ja registreeritud kasutajanimi lähevad PÖÖRDUMATULT KADUMA.";
 "accountPage.inviteFriends" = "Kutsu sõpru";
 "accountPage.contactMeOnJamiTitle" = "Suhtle minuga Jami võrgus!";
 "accountPage.contactMeOnJamiContant" = "Kasutades „%s“ suhtle minuga hajutatud suhtlusvõrgus Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Seo uus seade";
-"linkDevice.passwordError" = "Vigane salasõna. Palun proovi uuesti õige salasõnaga.";
 "linkDevice.networkError" = "Kasutajakonto eksportimisel tekkis võrguviga.";
-"linkDevice.defaultError" = "Kasutajakonto eksportimisel tekkis viga.";
-"linkDevice.explanationMessage" = "Tegevuse lõpetamiseks ava Jami uues seadmes ja  vali „Seo see seade kasutajakontoga“. PIN-kood kehtib vaid 10 minuti jooksul.";
-"linkDevice.hudMessage" = "Verifitseerime";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Alusta häälkõnet";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Sulge";
 "accessibility.smartListSwitchAccounts" = "Vaheta kasutajakontot";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Praegune kasutajakonto on %@";
 "accessibility.smartListAddAccount" = "Lisa kasutajakonto";
 "accessibility.aboutJamiTitle" = "Jami teave";
 "accessibility.welcomeToJamiTitle" = "Tere tulemast kasutama suhtlusrakendust Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Sisesta kasutajanimi kontrollimaks kas ta on saadaval.";
 "accessibility.profilePicturePicker" = "Profiilikuva";
 "accessibility.profilePicturePickerHint" = "Topeltklõpsa pildistamiseks või galeriist pildi valimiseks";
 "accessibility.swarmPicturePicker" = "Vestlusrühma tunnuspilt";
 "accessibility.swarmPicturePickerHint" = "Topeltklõpsa pildistamiseks või galeriist pildi valimiseks";
 "accessibility.accountSummaryQrCode" = "QR-kood";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Kasutajakonto QR-koodi vaatamiseks topeltklõpsi";
+"accessibility.accountSummaryEditProfileHint" = "Profiili muutmiseks topeltklõpsi";
 "accessibility.accountSummaryEditSettingsButton" = "Seadistused";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Alusta häälkõnet kasutajaga %@";
+"accessibility.conversationStartVideoCall" = "Alusta videokõnet kasutajaga %@";
 "accessibility.conversationComposeMessage" = "Kirjuta sõnum";
 "accessibility.conversationShareMedia" = "Jaga meediat";
 "accessibility.conversationCameraHint" = "Kaamera avamiseks topeltklõpsi";
 "accessibility.audioPlayerPlay" = "Esita";
 "accessibility.audioPlayerPause" = "Peata";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ lugemata sõnumit.";
 "accessibility.conversationRowBlocked" = "Vestlus on blokeeritud";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Viimane sõnum: %@";
+"accessibility.conversationRowSyncing" = "Sünkroniseerimine on pooleli";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Võrgus";
 "accessibility.userPresenceAvailable" = "Saadaval";
-"accessibility.pendingRequestsRow" = "Saabunud kutse: %@ ootel kutse";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Saabunud kutse: %@ ootel kutse";
 "accessibility.pendingRequestsRowHint" = "Saadud kutsete vaatamiseks ja neile vastamiseks topeltklõpsi";
 "accessibility.pendingRequestsListBlockUser" = "Blokeeri kutse saatja";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Lükka kutse tagasi";
 "accessibility.pendingRequestsListAcceptInvitation" = "Võta kutse vastu";
 "accessibility.messageBubbleDeleted" = "Sõnum on kustutatud";
 "accessibility.messageBubbleEdited" = "Muudetud";
 "accessibility.messageBubbleRead" = "Loetud";
 "accessibility.messageBubbleUnread" = "Lugemata";
-"accessibility.textNotAvailable" = "Tekstisõnum on vastu võetud %@, aga sisu pole saadaval";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Fail on vastu võetud %@, aga sisu pole saadaval";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, sõnum vastuvõetud %@";
-"accessibility.text.sentOn" = "%@, sõnum saadetud %@";
-"accessibility.fileTransfer.receivedOn" = "Fail: %@, vastuvõetud %@";
-"accessibility.fileTransfer.sentOn" = "Fail: %@, saadetud %@";
-"accessibility.call.lasted" = "Kestus";
-"accessibility.fileTransferNoName" = "Fail on vastu võetud %@, aga sisu pole saadaval";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "Peata kõne";
+"accessibility.calls.default.hangUpCall" = "Lõpeta kõne";
 "accessibility.calls.default.addParticipant" = "Lisa osaleja";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.default.switchCamera" = "Vaheta kaamerat";
+"accessibility.calls.default.toggleSpeaker" = "Lülita valjuhääldi sisse";
+"accessibility.calls.default.openConversation" = "Ava vestlus";
+"accessibility.calls.default.showDialpad" = "Näita numbriklahvistikku";
+"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.pauseCall" = "Jätka kõnet";
+"accessibility.calls.alter.hangUpCall" = "Lõpeta kõne";
+"accessibility.calls.alter.addParticipant" = "Lisa osaleja";
+"accessibility.calls.alter.switchCamera" = "Vaheta kaamerat";
+"accessibility.calls.alter.toggleSpeaker" = "Lülita valjuhääldi välja";
+"accessibility.calls.alter.openConversation" = "Ava vestlus";
+"accessibility.calls.alter.showDialpad" = "Näita numbriklahvistikku";
+"accessibility.calls.alter.raiseHand" = "Lase käsi alla";
+"accessibility.conference.minimize" = "Minimeeri";
+"accessibility.conference.maximize" = "Maksimeeri";
+"accessibility.conference.setModerator" = "Määra moderaator";
+"accessibility.conference.unsetModerator" = "Eemalda moderaator";
+"accessibility.conference.muteAudio" = "Kuulutusvabad";
+"accessibility.conference.unmuteAudio" = "Surnud audio";
+"accessibility.conference.hangup" = "Lõpeta kõne";
+"accessibility.conference.lowerHand" = "Lase käsi alla";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/eu.lproj/Localizable.strings b/Ring/Ring/Resources/eu.lproj/Localizable.strings
index 35d7df7c3..aa0f25e95 100644
--- a/Ring/Ring/Resources/eu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eu.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Berretsi pasahitza";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Konektatu";
 
 // Scan
 "scan.badQrCode" = "QR kodea txarra";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Kontu bat daukat.";
 "welcome.linkDevice" = "Beste gailu batetik inportatzea";
 "welcome.linkBackup" = "Inportatu babes-kopia artxibotik";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jarri kontu bat Jami-n";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Kontua estekatzen";
-"linkToAccount.linkButtonTitle" = "Esteka";
-"linkToAccount.linkDeviceTitle" = "Estekatu gailua";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR kodea eskaneatu";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR kodea";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Jami-ren kontua inporta ezazu artxibo tokiko artxibotik.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Estekatu gailu berria";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Egiaztatzen";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Hasi audio-deia";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Konektatuta";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Eusko Jaurlaritzaren laguntzarekin egindako azpitituluak";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "Dei-pausa bat";
+"accessibility.calls.default.hangUpCall" = "Eseki";
 "accessibility.calls.default.addParticipant" = "Partaide gehitu";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Elkarrizketa irekia";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Altxa eskua.";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Deialdia berrikusi";
+"accessibility.calls.alter.hangUpCall" = "Eseki";
+"accessibility.calls.alter.addParticipant" = "Partaide gehitu";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Elkarrizketa irekia";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "Beheko eskua";
+"accessibility.conference.minimize" = "Minimizatu";
+"accessibility.conference.maximize" = "Maximizatu";
+"accessibility.conference.setModerator" = "Moderatzailea ezarri";
+"accessibility.conference.unsetModerator" = "Moderatzailea desfinkatu";
+"accessibility.conference.muteAudio" = "Isilarazi bideoa";
+"accessibility.conference.unmuteAudio" = "Audio itzalita";
+"accessibility.conference.hangup" = "Eseki";
+"accessibility.conference.lowerHand" = "Beheko eskua";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
index 43b00d229..703b64304 100644
--- a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "زمان";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "تأیید گذرواژه";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "اتصال";
 
 // Scan
 "scan.badQrCode" = "کد QR بد";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "من قبلاً حسابي دارم";
 "welcome.linkDevice" = "واردات از دستگاه دیگری";
 "welcome.linkBackup" = "وارد کردن از پشتیبان بایگانی‌شده";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "حساب Jami را ایجاد کنید";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "پیوند دادن حسابها";
-"linkToAccount.linkButtonTitle" = "پیوند";
-"linkToAccount.linkDeviceTitle" = "پیوند این افزاره";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "کد QR را اسکن کنید";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "حساب جمي رو از پرونده آرشیو محلی وارد کن";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "پیوند دستگاه جدید";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = " در حال انجام تأیید...";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "شروع تماس صوتی";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "آنلاین";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "ویرایش شده";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "توقف تماس";
+"accessibility.calls.default.hangUpCall" = "قطع‌کردن";
 "accessibility.calls.default.addParticipant" = "افزودن شرکت کننده";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "باز‌کردن گفتگو";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "بالا بردن دست ";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "ازسرگیری تماس";
+"accessibility.calls.alter.hangUpCall" = "قطع‌کردن";
+"accessibility.calls.alter.addParticipant" = "افزودن شرکت کننده";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "باز‌کردن گفتگو";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "دست پایین";
+"accessibility.conference.minimize" = "کمینه کردن";
+"accessibility.conference.maximize" = "به حداکثر رساندن";
+"accessibility.conference.setModerator" = "تعیین مدیر";
+"accessibility.conference.unsetModerator" = "لغو میدیریت";
+"accessibility.conference.muteAudio" = "قطع صدا";
+"accessibility.conference.unmuteAudio" = "برقراری صدا";
+"accessibility.conference.hangup" = "قطع‌کردن";
+"accessibility.conference.lowerHand" = "دست پایین";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/fa.lproj/Localizable.strings b/Ring/Ring/Resources/fa.lproj/Localizable.strings
index 80e2207a9..990b6b648 100644
--- a/Ring/Ring/Resources/fa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "زمان";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "تأیید گذرواژه";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "اتصال";
 
 // Scan
 "scan.badQrCode" = "کد QR بد";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "من قبلاً حسابي دارم";
 "welcome.linkDevice" = "واردات از دستگاه دیگری";
 "welcome.linkBackup" = "وارد کردن از پشتیبان بایگانی‌شده";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "حساب Jami را ایجاد کنید";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "پیوند دادن حسابها";
-"linkToAccount.linkButtonTitle" = "پیوند";
-"linkToAccount.linkDeviceTitle" = "پیوند این افزاره";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "کد QR را اسکن کنید";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "حساب جمي رو از پرونده آرشیو محلی وارد کن";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "پیوند دستگاه جدید";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = " در حال انجام تأیید...";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "شروع تماس صوتی";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "آنلاین";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "ویرایش شده";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "توقف تماس";
+"accessibility.calls.default.hangUpCall" = "قطع‌کردن";
 "accessibility.calls.default.addParticipant" = "افزودن شرکت کننده";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "باز‌کردن گفتگو";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "بالا بردن دست ";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "ازسرگیری تماس";
+"accessibility.calls.alter.hangUpCall" = "قطع‌کردن";
+"accessibility.calls.alter.addParticipant" = "افزودن شرکت کننده";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "باز‌کردن گفتگو";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "دست پایین";
+"accessibility.conference.minimize" = "کمینه کردن";
+"accessibility.conference.maximize" = "به حداکثر رساندن";
+"accessibility.conference.setModerator" = "تعیین مدیر";
+"accessibility.conference.unsetModerator" = "لغو میدیریت";
+"accessibility.conference.muteAudio" = "قطع صدا";
+"accessibility.conference.unmuteAudio" = "برقراری صدا";
+"accessibility.conference.hangup" = "قطع‌کردن";
+"accessibility.conference.lowerHand" = "دست پایین";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/fi.lproj/Localizable.strings b/Ring/Ring/Resources/fi.lproj/Localizable.strings
index 9fd107a47..0b072ad4e 100644
--- a/Ring/Ring/Resources/fi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fi.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Aika";
 "global.editPassword" = "Muokkaa salasanaa";
 "global.confirmPassword" = "Varmista salasana";
+"global.confirm" = "Confirm";
 "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.connect" = "Yhdistä";
 
 // Scan
 "scan.badQrCode" = "Väärä QR-koodi";
@@ -120,7 +123,7 @@
 "smartlist.inviteFriends" = "Kutsu ystäviä";
 "smartlist.accounts" = "Tilit";
 "smartlist.disableDonation" = "Ei nyt";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Jos pidät Jamista ja uskot tehtäväämme, Haluatko tehdä lahjoituksen?";
 "smartlist.inSynchronization" = "keskustelu synkronoituna";
 "smartlist.newMessage" = "Uusi viesti";
 
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Minulla on jo tili.";
 "welcome.linkDevice" = "Tuo toisesta laitteesta";
 "welcome.linkBackup" = "Tuo varmuuskopiosta";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Luo Jami-tilin";
 "welcome.connectToJAMS" = "Yhdistä Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -173,7 +176,7 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Liity Jamiin";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
+"createAccount.lookingForUsernameAvailability" = "Tarkistetaan käyttäjänimen saatavuutta…";
 "createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
 "createAccount.usernameAlreadyTaken" = "Käyttäjänimi on jo varattu";
 "createAccount.usernameValid" = "Käyttäjänimi on saatavilla.";
@@ -181,7 +184,7 @@
 "createAccount.UsernameNotRegisteredMessage" = "Tili luotiin, mutta käyttäjänimeä ei rekisteröity";
 "createAccount.timeoutTitle" = "Tili luotu";
 "createAccount.timeoutMessage" = "Käyttäjätunnuksen rekisteröinti käynnissä. Odota...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Määritä olemassa oleva SIP-tili";
 "createAccount.creatingAccount" = "Luodaan tiliä";
 "createAccount.nameExplanation" = "Voit valita käyttäjänimen helpottamaan muita löytämään sinut Jamista.";
 "createAccount.newAccount" = "Uusi tili";
@@ -192,15 +195,21 @@
 "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.waitLinkToAccountTitle" = "Tilin linkittäminen";
-"linkToAccount.linkButtonTitle" = "Linkki";
-"linkToAccount.linkDeviceTitle" = "Linkitä laite";
-"linkToAccount.linkDeviceMessage" = "Valitse \"Linkitä uusi laite\" toisesta Jami-sovelluksesta nähdäksesi QR-koodin tai luodaksesi PIN-koodin.";
-"linkToAccount.explanationMessage" = "PIN-koodi vaaditaan Jami-tilin käyttämiseen tällä laitteella.";
-"linkToAccount.pinPlaceholder" = "PIN-koodi";
-"linkToAccount.pinLabel" = "Anna PIN-koodi";
-"linkToAccount.scanQRCode" = "Skannaa QR-koodi";
-"linkToAccount.explanationPinMessage" = "Luo PIN-koodi siirtymällä tilinhallinta-asetuksiin laitteessa, joka sisältää linkitettävän tilin. Valitse \"Linkitä uusi laite\". Saat tarvittavan PIN-koodin. Huomaa: PIN-koodi vanhenee 10 minuutin kuluttua.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR-koodi";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Tuo Jami-tili varmuuskopiosta";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Laitteen peruuttamisvirhe";
 "accountPage.linkDeviceTitle" = "Linkitä toinen laite";
 "accountPage.other" = "Muu";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Jos tiliä ei ole varmuuskopioitu tai lisätty toiseen laitteeseen, tilisi ja rekisteröity nimi menetetään LOPULLISESTI.";
 "accountPage.inviteFriends" = "Kutsu ystäviä";
 "accountPage.contactMeOnJamiTitle" = "Ota minuun yhteyttä Jamilla!";
 "accountPage.contactMeOnJamiContant" = "Ota minuun yhteyttä \"%s\" Jami viestintäalustan kautta:  https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Linkitä uusi laite";
-"linkDevice.passwordError" = "Väärä salasana. Yritä uudelleen oikealla salasanalla.";
 "linkDevice.networkError" = "Tiliä vietäessä tapahtui verkkovirhe.";
-"linkDevice.defaultError" = "Tiliä vietäessä tapahtui virhe.";
-"linkDevice.explanationMessage" = "Avaa Jami uudessa laitteessa ja viimeistele prosessi valitsemalla Linkitä tämä laite tiliin. Huomaa: PIN-koodi vanhenee 10 minuutin kuluttua.";
-"linkDevice.hudMessage" = "Tarkistetaan";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Aloita äänipuhelu";
@@ -531,53 +552,55 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Verkossa";
 "accessibility.userPresenceAvailable" = "Saatavilla";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Hylkää kutsu";
 "accessibility.pendingRequestsListAcceptInvitation" = "Hyväksy kutsu";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "Muokattu";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.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.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Avaa keskustelu";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Nosta käsi";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Poista mikrofonin mykistys";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Jatka puhelua";
+"accessibility.calls.alter.hangUpCall" = "Katkaise puhelu";
+"accessibility.calls.alter.addParticipant" = "Lisää osannottaja";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Avaa keskustelu";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.alter.raiseHand" = "Käsi alas";
+"accessibility.conference.minimize" = "Pienennä";
+"accessibility.conference.maximize" = "Suurenna";
+"accessibility.conference.setModerator" = "Aseta valvoja";
+"accessibility.conference.unsetModerator" = "Poista valvoja";
+"accessibility.conference.muteAudio" = "Mykistä ääni";
+"accessibility.conference.unmuteAudio" = "Poista mykistys";
+"accessibility.conference.hangup" = "Katkaise puhelu";
+"accessibility.conference.lowerHand" = "Käsi alas";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
index 905e85991..04f265c16 100644
--- a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Heure";
 "global.editPassword" = "Modifier le mot de passe";
 "global.confirmPassword" = "Confirmer le mot de passe";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "L'accès à votre caméra est désactivé. Veuillez l'activer dans les paramètres.";
+"global.confirm" = "Confirm";
+"global.connect" = "Se connecter";
 
 // Scan
 "scan.badQrCode" = "Code QR incorrect";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Répertoire public ";
 "smartlist.jamsResults" = "Résultats de la recherche";
 "smartlist.conversations" = "Conversations";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Aucune conversation ne correspond à votre recherche";
 "smartlist.newContact" = "Nouveau contact";
 "smartlist.newGroup" = "Nouveau groupe";
 "smartlist.accounts" = "Comptes";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Entrer un nom...";
 "smartlist.searchBar" = "Rechercher";
 "smartlist.noNetworkConnectivity" = "Pas d'accès au réseau";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Assurez-vous que l'accès au réseau mobile est activé dans vos paramètres.";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Ajouter un compte";
 "smartlist.noNumber" = "Le contact sélectionné n'a pas de numéro";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Inviter des amis";
 "smartlist.accounts" = "Comptes";
 "smartlist.disableDonation" = "Pas maintenant";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Si vous appréciez Jami et que vous croyez à notre mission, feriez-vous un don ?";
 "smartlist.inSynchronization" = "conversation en cours de synchronisation";
 "smartlist.newMessage" = "Nouveau message";
 
 // Conversation
 "conversation.addToContactsButton" = "Ajouter aux contcats";
 "conversation.addToContactsLabel" = "Ajouter au contacts ?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = " %@ ne fait pas partie de vos contacts.";
 "conversation.messagePlaceholder" = "Écrire à";
 "conversation.errorSavingImage" = "Une erreur s'est produite en sauvegardant l'image dans la galerie.";
 "conversation.receivedRequest" = "%@ vous a envoyé une invitation.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "J'ai déjà un compte";
 "welcome.linkDevice" = "Importer d'un autre appareil";
 "welcome.linkBackup" = "Importer à partir d'une sauvegarde";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Créer un compte Jami";
 "welcome.connectToJAMS" = "Créer un compte à partir d'un serveur de gestion de comptes Jami (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Rejoindre Jami";
 "createAccount.lookingForUsernameAvailability" = "Vérification de la disponibilité du nom d'utilisateur...";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Nom d'utilisateur incorrect. Veuillez saisir le nom d'utilisateur correct.";
 "createAccount.usernameAlreadyTaken" = "Nom d'utilisateur non-disponible";
 "createAccount.usernameValid" = "Le nom d'utilisateur est disponible.";
 "createAccount.UsernameNotRegisteredTitle" = "Erreur de réseau";
 "createAccount.UsernameNotRegisteredMessage" = "Le compte a été créé mais le nom d'utilisateur n'a pas été enregistré";
 "createAccount.timeoutTitle" = "Compte créé";
 "createAccount.timeoutMessage" = "L'enregistrement du nom d'utilisateur est en cours. Veuillez patienter...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurer un compte SIP existant.";
 "createAccount.creatingAccount" = "Création du compte";
 "createAccount.nameExplanation" = "Vous pouvez choisir un nom d'utilisateur pour aider les autres à vous trouver et à vous joindre plus facilement sur Jami.";
 "createAccount.newAccount" = "Nouveau compte";
@@ -192,15 +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.waitLinkToAccountTitle" = "Association du compte";
-"linkToAccount.linkButtonTitle" = "Lier";
-"linkToAccount.linkDeviceTitle" = "Lier l'appareil";
-"linkToAccount.linkDeviceMessage" = "Allez sur \"Associer un nouvel appareil\" sur l'autre appareil pour voir le code QR ou le NIP";
-"linkToAccount.explanationMessage" = "Un NIP est nécessaire pour utiliser ce compte Jami sur cet appareil";
-"linkToAccount.pinPlaceholder" = "NIP";
-"linkToAccount.pinLabel" = "Entrer le code NIP";
-"linkToAccount.scanQRCode" = "Scanner le code QR";
-"linkToAccount.explanationPinMessage" = "Pour générer le code PIN, accédez aux paramètres de gestion du compte sur l'appareil contenant le compte que vous souhaitez lier. Sélectionnez \"Lier un nouvel appareil\". Vous recevrez le code PIN nécessaire pour remplir ce formulaire. Le code PIN n'est valable que pendant 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importer un compte Jami à partir d'un fichier d'archives local.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Erreur de révocation d'appareil";
 "accountPage.linkDeviceTitle" = "Lier autre appareil";
 "accountPage.other" = "Autre";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom d'utilisateur enregistré seront IRRÉVOCABLEMENT PERDUS.";
 "accountPage.inviteFriends" = "Inviter des amis";
 "accountPage.contactMeOnJamiTitle" = "Contactez moi sur Jami !";
 "accountPage.contactMeOnJamiContant" = "Contactez-moi par l'identifiant : %s sur la plateforme distribuée de communication Jami. https://jami.net ";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Lier un nouvel appareil";
-"linkDevice.passwordError" = "Mot de passe incorrect. Veuillez réessayer.";
 "linkDevice.networkError" = "Une erreur inconnue s'est produite lors de l'exportation du compte.";
-"linkDevice.defaultError" = "Une erreur s'est produite pendant l'export du compte.";
-"linkDevice.explanationMessage" = "Ouvrez Jami sur le nouvel appareil et choisissez « Lier cet appareil à un compte » pour terminer la procédure. Le code PIN expirera dans 10 minutes.";
-"linkDevice.hudMessage" = "Vérification en cours";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Démarrer appel audio";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Fermer";
 "accessibility.smartListSwitchAccounts" = "Changer de compte";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Votre compte actuel est %@";
 "accessibility.smartListAddAccount" = "Ajouter le compte";
 "accessibility.aboutJamiTitle" = "À propos de Jami";
 "accessibility.welcomeToJamiTitle" = "Bienvenue sur Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Entrer un nom d'utilisateur afin de vérifier sa disponibilité";
 "accessibility.profilePicturePicker" = "Image de profil";
 "accessibility.profilePicturePickerHint" = "Taper deux fois pour prendre une photo ou choisir une image dans votre bibliothèque";
 "accessibility.swarmPicturePicker" = "Image du groupe";
 "accessibility.swarmPicturePickerHint" = "Taper deux fois pour prendre une photo ou choisir une image dans votre bibliothèque";
 "accessibility.accountSummaryQrCode" = "Code QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Double tapotement pour voir le code QR du compte";
+"accessibility.accountSummaryEditProfileHint" = "Double tapotement pour modifier votre profil";
 "accessibility.accountSummaryEditSettingsButton" = "Paramètres";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Démarrer un appel audio avec %@";
+"accessibility.conversationStartVideoCall" = "Démarrer un appel vidéo avec %@";
 "accessibility.conversationComposeMessage" = "Écrire un message";
 "accessibility.conversationShareMedia" = "Partager un média";
 "accessibility.conversationCameraHint" = "Double-tap pour ouvrir la caméra";
 "accessibility.audioPlayerPlay" = "Jouer";
 "accessibility.audioPlayerPause" = "Pause";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ messages non lus";
 "accessibility.conversationRowBlocked" = "Conversation bloquées";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Dernier message sur %@";
+"accessibility.conversationRowSyncing" = "Synchronisation en cours";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En ligne";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRow" = "Invitation reçues : %@ invitation en attente";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Décliner l'invitation";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accepter l'invitation";
 "accessibility.messageBubbleDeleted" = "Message supprimé";
 "accessibility.messageBubbleEdited" = "Modifié";
 "accessibility.messageBubbleRead" = "Lu";
 "accessibility.messageBubbleUnread" = "Non lu";
-"accessibility.textNotAvailable" = "Message vide reçu le %@, c'est probablement un bug.";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message reçu le %@";
-"accessibility.text.sentOn" = "%@, message envoyé le %@";
-"accessibility.fileTransfer.receivedOn" = "Fichier : %@ , reçu le %@";
-"accessibility.fileTransfer.sentOn" = "Fichier : %@, envoyé le %@";
-"accessibility.call.lasted" = "Dernier";
-"accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "Mettre l'appel en pause";
+"accessibility.calls.default.hangUpCall" = "Raccrochez";
 "accessibility.calls.default.addParticipant" = "Ajouter un participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.default.switchCamera" = "Changer de caméra";
+"accessibility.calls.default.toggleSpeaker" = "Activer le haut-parleur";
+"accessibility.calls.default.openConversation" = "Ouvrir la conversation";
+"accessibility.calls.default.showDialpad" = "Pavé numérique";
+"accessibility.calls.default.raiseHand" = "Lever la main";
+
+"accessibility.calls.alter.toggleAudio" = "Réouvrir le microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reprendre l'appel";
+"accessibility.calls.alter.hangUpCall" = "Raccrochez";
+"accessibility.calls.alter.addParticipant" = "Ajouter un participant";
+"accessibility.calls.alter.switchCamera" = "Changer de caméra";
+"accessibility.calls.alter.toggleSpeaker" = "Fermer le haut-parleur";
+"accessibility.calls.alter.openConversation" = "Ouvrir la conversation";
+"accessibility.calls.alter.showDialpad" = "Pavé numérique";
+"accessibility.calls.alter.raiseHand" = "Baisser la main";
+"accessibility.conference.minimize" = "Minimiser";
+"accessibility.conference.maximize" = "Agrandir";
+"accessibility.conference.setModerator" = "Définir un modérateur";
+"accessibility.conference.unsetModerator" = "Supprimer un modérateur";
+"accessibility.conference.muteAudio" = "Couper le micro";
+"accessibility.conference.unmuteAudio" = "Ouvrir le micro";
+"accessibility.conference.hangup" = "Raccrochez";
+"accessibility.conference.lowerHand" = "Baisser la main";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
index d6807e1a9..c17f60a29 100644
--- a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Heure";
 "global.editPassword" = "Modifier le mot de passe";
 "global.confirmPassword" = "Confirmer le mot de passe";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "L'accès à votre caméra est désactivé. Veuillez l'activer dans les paramètres.";
+"global.confirm" = "Confirm";
+"global.connect" = "Se connecter";
 
 // Scan
 "scan.badQrCode" = "Code QR incorrect";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Répertoire public ";
 "smartlist.jamsResults" = "Résultats de la recherche";
 "smartlist.conversations" = "Conversations";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Aucune conversation ne correspond à votre recherche";
 "smartlist.newContact" = "Nouveau contact";
 "smartlist.newGroup" = "Nouveau groupe";
 "smartlist.accounts" = "Comptes";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Entrer un nom...";
 "smartlist.searchBar" = "Rechercher";
 "smartlist.noNetworkConnectivity" = "Aucune connectivité réseau";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Assurez-vous que l'accès au réseau mobile est activé dans vos paramètres.";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Ajouter un compte";
 "smartlist.noNumber" = "Le contact sélectionné n'a pas de numéro";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Inviter des amis";
 "smartlist.accounts" = "Comptes";
 "smartlist.disableDonation" = "Pas maintenant";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Si vous appréciez Jami et que vous croyez à notre mission, feriez-vous un don ?";
 "smartlist.inSynchronization" = "conversation en cours de synchronisation";
 "smartlist.newMessage" = "Nouveau message";
 
 // Conversation
 "conversation.addToContactsButton" = "Ajouter aux contcats";
 "conversation.addToContactsLabel" = "Ajouter au contacts ?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = " %@ ne fait pas partie de vos contacts.";
 "conversation.messagePlaceholder" = "Écrire à";
 "conversation.errorSavingImage" = "Une erreur s'est produite en sauvegardant l'image dans la galerie.";
 "conversation.receivedRequest" = "%@ vous a envoyé une invitation.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "J'ai déjà un compte";
 "welcome.linkDevice" = "Importer d'un autre appareil";
 "welcome.linkBackup" = "Importer à partir d'une sauvegarde";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Créer un compte Jami";
 "welcome.connectToJAMS" = "Créer un compte à partir d'un serveur de gestion de comptes Jami (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Rejoindre Jami";
 "createAccount.lookingForUsernameAvailability" = "Vérification de la disponibilité du nom d'utilisateur...";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Nom d'utilisateur incorrect. Veuillez saisir le nom d'utilisateur correct.";
 "createAccount.usernameAlreadyTaken" = "Nom d'utilisateur non-disponible";
 "createAccount.usernameValid" = "Le nom d'utilisateur est disponible.";
 "createAccount.UsernameNotRegisteredTitle" = "Erreur de réseau";
 "createAccount.UsernameNotRegisteredMessage" = "Le compte a été créé mais le nom d'utilisateur n'a pas été enregistré";
 "createAccount.timeoutTitle" = "Compte créé";
 "createAccount.timeoutMessage" = "L'enregistrement du nom d'utilisateur est en cours. Veuillez patienter...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurer un compte SIP existant.";
 "createAccount.creatingAccount" = "Création du compte";
 "createAccount.nameExplanation" = "Vous pouvez choisir un nom d'utilisateur pour aider les autres à vous trouver et à vous joindre plus facilement sur Jami.";
 "createAccount.newAccount" = "Nouveau compte";
@@ -192,15 +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.waitLinkToAccountTitle" = "Lier un compte";
-"linkToAccount.linkButtonTitle" = "Lier";
-"linkToAccount.linkDeviceTitle" = "Lier l'appareil";
-"linkToAccount.linkDeviceMessage" = "Allez sur \"Associer un nouvel appareil\" sur l'autre appareil pour voir le code QR ou le NIP";
-"linkToAccount.explanationMessage" = "Un NIP est nécessaire pour utiliser ce compte Jami sur cet appareil";
-"linkToAccount.pinPlaceholder" = "NIP";
-"linkToAccount.pinLabel" = "Entrer le code NIP";
-"linkToAccount.scanQRCode" = "Scanner le code QR";
-"linkToAccount.explanationPinMessage" = "Pour générer le code PIN, accédez aux paramètres de gestion du compte sur l'appareil contenant le compte que vous souhaitez lier. Sélectionnez \"Lier un nouvel appareil\". Vous recevrez le code PIN nécessaire pour remplir ce formulaire. Le code PIN n'est valable que pendant 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importer un compte Jami à partir d'un fichier d'archives local.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Erreur de révocation d'appareil";
 "accountPage.linkDeviceTitle" = "Associer un autre appareil";
 "accountPage.other" = "Autre";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom d'utilisateur enregistré seront IRRÉVOCABLEMENT PERDUS.";
 "accountPage.inviteFriends" = "Inviter des amis";
 "accountPage.contactMeOnJamiTitle" = "Contactez moi sur Jami !";
 "accountPage.contactMeOnJamiContant" = "Contactez-moi par l'identifiant : %s sur la plateforme distribuée de communication Jami. https://jami.net ";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Lier un Appareil";
-"linkDevice.passwordError" = "Mot de passe incorrect. Veuillez réessayer.";
 "linkDevice.networkError" = "Une erreur inconnue s'est produite lors de l'exportation du compte.";
-"linkDevice.defaultError" = "Une erreur s'est produite pendant l'export du compte.";
-"linkDevice.explanationMessage" = "Ouvrez Jami sur le nouvel appareil et choisissez « Lier cet appareil à un compte » pour terminer la procédure. Le code PIN expirera dans 10 minutes.";
-"linkDevice.hudMessage" = "Vérification en cours";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Démarrer appel audio";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Fermer";
 "accessibility.smartListSwitchAccounts" = "Changer de compte";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Votre compte actuel est %@";
 "accessibility.smartListAddAccount" = "Ajouter le compte";
 "accessibility.aboutJamiTitle" = "À propos de Jami";
 "accessibility.welcomeToJamiTitle" = "Bienvenue sur Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Entrer un nom d'utilisateur afin de vérifier sa disponibilité";
 "accessibility.profilePicturePicker" = "Image de profil";
 "accessibility.profilePicturePickerHint" = "Taper deux fois pour prendre une photo ou choisir une image dans votre bibliothèque";
 "accessibility.swarmPicturePicker" = "Image du groupe";
 "accessibility.swarmPicturePickerHint" = "Taper deux fois pour prendre une photo ou choisir une image dans votre bibliothèque";
 "accessibility.accountSummaryQrCode" = "Code QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Double tapotement pour voir le code QR du compte";
+"accessibility.accountSummaryEditProfileHint" = "Double tapotement pour modifier votre profil";
 "accessibility.accountSummaryEditSettingsButton" = "Paramètres";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Démarrer un appel audio avec %@";
+"accessibility.conversationStartVideoCall" = "Démarrer un appel vidéo avec %@";
 "accessibility.conversationComposeMessage" = "Écrire un message";
 "accessibility.conversationShareMedia" = "Partager un média";
 "accessibility.conversationCameraHint" = "Double-tap pour ouvrir la caméra";
 "accessibility.audioPlayerPlay" = "Jouer";
 "accessibility.audioPlayerPause" = "Pause";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ messages non lus";
 "accessibility.conversationRowBlocked" = "Conversation bloquées";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Dernier message sur %@";
+"accessibility.conversationRowSyncing" = "Synchronisation en cours";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En ligne";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRow" = "Invitation reçues : %@ invitation en attente";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Décliner l'invitation";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accepter l'invitation";
 "accessibility.messageBubbleDeleted" = "Message supprimé";
 "accessibility.messageBubbleEdited" = "Modifié";
 "accessibility.messageBubbleRead" = "Lu";
 "accessibility.messageBubbleUnread" = "Non lu";
-"accessibility.textNotAvailable" = "Message vide reçu le %@, c'est probablement un bug.";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message reçu le %@";
-"accessibility.text.sentOn" = "%@, message envoyé le %@";
-"accessibility.fileTransfer.receivedOn" = "Fichier : %@ , reçu le %@";
-"accessibility.fileTransfer.sentOn" = "Fichier : %@, envoyé le %@";
-"accessibility.call.lasted" = "Dernier";
-"accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Allumer la caméra";
+"accessibility.calls.default.pauseCall" = "Mettre l'appel en pause";
+"accessibility.calls.default.hangUpCall" = "Raccrocher";
 "accessibility.calls.default.addParticipant" = "Ajouter un participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.default.switchCamera" = "Changer de caméra";
+"accessibility.calls.default.toggleSpeaker" = "Activer le haut-parleur";
+"accessibility.calls.default.openConversation" = "Ouvrir la conversation";
+"accessibility.calls.default.showDialpad" = "Pavé numérique";
+"accessibility.calls.default.raiseHand" = "Lever la main";
+
+"accessibility.calls.alter.toggleAudio" = "Réouvrir le microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reprendre l'appel";
+"accessibility.calls.alter.hangUpCall" = "Raccrocher";
+"accessibility.calls.alter.addParticipant" = "Ajouter un participant";
+"accessibility.calls.alter.switchCamera" = "Changer de caméra";
+"accessibility.calls.alter.toggleSpeaker" = "Fermer le haut-parleur";
+"accessibility.calls.alter.openConversation" = "Ouvrir la conversation";
+"accessibility.calls.alter.showDialpad" = "Pavé numérique";
+"accessibility.calls.alter.raiseHand" = "Baisser la main";
+"accessibility.conference.minimize" = "Minimiser";
+"accessibility.conference.maximize" = "Agrandir";
+"accessibility.conference.setModerator" = "Définir un modérateur";
+"accessibility.conference.unsetModerator" = "Supprimer un modérateur";
+"accessibility.conference.muteAudio" = "Couper le son";
+"accessibility.conference.unmuteAudio" = "Ouvrir le micro";
+"accessibility.conference.hangup" = "Raccrocher";
+"accessibility.conference.lowerHand" = "Baisser la main";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
index 7dc5b5e30..1bb382f33 100644
--- a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Heure";
 "global.editPassword" = "Modifier le mot de passe";
 "global.confirmPassword" = "Confirmer le mot de passe";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "L'accès à votre caméra est désactivé. Veuillez l'activer dans les paramètres.";
+"global.confirm" = "Confirm";
+"global.connect" = "Se connecter";
 
 // Scan
 "scan.badQrCode" = "Code QR incorrect";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Répertoire public ";
 "smartlist.jamsResults" = "Résultats de la recherche";
 "smartlist.conversations" = "Conversations";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Aucune conversation ne correspond à votre recherche";
 "smartlist.newContact" = "Nouveau contact";
 "smartlist.newGroup" = "Nouveau groupe";
 "smartlist.accounts" = "Comptes";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Entrer un nom...";
 "smartlist.searchBar" = "Rechercher";
 "smartlist.noNetworkConnectivity" = "Pas d'accès au réseau";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Assurez-vous que l'accès au réseau mobile est activé dans vos paramètres.";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Ajouter un compte";
 "smartlist.noNumber" = "Le contact sélectionné n'a pas de numéro";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Inviter des amis";
 "smartlist.accounts" = "Comptes";
 "smartlist.disableDonation" = "Pas maintenant";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Si vous appréciez Jami et que vous croyez à notre mission, feriez-vous un don ?";
 "smartlist.inSynchronization" = "conversation en cours de synchronisation";
 "smartlist.newMessage" = "Nouveau message";
 
 // Conversation
 "conversation.addToContactsButton" = "Ajouter aux contcats";
 "conversation.addToContactsLabel" = "Ajouter au contacts ?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = " %@ ne fait pas partie de vos contacts.";
 "conversation.messagePlaceholder" = "Écrire à";
 "conversation.errorSavingImage" = "Une erreur s'est produite en sauvegardant l'image dans la galerie.";
 "conversation.receivedRequest" = "%@ vous a envoyé une invitation.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "J'ai déjà un compte";
 "welcome.linkDevice" = "Importer d'un autre appareil";
 "welcome.linkBackup" = "Importer à partir d'une sauvegarde";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Créer un compte Jami";
 "welcome.connectToJAMS" = "Créer un compte à partir d'un serveur de gestion de comptes Jami (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Rejoindre Jami";
 "createAccount.lookingForUsernameAvailability" = "Vérification de la disponibilité du nom d'utilisateur...";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Nom d'utilisateur incorrect. Veuillez saisir le nom d'utilisateur correct.";
 "createAccount.usernameAlreadyTaken" = "Nom d'utilisateur non-disponible";
 "createAccount.usernameValid" = "Le nom d'utilisateur est disponible.";
 "createAccount.UsernameNotRegisteredTitle" = "Erreur de réseau";
 "createAccount.UsernameNotRegisteredMessage" = "Le compte a été créé mais le nom d'utilisateur n'a pas été enregistré";
 "createAccount.timeoutTitle" = "Compte créé";
 "createAccount.timeoutMessage" = "L'enregistrement du nom d'utilisateur est en cours. Veuillez patienter...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurer un compte SIP existant.";
 "createAccount.creatingAccount" = "Création du compte";
 "createAccount.nameExplanation" = "Vous pouvez choisir un nom d'utilisateur pour aider les autres à vous trouver et à vous joindre plus facilement sur Jami.";
 "createAccount.newAccount" = "Nouveau compte";
@@ -192,15 +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.waitLinkToAccountTitle" = "Association du compte";
-"linkToAccount.linkButtonTitle" = "Lier";
-"linkToAccount.linkDeviceTitle" = "Lier l'appareil";
-"linkToAccount.linkDeviceMessage" = "Allez sur \"Associer un nouvel appareil\" sur l'autre appareil pour voir le code QR ou le NIP";
-"linkToAccount.explanationMessage" = "Un NIP est nécessaire pour utiliser ce compte Jami sur cet appareil";
-"linkToAccount.pinPlaceholder" = "NIP";
-"linkToAccount.pinLabel" = "Entrer le code NIP";
-"linkToAccount.scanQRCode" = "Scanner le code QR";
-"linkToAccount.explanationPinMessage" = "Pour générer le code PIN, accédez aux paramètres de gestion du compte sur l'appareil contenant le compte que vous souhaitez lier. Sélectionnez \"Lier un nouvel appareil\". Vous recevrez le code PIN nécessaire pour remplir ce formulaire. Le code PIN n'est valable que pendant 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importer un compte Jami à partir d'un fichier d'archives local.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Erreur de révocation d'appareil";
 "accountPage.linkDeviceTitle" = "Lier autre appareil";
 "accountPage.other" = "Autre";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom d'utilisateur enregistré seront IRRÉVOCABLEMENT PERDUS.";
 "accountPage.inviteFriends" = "Inviter des amis";
 "accountPage.contactMeOnJamiTitle" = "Contactez moi sur Jami !";
 "accountPage.contactMeOnJamiContant" = "Contactez-moi par l'identifiant : %s sur la plateforme distribuée de communication Jami. https://jami.net ";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Lier un nouvel appareil";
-"linkDevice.passwordError" = "Mot de passe incorrect. Veuillez réessayer.";
 "linkDevice.networkError" = "Une erreur inconnue s'est produite lors de l'exportation du compte.";
-"linkDevice.defaultError" = "Une erreur s'est produite pendant l'export du compte.";
-"linkDevice.explanationMessage" = "Ouvrez Jami sur le nouvel appareil et choisissez « Lier cet appareil à un compte » pour terminer la procédure. Le code PIN expirera dans 10 minutes.";
-"linkDevice.hudMessage" = "Vérification en cours";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Démarrer appel audio";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Fermer";
 "accessibility.smartListSwitchAccounts" = "Changer de compte";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Votre compte actuel est %@";
 "accessibility.smartListAddAccount" = "Ajouter le compte";
 "accessibility.aboutJamiTitle" = "À propos de Jami";
 "accessibility.welcomeToJamiTitle" = "Bienvenue sur Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Entrer un nom d'utilisateur afin de vérifier sa disponibilité";
 "accessibility.profilePicturePicker" = "Image de profil";
 "accessibility.profilePicturePickerHint" = "Taper deux fois pour prendre une photo ou choisir une image dans votre bibliothèque";
 "accessibility.swarmPicturePicker" = "Image du groupe";
 "accessibility.swarmPicturePickerHint" = "Taper deux fois pour prendre une photo ou choisir une image dans votre bibliothèque";
 "accessibility.accountSummaryQrCode" = "Code QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Double tapotement pour voir le code QR du compte";
+"accessibility.accountSummaryEditProfileHint" = "Double tapotement pour modifier votre profil";
 "accessibility.accountSummaryEditSettingsButton" = "Paramètres";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Démarrer un appel audio avec %@";
+"accessibility.conversationStartVideoCall" = "Démarrer un appel vidéo avec %@";
 "accessibility.conversationComposeMessage" = "Écrire un message";
 "accessibility.conversationShareMedia" = "Partager un média";
 "accessibility.conversationCameraHint" = "Double-tap pour ouvrir la caméra";
 "accessibility.audioPlayerPlay" = "Jouer";
 "accessibility.audioPlayerPause" = "Pause";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ messages non lus";
 "accessibility.conversationRowBlocked" = "Conversation bloquées";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Dernier message sur %@";
+"accessibility.conversationRowSyncing" = "Synchronisation en cours";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En ligne";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRow" = "Invitation reçues : %@ invitation en attente";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Décliner l'invitation";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accepter l'invitation";
 "accessibility.messageBubbleDeleted" = "Message supprimé";
 "accessibility.messageBubbleEdited" = "Modifié";
 "accessibility.messageBubbleRead" = "Lu";
 "accessibility.messageBubbleUnread" = "Non lu";
-"accessibility.textNotAvailable" = "Message vide reçu le %@, c'est probablement un bug.";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message reçu le %@";
-"accessibility.text.sentOn" = "%@, message envoyé le %@";
-"accessibility.fileTransfer.receivedOn" = "Fichier : %@ , reçu le %@";
-"accessibility.fileTransfer.sentOn" = "Fichier : %@, envoyé le %@";
-"accessibility.call.lasted" = "Dernier";
-"accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "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";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.default.switchCamera" = "Changer de caméra";
+"accessibility.calls.default.toggleSpeaker" = "Activer le haut-parleur";
+"accessibility.calls.default.openConversation" = "Ouvrir la conversation";
+"accessibility.calls.default.showDialpad" = "Pavé numérique";
+"accessibility.calls.default.raiseHand" = "Lever la main";
+
+"accessibility.calls.alter.toggleAudio" = "Réouvrir le microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reprendre l'appel";
+"accessibility.calls.alter.hangUpCall" = "Raccrochez";
+"accessibility.calls.alter.addParticipant" = "Ajouter un participant";
+"accessibility.calls.alter.switchCamera" = "Changer de caméra";
+"accessibility.calls.alter.toggleSpeaker" = "Fermer le haut-parleur";
+"accessibility.calls.alter.openConversation" = "Ouvrir la conversation";
+"accessibility.calls.alter.showDialpad" = "Pavé numérique";
+"accessibility.calls.alter.raiseHand" = "Baisser la main";
+"accessibility.conference.minimize" = "Minimiser";
+"accessibility.conference.maximize" = "Agrandir";
+"accessibility.conference.setModerator" = "Définir un modérateur";
+"accessibility.conference.unsetModerator" = "Supprimer un modérateur";
+"accessibility.conference.muteAudio" = "Couper le micro";
+"accessibility.conference.unmuteAudio" = "Ouvrir le micro";
+"accessibility.conference.hangup" = "Raccrochez";
+"accessibility.conference.lowerHand" = "Baisser la main";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
index 50c74d695..d89fac96d 100644
--- a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Durée";
 "global.editPassword" = "Modifier le mot de passe";
 "global.confirmPassword" = "Confirmer le mot de passe";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "L'accès à votre caméra est désactivé. Veuillez l'activer dans les paramètres.";
+"global.confirm" = "Confirm";
+"global.connect" = "Se connecter";
 
 // Scan
 "scan.badQrCode" = "Code QR incorrect";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Répertoire public ";
 "smartlist.jamsResults" = "Résultats de la recherche";
 "smartlist.conversations" = "Conversations";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Aucune conversation ne correspond à votre recherche";
 "smartlist.newContact" = "Nouveau contact";
 "smartlist.newGroup" = "Nouveau groupe";
 "smartlist.accounts" = "Comptes";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Entrer un nom...";
 "smartlist.searchBar" = "Rechercher";
 "smartlist.noNetworkConnectivity" = "Aucune connexion au réseau n'est possible";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Assurez-vous que l'accès au réseau mobile est activé dans vos paramètres.";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Ajouter un compte";
 "smartlist.noNumber" = "Le contact sélectionné n'a pas de numéro";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Inviter des amis";
 "smartlist.accounts" = "Comptes";
 "smartlist.disableDonation" = "Pas maintenant";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Si vous appréciez Jami et que vous croyez à notre mission, feriez-vous un don ?";
 "smartlist.inSynchronization" = "conversation en cours de synchronisation";
 "smartlist.newMessage" = "Nouveau message";
 
 // Conversation
 "conversation.addToContactsButton" = "Ajouter aux contcats";
 "conversation.addToContactsLabel" = "Ajouter aux contacts ?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = " %@ ne fait pas partie de vos contacts.";
 "conversation.messagePlaceholder" = "Écrire à";
 "conversation.errorSavingImage" = "Une erreur s'est produite en sauvegardant l'image dans la galerie.";
 "conversation.receivedRequest" = "%@ vous a envoyé une invitation.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "J'ai déjà un compte";
 "welcome.linkDevice" = "Importer d'un autre appareil";
 "welcome.linkBackup" = "Importer à partir d'une sauvegarde";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Créer un compte Jami";
 "welcome.connectToJAMS" = "Créer un compte à partir d'un serveur de gestion de comptes Jami (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Rejoindre Jami";
 "createAccount.lookingForUsernameAvailability" = "Vérification de la disponibilité du nom d'utilisateur...";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Nom d'utilisateur incorrect. Veuillez saisir le nom d'utilisateur correct.";
 "createAccount.usernameAlreadyTaken" = "Nom d'utilisateur non-disponible";
 "createAccount.usernameValid" = "Le nom d'utilisateur est disponible.";
 "createAccount.UsernameNotRegisteredTitle" = "Erreur de réseau";
 "createAccount.UsernameNotRegisteredMessage" = "Le compte a été créé mais le nom d'utilisateur n'a pas été enregistré";
 "createAccount.timeoutTitle" = "Compte créé";
 "createAccount.timeoutMessage" = "L'enregistrement du nom d'utilisateur est en cours. Veuillez patienter...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurer un compte SIP existant.";
 "createAccount.creatingAccount" = "Création du compte";
 "createAccount.nameExplanation" = "Vous pouvez choisir un nom d'utilisateur pour aider les autres à vous trouver et à vous joindre plus facilement sur Jami.";
 "createAccount.newAccount" = "Nouveau compte";
@@ -192,15 +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.waitLinkToAccountTitle" = "Compte en cours de liaison";
-"linkToAccount.linkButtonTitle" = "Lier";
-"linkToAccount.linkDeviceTitle" = "Appareil en cours de liaison";
-"linkToAccount.linkDeviceMessage" = "Allez sur \"Associer un nouvel appareil\" sur l'autre appareil pour voir le code QR ou le NIP";
-"linkToAccount.explanationMessage" = "Un NIP est nécessaire pour utiliser ce compte Jami sur cet appareil";
-"linkToAccount.pinPlaceholder" = "NIP";
-"linkToAccount.pinLabel" = "Entrer le code NIP";
-"linkToAccount.scanQRCode" = "Scanner le code QR";
-"linkToAccount.explanationPinMessage" = "Pour générer le code PIN, accédez aux paramètres de gestion du compte sur l'appareil contenant le compte que vous souhaitez lier. Sélectionnez \"Lier un nouvel appareil\". Vous recevrez le code PIN nécessaire pour remplir ce formulaire. Le code PIN n'est valable que pendant 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importer un compte Jami à partir d'un fichier d'archives local.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Erreur de révocation d'appareil";
 "accountPage.linkDeviceTitle" = "Lier autre appareil";
 "accountPage.other" = "Autre";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom d'utilisateur enregistré seront IRRÉVOCABLEMENT PERDUS.";
 "accountPage.inviteFriends" = "Inviter des amis";
 "accountPage.contactMeOnJamiTitle" = "Contactez moi sur Jami !";
 "accountPage.contactMeOnJamiContant" = "Contactez-moi par l'identifiant : %s sur la plateforme distribuée de communication Jami. https://jami.net ";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Lier un nouvel appareil";
-"linkDevice.passwordError" = "Mot de passe incorrect. Veuillez réessayer.";
 "linkDevice.networkError" = "Une erreur inconnue s'est produite lors de l'exportation du compte.";
-"linkDevice.defaultError" = "Une erreur s'est produite pendant l'export du compte.";
-"linkDevice.explanationMessage" = "Ouvrez Jami sur le nouvel appareil et choisissez « Lier cet appareil à un compte » pour terminer la procédure. Le code PIN expirera dans 10 minutes.";
-"linkDevice.hudMessage" = "Vérification en cours";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Démarrer appel audio";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Fermer";
 "accessibility.smartListSwitchAccounts" = "Changer de compte";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Votre compte actuel est %@";
 "accessibility.smartListAddAccount" = "Ajouter le compte";
 "accessibility.aboutJamiTitle" = "À propos de Jami";
 "accessibility.welcomeToJamiTitle" = "Bienvenue sur Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Entrer un nom d'utilisateur afin de vérifier sa disponibilité";
 "accessibility.profilePicturePicker" = "Image de profil";
 "accessibility.profilePicturePickerHint" = "Taper deux fois pour prendre une photo ou choisir une image dans votre bibliothèque";
 "accessibility.swarmPicturePicker" = "Image du groupe";
 "accessibility.swarmPicturePickerHint" = "Taper deux fois pour prendre une photo ou choisir une image dans votre bibliothèque";
 "accessibility.accountSummaryQrCode" = "Code QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Double tapotement pour voir le code QR du compte";
+"accessibility.accountSummaryEditProfileHint" = "Double tapotement pour modifier votre profil";
 "accessibility.accountSummaryEditSettingsButton" = "Réglages";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Démarrer un appel audio avec %@";
+"accessibility.conversationStartVideoCall" = "Démarrer un appel vidéo avec %@";
 "accessibility.conversationComposeMessage" = "Écrire un message";
 "accessibility.conversationShareMedia" = "Partager un média";
 "accessibility.conversationCameraHint" = "Double-tap pour ouvrir la caméra";
 "accessibility.audioPlayerPlay" = "Jouer";
 "accessibility.audioPlayerPause" = "Pause";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ messages non lus";
 "accessibility.conversationRowBlocked" = "Conversation bloquées";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Dernier message sur %@";
+"accessibility.conversationRowSyncing" = "Synchronisation en cours";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En ligne";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRow" = "Invitation reçues : %@ invitation en attente";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Décliner l'invitation";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accepter l'invitation";
 "accessibility.messageBubbleDeleted" = "Message supprimé";
 "accessibility.messageBubbleEdited" = "Modifié";
 "accessibility.messageBubbleRead" = "Lu";
 "accessibility.messageBubbleUnread" = "Non lu";
-"accessibility.textNotAvailable" = "Message vide reçu le %@, c'est probablement un bug.";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message reçu le %@";
-"accessibility.text.sentOn" = "%@, message envoyé le %@";
-"accessibility.fileTransfer.receivedOn" = "Fichier : %@ , reçu le %@";
-"accessibility.fileTransfer.sentOn" = "Fichier : %@, envoyé le %@";
-"accessibility.call.lasted" = "Dernier";
-"accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Allumer la caméra";
+"accessibility.calls.default.pauseCall" = "Mettre l'appel en pause";
+"accessibility.calls.default.hangUpCall" = "Raccrocher";
 "accessibility.calls.default.addParticipant" = "Ajouter un participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.default.switchCamera" = "Changer de caméra";
+"accessibility.calls.default.toggleSpeaker" = "Activer le haut-parleur";
+"accessibility.calls.default.openConversation" = "Ouvrir la conversation";
+"accessibility.calls.default.showDialpad" = "Pavé numérique";
+"accessibility.calls.default.raiseHand" = "Lever la main";
+
+"accessibility.calls.alter.toggleAudio" = "Réouvrir le microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reprendre l'appel";
+"accessibility.calls.alter.hangUpCall" = "Raccrocher";
+"accessibility.calls.alter.addParticipant" = "Ajouter un participant";
+"accessibility.calls.alter.switchCamera" = "Changer de caméra";
+"accessibility.calls.alter.toggleSpeaker" = "Fermer le haut-parleur";
+"accessibility.calls.alter.openConversation" = "Ouvrir la conversation";
+"accessibility.calls.alter.showDialpad" = "Pavé numérique";
+"accessibility.calls.alter.raiseHand" = "Baisser la main";
+"accessibility.conference.minimize" = "Minimiser";
+"accessibility.conference.maximize" = "Agrandir";
+"accessibility.conference.setModerator" = "Définir un modérateur";
+"accessibility.conference.unsetModerator" = "Supprimer un modérateur";
+"accessibility.conference.muteAudio" = "Couper le micro";
 "accessibility.conference.unmuteAudio" = "Ouvrir le micro";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Raccrocher";
+"accessibility.conference.lowerHand" = "Baisser la main";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/fr.lproj/Localizable.strings b/Ring/Ring/Resources/fr.lproj/Localizable.strings
index d727cbbe4..6ba0db656 100644
--- a/Ring/Ring/Resources/fr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Durée";
 "global.editPassword" = "Modifier le mot de passe";
 "global.confirmPassword" = "Confirmer le mot de passe";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "L'accès à votre caméra est désactivé. Veuillez l'activer dans les paramètres.";
+"global.confirm" = "Confirm";
+"global.connect" = "Se connecter";
 
 // Scan
 "scan.badQrCode" = "Code QR incorrect";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Répertoire public";
 "smartlist.jamsResults" = "Résultats de la recherche";
 "smartlist.conversations" = "Conversations";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Aucune conversation ne correspond à votre recherche";
 "smartlist.newContact" = "Nouveau contact";
 "smartlist.newGroup" = "Nouveau groupe";
 "smartlist.accounts" = "Comptes";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Entrer un nom...";
 "smartlist.searchBar" = "Rechercher";
 "smartlist.noNetworkConnectivity" = "Pas d'accès au réseau";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Assurez-vous que l'accès au réseau mobile est activé dans vos paramètres.";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Ajouter un compte";
 "smartlist.noNumber" = "Le contact sélectionné n'a pas de numéro";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Inviter des amis";
 "smartlist.accounts" = "Comptes";
 "smartlist.disableDonation" = "Pas maintenant";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Si vous appréciez Jami et que vous croyez à notre mission, feriez-vous un don ?";
 "smartlist.inSynchronization" = "conversation en cours de synchronisation";
 "smartlist.newMessage" = "Nouveau message";
 
 // Conversation
 "conversation.addToContactsButton" = "Ajouter aux contacts";
 "conversation.addToContactsLabel" = "Ajouter aux contacts ?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = " %@ ne fait pas partie de vos contacts.";
 "conversation.messagePlaceholder" = "Écrire à";
 "conversation.errorSavingImage" = "Une erreur s'est produite en sauvegardant l'image dans la galerie.";
 "conversation.receivedRequest" = "%@ vous a envoyé une invitation.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "J'ai déjà un compte";
 "welcome.linkDevice" = "Importer d'un autre appareil";
 "welcome.linkBackup" = "Importer à partir d'une sauvegarde";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Créer un compte Jami";
 "welcome.connectToJAMS" = "Créer un compte à partir d'un serveur de gestion de comptes Jami (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Rejoindre Jami";
 "createAccount.lookingForUsernameAvailability" = "Vérification de la disponibilité du nom d'utilisateur ...";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Nom d'utilisateur incorrect. Veuillez saisir le nom d'utilisateur correct.";
 "createAccount.usernameAlreadyTaken" = "Ce nom d'utilisateur est déjà utilisé";
 "createAccount.usernameValid" = "Le nom d'utilisateur est disponible.";
 "createAccount.UsernameNotRegisteredTitle" = "Erreur de réseau";
 "createAccount.UsernameNotRegisteredMessage" = "Le compte a été créé mais le nom d'utilisateur n'a pas été enregistré";
 "createAccount.timeoutTitle" = "Compte créé";
 "createAccount.timeoutMessage" = "L'enregistrement du nom d'utilisateur est en cours. Veuillez patienter...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurer un compte SIP existant.";
 "createAccount.creatingAccount" = "Création du compte";
 "createAccount.nameExplanation" = "Vous pouvez choisir un nom d'utilisateur pour aider les autres à vous trouver et à vous joindre plus facilement sur Jami.";
 "createAccount.newAccount" = "Nouveau compte";
@@ -192,15 +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.waitLinkToAccountTitle" = "Association du compte";
-"linkToAccount.linkButtonTitle" = "Lier";
-"linkToAccount.linkDeviceTitle" = "Associer l'appareil";
-"linkToAccount.linkDeviceMessage" = "Allez sur \"Associer un nouvel appareil\" sur l'autre appareil pour voir le code QR ou le NIP";
-"linkToAccount.explanationMessage" = "Un NIP est nécessaire pour utiliser ce compte Jami sur cet appareil";
-"linkToAccount.pinPlaceholder" = "NIP";
-"linkToAccount.pinLabel" = "Entrer le code NIP";
-"linkToAccount.scanQRCode" = "Scanner le code QR";
-"linkToAccount.explanationPinMessage" = "Pour générer le code NIP, accédez aux paramètres de gestion du compte sur l'appareil contenant le compte que vous souhaitez lier. Sélectionnez \"Lier un nouvel appareil\". Vous recevrez le code NIP nécessaire pour remplir ce formulaire. Le code NIP n'est valable que pendant 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importer un compte Jami à partir d'un fichier d'archives local.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Erreur de révocation d'appareil";
 "accountPage.linkDeviceTitle" = "Associer un nouvel appareil";
 "accountPage.other" = "Autre";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom d'utilisateur enregistré seront IRRÉVOCABLEMENT PERDUS.";
 "accountPage.inviteFriends" = "Inviter des amis";
 "accountPage.contactMeOnJamiTitle" = "Contactez moi sur Jami!";
 "accountPage.contactMeOnJamiContant" = "Contactez-moi par l'identifiant : %s sur la plateforme distribuée de communication Jami. https://jami.net ";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Associer un nouvel appareil";
-"linkDevice.passwordError" = "Mot de passe incorrect. Veuillez réessayer.";
 "linkDevice.networkError" = "Une erreur inconnue s'est produite lors de l'exportation du compte.";
-"linkDevice.defaultError" = "Une erreur s'est produite pendant l'export du compte.";
-"linkDevice.explanationMessage" = "Ouvrez Jami sur le nouvel appareil et choisissez « Lier cet appareil à un compte » pour terminer la procédure. Le code PIN expirera dans 10 minutes.";
-"linkDevice.hudMessage" = "Vérification";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Démarrer un appel audio";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Fermer";
 "accessibility.smartListSwitchAccounts" = "Changer de compte";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Votre compte actuel est %@";
 "accessibility.smartListAddAccount" = "Ajouter le compte";
 "accessibility.aboutJamiTitle" = "À propos de Jami";
 "accessibility.welcomeToJamiTitle" = "Bienvenue sur Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Entrer un nom d'utilisateur afin de vérifier sa disponibilité";
 "accessibility.profilePicturePicker" = "Image de profil";
 "accessibility.profilePicturePickerHint" = "Taper deux fois pour prendre une photo ou choisir une image dans votre bibliothèque";
 "accessibility.swarmPicturePicker" = "Image du groupe";
 "accessibility.swarmPicturePickerHint" = "Taper deux fois pour prendre une photo ou choisir une image dans votre bibliothèque";
 "accessibility.accountSummaryQrCode" = "Code QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Double tapotement pour voir le code QR du compte";
+"accessibility.accountSummaryEditProfileHint" = "Double tapotement pour modifier votre profil";
 "accessibility.accountSummaryEditSettingsButton" = "Paramètres";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Démarrer un appel audio avec %@";
+"accessibility.conversationStartVideoCall" = "Démarrer un appel vidéo avec %@";
 "accessibility.conversationComposeMessage" = "Écrire un message";
 "accessibility.conversationShareMedia" = "Partager un média";
 "accessibility.conversationCameraHint" = "Double-tap pour ouvrir la caméra";
 "accessibility.audioPlayerPlay" = "Lire";
 "accessibility.audioPlayerPause" = "Pause";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ messages non lus";
 "accessibility.conversationRowBlocked" = "Conversation bloquées";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Dernier message sur %@";
+"accessibility.conversationRowSyncing" = "Synchronisation en cours";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En ligne";
 "accessibility.userPresenceAvailable" = "Disponible";
-"accessibility.pendingRequestsRow" = "Invitation reçues : %@ invitation en attente";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Décliner l'invitation";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accepter l'invitation";
 "accessibility.messageBubbleDeleted" = "Message supprimé";
 "accessibility.messageBubbleEdited" = "Modifié";
 "accessibility.messageBubbleRead" = "Lu";
 "accessibility.messageBubbleUnread" = "Non lu";
-"accessibility.textNotAvailable" = "Message vide reçu le %@, c'est probablement un bug.";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message reçu le %@";
-"accessibility.text.sentOn" = "%@, message envoyé le %@";
-"accessibility.fileTransfer.receivedOn" = "Fichier : %@ , reçu le %@";
-"accessibility.fileTransfer.sentOn" = "Fichier : %@, envoyé le %@";
-"accessibility.call.lasted" = "Dernier";
-"accessibility.fileTransferNoName" = "Fichier reçu le %@, son nom est indisponible";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "Mettre l'appel en attente";
+"accessibility.calls.default.hangUpCall" = "Raccrocher";
 "accessibility.calls.default.addParticipant" = "Ajouter un participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
-"accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.calls.default.switchCamera" = "Changer de caméra";
+"accessibility.calls.default.toggleSpeaker" = "Activer le haut-parleur";
+"accessibility.calls.default.openConversation" = "Ouvrir la conversation";
+"accessibility.calls.default.showDialpad" = "Pavé numérique";
+"accessibility.calls.default.raiseHand" = "Lever la main";
+
+"accessibility.calls.alter.toggleAudio" = "Réouvrir le microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reprendre l'appel";
+"accessibility.calls.alter.hangUpCall" = "Raccrocher";
+"accessibility.calls.alter.addParticipant" = "Ajouter un participant";
+"accessibility.calls.alter.switchCamera" = "Changer de caméra";
+"accessibility.calls.alter.toggleSpeaker" = "Fermer le haut-parleur";
+"accessibility.calls.alter.openConversation" = "Ouvrir la conversation";
+"accessibility.calls.alter.showDialpad" = "Pavé numérique";
+"accessibility.calls.alter.raiseHand" = "Baisser la main";
+"accessibility.conference.minimize" = "Minimiser";
+"accessibility.conference.maximize" = "Maximiser";
+"accessibility.conference.setModerator" = "Définir un modérateur";
+"accessibility.conference.unsetModerator" = "Supprimer un modérateur";
+"accessibility.conference.muteAudio" = "Couper le micro";
+"accessibility.conference.unmuteAudio" = "Ouvrir le micro";
+"accessibility.conference.hangup" = "Raccrocher";
+"accessibility.conference.lowerHand" = "Baisser la main";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ga.lproj/Localizable.strings b/Ring/Ring/Resources/ga.lproj/Localizable.strings
index d6f46d9b8..a0c2cff93 100644
--- a/Ring/Ring/Resources/ga.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ga.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Pasfhocal a dhearbhú";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Déan nasc";
 
 // Scan
 "scan.badQrCode" = "Cód QR olc";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Tá cuntas agam cheana féin";
 "welcome.linkDevice" = "Importaíocht ó threalamh eile";
 "welcome.linkBackup" = "Importaí ó chúltaca archiv";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Creidigh cuntas Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Cúlra nasc";
-"linkToAccount.linkButtonTitle" = "Líon";
-"linkToAccount.linkDeviceTitle" = "Feidhmchlár nasc";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Cód QR scánaithe";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Cód 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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Cúltas Jami a allmhairí ó charrlann archiv áitiúil.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Déan nasc le feiste nua";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Feidhmiú";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Tosaigh glao fuaime";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Ar líne";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "A athchóiriú";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
+"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.calls.default.pauseCall" = "Calla stop";
 "accessibility.calls.default.hangUpCall" = "Hang up";
 "accessibility.calls.default.addParticipant" = "Cuid a chur le rannpháirtí";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Caidreamh oscailte";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Cuir lámh suas";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Déan athghníomhú glao";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.addParticipant" = "Cuid a chur le rannpháirtí";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Caidreamh oscailte";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "lámh íochtarach";
+"accessibility.conference.minimize" = "Cinntíbhí";
+"accessibility.conference.maximize" = "A mhéadú";
+"accessibility.conference.setModerator" = "Modhálaí a shuiteáil";
+"accessibility.conference.unsetModerator" = "Modhálaí neamhghnách";
+"accessibility.conference.muteAudio" = "Audio Mute";
 "accessibility.conference.unmuteAudio" = "Audio neamhbhuailte";
 "accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.lowerHand" = "lámh íochtarach";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/gl.lproj/Localizable.strings b/Ring/Ring/Resources/gl.lproj/Localizable.strings
index 0a2b94cd9..5ec5b2826 100644
--- a/Ring/Ring/Resources/gl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/gl.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Confirmar contrasinal";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Conectar";
 
 // Scan
 "scan.badQrCode" = "Mal código QR";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Xa teño unha conta.";
 "welcome.linkDevice" = "Importación a partir de outro dispositivo";
 "welcome.linkBackup" = "Importar desde ficheiro de apoio";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Crea unha conta Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Ligando conta";
-"linkToAccount.linkButtonTitle" = "Ligar";
-"linkToAccount.linkDeviceTitle" = "Ligar dispositivo";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Escanar código QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Código 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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importa a conta Jami do arquivo local.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Ligar novo dispositivo";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verificando";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Iniciar chamada de audio";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En liña";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "Pausa chamada";
+"accessibility.calls.default.hangUpCall" = "Colgar";
 "accessibility.calls.default.addParticipant" = "Engadir participante";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Abrir conversa";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Ergue a man";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Reanudar a chamada";
+"accessibility.calls.alter.hangUpCall" = "Colgar";
+"accessibility.calls.alter.addParticipant" = "Engadir participante";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Abrir conversa";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "Man inferior";
+"accessibility.conference.minimize" = "Minimizar";
+"accessibility.conference.maximize" = "Maximizar";
+"accessibility.conference.setModerator" = "Establecer moderador";
+"accessibility.conference.unsetModerator" = "Desactivar moderador";
+"accessibility.conference.muteAudio" = "Acalar audio";
 "accessibility.conference.unmuteAudio" = "Reactivar audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Colgar";
+"accessibility.conference.lowerHand" = "Man inferior";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/gu.lproj/Localizable.strings b/Ring/Ring/Resources/gu.lproj/Localizable.strings
index 9332d00f2..975fea7a2 100644
--- a/Ring/Ring/Resources/gu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/gu.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "પાસવર્ડની પુષ્ટિ કરો";
+"global.confirm" = "પુષ્ટિ";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "પુષ્ટિ";
+"global.connect" = "કનેક્ટ કરો";
 
 // Scan
 "scan.badQrCode" = "ખરાબ QR કોડ";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "મારી પાસે પહેલેથી જ એક એકાઉન્ટ છે";
 "welcome.linkDevice" = "અન્ય ઉપકરણમાંથી આયાત";
 "welcome.linkBackup" = "આર્કાઇવ બેકઅપ માંથી આયાત";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami એકાઉન્ટ બનાવો";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "ખાતાની લિંકિંગ";
-"linkToAccount.linkButtonTitle" = "લિંક";
-"linkToAccount.linkDeviceTitle" = "લિંક ઉપકરણ";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR કોડ સ્કેન કરો";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "ક્યૂઆર કોડ";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "સ્થાનિક આર્કાઇવ ફાઇલમાંથી જમી એકાઉન્ટ આયાત કરો.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "લિંક નવી ઉપકરણ";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "ચકાસણી";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ઑડિઓ કૉલ શરૂ કરો";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "ઓનલાઇન";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "સંપાદિત";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "વિરામ કૉલ";
+"accessibility.calls.default.hangUpCall" = "બંધ કરો";
 "accessibility.calls.default.addParticipant" = "ઉમેરો સહભાગી";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "ખુલ્લી વાતચીત";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "હાથ ઉઠાવો";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "કૉલ પુનઃ શરૂ કરો";
+"accessibility.calls.alter.hangUpCall" = "બંધ કરો";
+"accessibility.calls.alter.addParticipant" = "ઉમેરો સહભાગી";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "ખુલ્લી વાતચીત";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "નીચે હાથ";
+"accessibility.conference.minimize" = "ન્યૂનતમ";
+"accessibility.conference.maximize" = "મહત્તમ કરો";
+"accessibility.conference.setModerator" = "મધ્યસ્થ સેટ કરો";
+"accessibility.conference.unsetModerator" = "અનસેટ કરેલ મધ્યસ્થ";
+"accessibility.conference.muteAudio" = "મ્યૂટ ઑડિઓ";
 "accessibility.conference.unmuteAudio" = "અનમ્યૂટ ઑડિઓ";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "બંધ કરો";
+"accessibility.conference.lowerHand" = "નીચે હાથ";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/hak.lproj/Localizable.strings b/Ring/Ring/Resources/hak.lproj/Localizable.strings
index 4478e65c5..49840d142 100644
--- a/Ring/Ring/Resources/hak.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hak.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "æ—¶é—´";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "确认密码";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "连接";
 
 // Scan
 "scan.badQrCode" = "无效的二维码";
@@ -120,7 +123,7 @@
 "smartlist.inviteFriends" = "Invite friends";
 "smartlist.accounts" = "账户";
 "smartlist.disableDonation" = "现在不要";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "如果您喜欢使用 Jami 并相信我们的使命,您愿意捐款吗?";
 "smartlist.inSynchronization" = "conversation in synchronization";
 "smartlist.newMessage" = "新消息";
 
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "我已经有一个账户";
 "welcome.linkDevice" = "從其他裝置匯入";
 "welcome.linkBackup" = "从归档备份中导入";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "建立 Jami 帳號";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -181,7 +184,7 @@
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
 "createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以便他人在 Jami 上找到并联系您。";
 "createAccount.newAccount" = "新增帳號";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "关联账户";
-"linkToAccount.linkButtonTitle" = "关联";
-"linkToAccount.linkDeviceTitle" = "关联设备";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "使用此设备上的现有Jami帐户需要PIN码。";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "输入PIN码";
-"linkToAccount.scanQRCode" = "扫描 QR 码";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "二维码";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "设备吊销出错";
 "accountPage.linkDeviceTitle" = "关联另一台设备";
 "accountPage.other" = "å…¶ä»–";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "如果该帐户未备份或添加到其他设备,则该帐户和注册用户名将不可找回地丢失。";
 "accountPage.inviteFriends" = "Invite friends";
 "accountPage.contactMeOnJamiTitle" = "在 Jami 上联系我!";
 "accountPage.contactMeOnJamiContant" = "Contact me using “%s” on the Jami distributed communication platform: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "关联新设备";
-"linkDevice.passwordError" = "使用该密码无法解锁您的账户。";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "正在驗證";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -531,53 +552,55 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "線上";
 "accessibility.userPresenceAvailable" = "可获得的";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "拒绝邀请";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accept invitation";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "已编辑";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "启动摄像头";
+"accessibility.calls.default.pauseCall" = "暫停通話";
+"accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "举手";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "麦克风静音";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "恢复通话";
+"accessibility.calls.alter.hangUpCall" = "挂断";
+"accessibility.calls.alter.addParticipant" = "添加参与者";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "打开会话";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "放下手";
+"accessibility.conference.minimize" = "最小化";
+"accessibility.conference.maximize" = "最大化";
+"accessibility.conference.setModerator" = "設定主持人";
+"accessibility.conference.unsetModerator" = "取消設定主持人";
+"accessibility.conference.muteAudio" = "静音";
 "accessibility.conference.unmuteAudio" = "取消静音";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "挂断";
+"accessibility.conference.lowerHand" = "放下手";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/he.lproj/Localizable.strings b/Ring/Ring/Resources/he.lproj/Localizable.strings
index 9f1fe1075..caf0f4e3c 100644
--- a/Ring/Ring/Resources/he.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/he.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "זמן";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "אישור סיסמה";
+"global.confirm" = "אישר";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "אישר";
+"global.connect" = "חיבור";
 
 // Scan
 "scan.badQrCode" = "קוד QR גרוע";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "יש לי חשבון.";
 "welcome.linkDevice" = "ייבוא ממכשיר אחר";
 "welcome.linkBackup" = "ייבוא מאחזת תיק";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "ליצור חשבון Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "חיבור חשבונות";
-"linkToAccount.linkButtonTitle" = "קישור";
-"linkToAccount.linkDeviceTitle" = "מכשיר חיבור";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "סריק קוד QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "יבוא חשבון ג'מי מתיק הארכיון המקומי.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "קישור מכשיר חדש";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "אימות";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "תחילת שיחת קול";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "באינטרנט";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "מאורגן";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "הפסקת שיחת";
+"accessibility.calls.default.hangUpCall" = "   ניתוק";
 "accessibility.calls.default.addParticipant" = "הוסף משתתף";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "שיחה פתוחה";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "תרים את היד.";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "קם שוב";
+"accessibility.calls.alter.hangUpCall" = "   ניתוק";
+"accessibility.calls.alter.addParticipant" = "הוסף משתתף";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "שיחה פתוחה";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "יד התחתונה";
+"accessibility.conference.minimize" = "מינימום";
+"accessibility.conference.maximize" = "שימו את האפס";
+"accessibility.conference.setModerator" = "הגדרת המודרטור";
+"accessibility.conference.unsetModerator" = "מתקן לא מתאים";
+"accessibility.conference.muteAudio" = "השתק אודיו";
 "accessibility.conference.unmuteAudio" = "אוודיו לא שקט";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "   ניתוק";
+"accessibility.conference.lowerHand" = "יד התחתונה";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
index 87c394067..c7cfa4de6 100644
--- a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "पासवर्ड की पुष्टि करें";
+"global.confirm" = "पुष्टि करें";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "पुष्टि करें";
+"global.connect" = "कनेक्ट करें";
 
 // Scan
 "scan.badQrCode" = "खराब क्यूआर कोड";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "मेरे पास पहले से ही एक खाता है";
 "welcome.linkDevice" = "दूसरे उपकरण से आयात";
 "welcome.linkBackup" = "संग्रह बैकअप से आयात";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami खाता बनाएं";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "खाता लिंक";
-"linkToAccount.linkButtonTitle" = "लिंक";
-"linkToAccount.linkDeviceTitle" = "लिंक डिवाइस";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR कोड स्कैन करें";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "क्यूआर कोड";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "स्थानीय संग्रह फ़ाइल से Jami खाते आयात करें।";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "नई डिवाइस लिंक";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "सत्यापन";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ऑडियो कॉल प्रारंभ करें";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "ऑनलाइन";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "सम्पादित";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "विराम कॉल";
+"accessibility.calls.default.hangUpCall" = "फोन रख दे";
 "accessibility.calls.default.addParticipant" = "प्रतिभागी जोड़ें";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "खुली बातचीत";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "हाथ उठाओ";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "कैमरा रोकें";
+"accessibility.calls.alter.pauseCall" = "पुनः कॉल";
+"accessibility.calls.alter.hangUpCall" = "फोन रख दे";
+"accessibility.calls.alter.addParticipant" = "प्रतिभागी जोड़ें";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "खुली बातचीत";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "निचला हाथ";
+"accessibility.conference.minimize" = "न्यूनतम करें";
+"accessibility.conference.maximize" = "बड़ा करें";
+"accessibility.conference.setModerator" = "मॉडरेटर सेट करें";
+"accessibility.conference.unsetModerator" = "मॉडरेटर अनसेट करें";
+"accessibility.conference.muteAudio" = "मूक ऑडियो";
 "accessibility.conference.unmuteAudio" = "अमूत ऑडियो";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "फोन रख दे";
+"accessibility.conference.lowerHand" = "निचला हाथ";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/hi.lproj/Localizable.strings b/Ring/Ring/Resources/hi.lproj/Localizable.strings
index 8f18832aa..cbbe4c9a9 100644
--- a/Ring/Ring/Resources/hi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hi.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "पासवर्ड की पुष्टि करें";
+"global.confirm" = "पुष्टि करें";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "पुष्टि करें";
+"global.connect" = "कनेक्ट करें";
 
 // Scan
 "scan.badQrCode" = "खराब क्यूआर कोड";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "मेरे पास पहले से ही एक खाता है";
 "welcome.linkDevice" = "दूसरे उपकरण से आयात";
 "welcome.linkBackup" = "संग्रह बैकअप से आयात";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami खाता बनाएं";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "खाता लिंक";
-"linkToAccount.linkButtonTitle" = "लिंक";
-"linkToAccount.linkDeviceTitle" = "लिंक डिवाइस";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR कोड स्कैन करें";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "क्यूआर कोड";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "स्थानीय संग्रह फ़ाइल से Jami खाते आयात करें।";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "नई डिवाइस लिंक";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "सत्यापन";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ऑडियो कॉल प्रारंभ करें";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "ऑनलाइन";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "सम्पादित";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "विराम कॉल";
+"accessibility.calls.default.hangUpCall" = "फोन रख दे";
 "accessibility.calls.default.addParticipant" = "प्रतिभागी जोड़ें";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "खुली बातचीत";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "हाथ उठाओ";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "कैमरा रोकें";
+"accessibility.calls.alter.pauseCall" = "पुनः कॉल";
+"accessibility.calls.alter.hangUpCall" = "फोन रख दे";
+"accessibility.calls.alter.addParticipant" = "प्रतिभागी जोड़ें";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "खुली बातचीत";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "निचला हाथ";
+"accessibility.conference.minimize" = "न्यूनतम करें";
+"accessibility.conference.maximize" = "बड़ा करें";
+"accessibility.conference.setModerator" = "मॉडरेटर सेट करें";
+"accessibility.conference.unsetModerator" = "मॉडरेटर अनसेट करें";
+"accessibility.conference.muteAudio" = "मूक ऑडियो";
 "accessibility.conference.unmuteAudio" = "अमूत ऑडियो";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "फोन रख दे";
+"accessibility.conference.lowerHand" = "निचला हाथ";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/hr.lproj/Localizable.strings b/Ring/Ring/Resources/hr.lproj/Localizable.strings
index 211080267..ee5731718 100644
--- a/Ring/Ring/Resources/hr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hr.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Vrijeme";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Potvrdi lozinku";
+"global.confirm" = "Potvrdi";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Potvrdi";
+"global.connect" = "Povezivanje";
 
 // Scan
 "scan.badQrCode" = "Loš QR kod";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Već imam račun.";
 "welcome.linkDevice" = "Uvoz iz drugog uređaja";
 "welcome.linkBackup" = "Import iz arhiva";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Stvoriti račun Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Povezivanje računa";
-"linkToAccount.linkButtonTitle" = "Poveznica";
-"linkToAccount.linkDeviceTitle" = "Uređaj za povezivanje";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skeniranje QR koda";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR kod";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importiranje Jami računa iz lokalnog arhiva datoteka.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Povezivanje novog uređaja";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Provjeravanje";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Pokrenite audio poziv";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "U redigiranju";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "Pauza poziv";
+"accessibility.calls.default.hangUpCall" = "Poklopi";
 "accessibility.calls.default.addParticipant" = "Dodaj sugovornika";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Otvorena razgovor";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Podignite ruku";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Kamera za zaustavljanje";
+"accessibility.calls.alter.pauseCall" = "Nastavljanje poziva";
+"accessibility.calls.alter.hangUpCall" = "Poklopi";
+"accessibility.calls.alter.addParticipant" = "Dodaj sugovornika";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Otvorena razgovor";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "Dolnja ruka";
+"accessibility.conference.minimize" = "Minimiziraj";
+"accessibility.conference.maximize" = "Maksimiziraj";
+"accessibility.conference.setModerator" = "Nastavite moderator";
+"accessibility.conference.unsetModerator" = "Nepripremljen moderator";
+"accessibility.conference.muteAudio" = "Neiskupljeni audio";
 "accessibility.conference.unmuteAudio" = "Neusmreni audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Poklopi";
+"accessibility.conference.lowerHand" = "Dolnja ruka";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings b/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
index 211080267..ee5731718 100644
--- a/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Vrijeme";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Potvrdi lozinku";
+"global.confirm" = "Potvrdi";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Potvrdi";
+"global.connect" = "Povezivanje";
 
 // Scan
 "scan.badQrCode" = "Loš QR kod";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Već imam račun.";
 "welcome.linkDevice" = "Uvoz iz drugog uređaja";
 "welcome.linkBackup" = "Import iz arhiva";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Stvoriti račun Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Povezivanje računa";
-"linkToAccount.linkButtonTitle" = "Poveznica";
-"linkToAccount.linkDeviceTitle" = "Uređaj za povezivanje";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skeniranje QR koda";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR kod";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importiranje Jami računa iz lokalnog arhiva datoteka.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Povezivanje novog uređaja";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Provjeravanje";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Pokrenite audio poziv";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "U redigiranju";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "Pauza poziv";
+"accessibility.calls.default.hangUpCall" = "Poklopi";
 "accessibility.calls.default.addParticipant" = "Dodaj sugovornika";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Otvorena razgovor";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Podignite ruku";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Kamera za zaustavljanje";
+"accessibility.calls.alter.pauseCall" = "Nastavljanje poziva";
+"accessibility.calls.alter.hangUpCall" = "Poklopi";
+"accessibility.calls.alter.addParticipant" = "Dodaj sugovornika";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Otvorena razgovor";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "Dolnja ruka";
+"accessibility.conference.minimize" = "Minimiziraj";
+"accessibility.conference.maximize" = "Maksimiziraj";
+"accessibility.conference.setModerator" = "Nastavite moderator";
+"accessibility.conference.unsetModerator" = "Nepripremljen moderator";
+"accessibility.conference.muteAudio" = "Neiskupljeni audio";
 "accessibility.conference.unmuteAudio" = "Neusmreni audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Poklopi";
+"accessibility.conference.lowerHand" = "Dolnja ruka";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/hu.lproj/Localizable.strings b/Ring/Ring/Resources/hu.lproj/Localizable.strings
index 0a0c6ce7f..03086acd6 100644
--- a/Ring/Ring/Resources/hu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hu.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Idő";
 "global.editPassword" = "Jelszó megváltoztatása";
 "global.confirmPassword" = "Jelszó megerősítése";
+"global.confirm" = "Megerősítés";
 "global.cameraDisabled" = "A fényképezőgép használati engedélye le van tiltva. A funkció használatát engedélyezze az eszköz beállításaiban.";
+"global.confirm" = "Megerősítés";
+"global.connect" = "Kapcsolódás";
 
 // Scan
 "scan.badQrCode" = "Rossz QR-kód";
@@ -90,7 +93,7 @@
 "swarm.newGroup" = "Új csoport létrehozása";
 "swarm.namePlaceholder" = "Csoport neve";
 "swarm.explanationText" = "A csoport létrehozása után a tagok bármikor meghívhatók.";
-"swarm.customizeProfile" = "Csoportprofil testreszabása";
+"swarm.customizeProfile" = "Csoportnévjegy testreszabása";
 "swarm.changePicture" = "Csoportkép megváltoztatása";
 "swarm.customize" = "Csoport testreszabása";
 "swarm.selectContacts" = "Kapcsolattartók kijelölése";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Nyilvános címtár";
 "smartlist.jamsResults" = "Keresési eredménye";
 "smartlist.conversations" = "Beszélgetések";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Nincsenek a keresési feltételeknek megfelelő beszélgetések.";
 "smartlist.newContact" = "Új kapcsolattartó";
 "smartlist.newGroup" = "Új csoport";
 "smartlist.accounts" = "Fiókok";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Név megadása…";
 "smartlist.searchBar" = "Keresés";
 "smartlist.noNetworkConnectivity" = "Nincs hálózati kapcsolat";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Győződjön meg arról, hogy a beállításokban engedélyezve van a mobilhálózati hozzáférést.";
 "smartlist.accountsTitle" = "Fiókok";
 "smartlist.addAccountButton" = "+ Fiók hozzáadása";
 "smartlist.noNumber" = "A kijelölt kapcsolattartnak nincsenek SIP-számák";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Barátok és ismerősök meghívása";
 "smartlist.accounts" = "Fiókok";
 "smartlist.disableDonation" = "Máskor";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Ha értékeli a Jami használatát, és hisz a küldetésünkben, szeretne adományozni?";
 "smartlist.inSynchronization" = "beszélgetés összehangolásában";
 "smartlist.newMessage" = "Új üzenet";
 
 // Conversation
 "conversation.addToContactsButton" = "Hozzáadás a kapcsolattartók közé";
 "conversation.addToContactsLabel" = "Hozzáadás a kapcsolattartók közé?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ nem szerepel a kapcsolattartólistáján";
 "conversation.messagePlaceholder" = "Írás a következő(k)nek:";
 "conversation.errorSavingImage" = "Hiba történt a kép gyűjteménybe történő mentése közben.";
 "conversation.receivedRequest" = "%@ beszélgetésre szóló meghívót küldött Önnek.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Már van fiókom";
 "welcome.linkDevice" = "Importálás másik eszközről";
 "welcome.linkBackup" = "Importálás archívum biztonsági másolatból";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami-fiók létrehozása";
 "welcome.connectToJAMS" = "Csatlakozás a Jami-fiókkezelő kiszolgálóhoz (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Jami csatlakozása";
 "createAccount.lookingForUsernameAvailability" = "Felhasználónév elérhetőségének ellenőrzése…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Érvénytelen felhasználónév. Kérjük, adja meg a helyes felhasználónevet.";
 "createAccount.usernameAlreadyTaken" = "A felhasználónév már foglalt";
 "createAccount.usernameValid" = "A felhasználónév elérhető.";
 "createAccount.UsernameNotRegisteredTitle" = "Hálózati hiba";
 "createAccount.UsernameNotRegisteredMessage" = "A fiók létrehozva de a felhasználónevét nincs bejegyzett";
 "createAccount.timeoutTitle" = "Fiók létrehozva";
 "createAccount.timeoutMessage" = "Felhasználónév bejegyeztetése folyamatban van. Kérjük, várjon…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Meglévő SIP-fiók beállítása";
 "createAccount.creatingAccount" = "Fiók létrehozása";
 "createAccount.nameExplanation" = "Regisztráljon felhasználónevet, hogy mások könnyebben megtalálják és elérjék Önt a Jamin.";
 "createAccount.newAccount" = "Új fiók";
@@ -192,15 +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.waitLinkToAccountTitle" = "Fiók összekapcsolása";
-"linkToAccount.linkButtonTitle" = "Kapcsolat";
-"linkToAccount.linkDeviceTitle" = "Eszköz összekapcsolása";
-"linkToAccount.linkDeviceMessage" = "„Új eszköz összekapcsolása” kijelölése egy másik Jami alkalmazásból a QR-kód megjelenítéséhez vagy a PIN-kód generálásához.";
-"linkToAccount.explanationMessage" = "Meglévő Jami-fiók használatához ezen az eszközön PIN-kód szükséges.";
-"linkToAccount.pinPlaceholder" = "PIN-kód";
-"linkToAccount.pinLabel" = "PIN-kód megadása";
-"linkToAccount.scanQRCode" = "QR-kód beolvasása";
-"linkToAccount.explanationPinMessage" = "A PIN-kód létrehozásához lépjen a fiókkezelési beállításokhoz azon az eszközön, amelyen az összekapcsolni kívánt fiók található. Válassza az „Új eszköz összekapcsolása” lehetőséget. Megkapja az űrlap kitöltéséhez szükséges PIN-kódot. A PIN-kód 10 perc múlva lejár.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR-kód";
+"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" = "Kilépés";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Jami-fiók importálása a helyi archívfájlból.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Eszköz visszavonási hiba";
 "accountPage.linkDeviceTitle" = "Eszköz összekapcsolása fiókhoz";
 "accountPage.other" = "Másik";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Ha nincs készített biztonsági másolatot, vagy nincs összekapcsolt eszközt a fiókról, akkor a fiók és a regisztrált felhasználónév VISSZAVONHATATLANUL ELVESZIK.";
 "accountPage.inviteFriends" = "Barátok és ismerősök meghívása";
 "accountPage.contactMeOnJamiTitle" = "Lépjen kapcsolatba velem a Jami-n!";
 "accountPage.contactMeOnJamiContant" = "Lépjen kapcsolatba velem a(z) „%s” használatával a Jami elosztott kommunikációs platformon: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Új eszköz összekapcsolása";
-"linkDevice.passwordError" = "Hibás jelszó. Próbálja meg újra a helyes jelszó megadásával.";
 "linkDevice.networkError" = "Hálózati hiba történt a fiók exportálása közben.";
-"linkDevice.defaultError" = "Hiba történt a fiók exportálása közben.";
-"linkDevice.explanationMessage" = "Nyissa meg a Jami-alkalmazást az új eszközön, és jelölje ki az „Eszköz összekapcsolása fiókkal” lehetőséget a folyamat befejezéséhez. A PIN-kód 10 perc múlva lejár.";
-"linkDevice.hudMessage" = "Ellenőrzése";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Hanghívás indítása";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Bezárás";
 "accessibility.smartListSwitchAccounts" = "Fiókváltás";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "A jelenlegi fiók %@";
 "accessibility.smartListAddAccount" = "Fiók hozzáadása";
 "accessibility.aboutJamiTitle" = "A Jami névjegye";
 "accessibility.welcomeToJamiTitle" = "Üdvözli a Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Felhasználónév megadása az elérhetőség ellenőrzése.";
 "accessibility.profilePicturePicker" = "Névjegykép";
 "accessibility.profilePicturePickerHint" = "Koppintson duplán a kép készítéséhez vagy a könyvtárból kijelölendő képhez";
 "accessibility.swarmPicturePicker" = "Csoportkép";
 "accessibility.swarmPicturePickerHint" = "Koppintson duplán a kép készítéséhez vagy a könyvtárból kijelölendő képhez";
 "accessibility.accountSummaryQrCode" = "QR-kód";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Koppintson duplán a fiók QR-kódjának megtekintéséhez";
+"accessibility.accountSummaryEditProfileHint" = "Koppintson duplán a névjegy szerkesztéséhez";
 "accessibility.accountSummaryEditSettingsButton" = "Beállítások";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Hanghívás indítása a következővel: %@";
+"accessibility.conversationStartVideoCall" = "Videohívás indítása a következővel: %@";
 "accessibility.conversationComposeMessage" = "Üzenet írása";
 "accessibility.conversationShareMedia" = "Média megosztása";
 "accessibility.conversationCameraHint" = "Koppintson duplán a fényképezőgép megnyitásához";
 "accessibility.audioPlayerPlay" = "Lejátszás";
 "accessibility.audioPlayerPause" = "Megállítás";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ olvasatlan üzenet.";
 "accessibility.conversationRowBlocked" = "Beszélgetés letiltva";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Utolsó üzenet időpontja: %@";
+"accessibility.conversationRowSyncing" = "Összehangolás folyamatban";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Elérhető";
 "accessibility.userPresenceAvailable" = "Elérhető";
-"accessibility.pendingRequestsRow" = "Meghívó érkezett: %@ függőben lévő meghívó";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Meghívó érkezett: %@ függőben lévő meghívó";
 "accessibility.pendingRequestsRowHint" = "Koppintson duplán a kapott meghívók áttekintéséhez és megválaszolásához";
 "accessibility.pendingRequestsListBlockUser" = "Meghívó feladójának letiltása";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Meghívás visszautasítása";
 "accessibility.pendingRequestsListAcceptInvitation" = "Meghívás elfogadása";
 "accessibility.messageBubbleDeleted" = "Üzenet törölve";
 "accessibility.messageBubbleEdited" = "Szerkesztve";
 "accessibility.messageBubbleRead" = "Olvasott";
 "accessibility.messageBubbleUnread" = "Olvasatlan";
-"accessibility.textNotAvailable" = "Szöveges üzenet érkezésének ideje: %@, nincs elérhető tartalom";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Fájl érkezésének ideje: %@, nincs elérhető név";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, az üzenet érkezésének ideje: %@";
-"accessibility.text.sentOn" = "%@, az üzenet küldésének ideje: %@";
-"accessibility.fileTransfer.receivedOn" = "A(z) %@ fájl érkezésének ideje: %@";
-"accessibility.fileTransfer.sentOn" = "A(z) %@ fájl küldésének ideje: %@";
-"accessibility.call.lasted" = "Időtartam:";
-"accessibility.fileTransferNoName" = "Fájl érkezésének ideje: %@, nincs elérhető név";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.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";
 "accessibility.calls.default.addParticipant" = "Résztvevő hozzáadása";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
-
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.default.switchCamera" = "Fényképezőgépváltás";
+"accessibility.calls.default.toggleSpeaker" = "Hangszóró bekapcsolása";
+"accessibility.calls.default.openConversation" = "Beszélgetés megnyitása";
+"accessibility.calls.default.showDialpad" = "Tárcsázó megjelenítése";
+"accessibility.calls.default.raiseHand" = "Kéz felemelése";
+
+"accessibility.calls.alter.toggleAudio" = "Mikrofon némításának feloldása";
+"accessibility.calls.alter.toggleVideo" = "Fényképezőgép leállása";
+"accessibility.calls.alter.pauseCall" = "Hívás folytatása";
+"accessibility.calls.alter.hangUpCall" = "Hívás befejezése";
+"accessibility.calls.alter.addParticipant" = "Résztvevő hozzáadása";
+"accessibility.calls.alter.switchCamera" = "Fényképezőgépváltás";
+"accessibility.calls.alter.toggleSpeaker" = "Hangszóró kikapcsolása";
+"accessibility.calls.alter.openConversation" = "Beszélgetés megnyitása";
+"accessibility.calls.alter.showDialpad" = "Tárcsázó megjelenítése";
+"accessibility.calls.alter.raiseHand" = "Kéz leengedése";
+"accessibility.conference.minimize" = "Kis méret";
+"accessibility.conference.maximize" = "Teljes méret";
+"accessibility.conference.setModerator" = "Moderátor beállítása";
+"accessibility.conference.unsetModerator" = "Moderátor megszüntetése";
+"accessibility.conference.muteAudio" = "Mikrofon elnémítása";
 "accessibility.conference.unmuteAudio" = "Mikrofon némítás feloldása";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Hívás befejezése";
+"accessibility.conference.lowerHand" = "Kéz leengedése";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/hy.lproj/Localizable.strings b/Ring/Ring/Resources/hy.lproj/Localizable.strings
index 863060dd9..4293b569a 100644
--- a/Ring/Ring/Resources/hy.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hy.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Õ“Õ¡Õ½Õ¿Õ¡Õ©Õ¸Ö‚Õ²Õ© Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬";
+"global.confirm" = "Õ€Õ¡Õ´Õ¸Õ¦Õ¾Õ¥Ö„";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Õ€Õ¡Õ´Õ¸Õ¦Õ¾Õ¥Ö„";
+"global.connect" = "Կապակցել";
 
 // Scan
 "scan.badQrCode" = "Õ‰Õ¡Ö€ QR Õ¯Õ¸Õ¤";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "ÔµÕ½ Õ¡Ö€Õ¤Õ¥Õ¶ Õ°Õ¡Õ·Õ«Õ¾ Õ¸Ö‚Õ¶Õ¥Õ´";
 "welcome.linkDevice" = "Ô±Ö€Õ¿Õ¡Õ°Õ¡Õ¶Õ´Õ¡Õ¶ Õ¡ÕµÕ¬ Õ½Õ¡Ö€Ö„";
 "welcome.linkBackup" = "Արտահանում արխիվային պահուստային համակարգից";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Ստեղծեք Jami հաշիվ";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Õ€Õ¡Õ·Õ¾Õ¥Õ¿Õ¸Ö‚ Õ¯Õ¡Õº";
-"linkToAccount.linkButtonTitle" = "Ô¿Õ¡Õº";
-"linkToAccount.linkDeviceTitle" = "Կապակցման սարք";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR Õ¯Õ¸Õ¤Õ¨ Õ½Õ¿Õ¸Ö‚Õ£Õ¥Õ¬";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Ներմուծել Ջամի հաշիվը տեղական արխիվային ֆայլից:";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Կապակցեք նոր սարքը";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Õ“Õ¸Ö€Õ±Õ¡Ö€Õ¯Õ¸Ö‚Õ´";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Սկսել ձայնային զանգը";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Ô»Õ¶Õ¿Õ¥Ö€Õ¶Õ¥Õ¿Õ¸Ö‚Õ´";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¾Õ¥Õ¬";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "Õ€Õ¡Õ¶Õ£Õ«Õ½Õ¿ Õ¦Õ¡Õ¶Õ£";
+"accessibility.calls.default.hangUpCall" = "Բացեք։";
 "accessibility.calls.default.addParticipant" = "Մասնակիցը ավելացնել";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Բաց խոսակցություն";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Բարձրացրեք ձեռքը";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Հեռուստացույցը կանգնեցրեք";
+"accessibility.calls.alter.pauseCall" = "ÕŽÕ¥Ö€Õ½Õ¯Õ½Õ¥Õ¬ Õ¦Õ¡Õ¶Õ£Õ¨";
+"accessibility.calls.alter.hangUpCall" = "Բացեք։";
+"accessibility.calls.alter.addParticipant" = "Մասնակիցը ավելացնել";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Բաց խոսակցություն";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "Õ†Õ¾Õ¡Õ¦Õ¡Õ£Õ¸Ö‚ÕµÕ¶ Õ±Õ¥Õ¼Ö„Õ¨";
+"accessibility.conference.minimize" = "Մինիմինացնել";
+"accessibility.conference.maximize" = "Մաքսիմալացնել";
+"accessibility.conference.setModerator" = "Ô¿Õ¡Õ¦Õ´Õ¥Õ¬ Õ´Õ¸Õ¤Õ¥Ö€Õ¡Õ¿Õ¸Ö€";
+"accessibility.conference.unsetModerator" = "Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ«Õ¹Õ¨ Õ¡Õ¶Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¾Õ¡Õ®";
+"accessibility.conference.muteAudio" = "Ô¼Õ¼Õ¡Õ¯Õ¡Õ¶ Õ±Õ¡ÕµÕ¶";
 "accessibility.conference.unmuteAudio" = "Ô±Õ¶Õ­Õ¡ÖƒÕ¡Õ¶ Õ±Õ¡ÕµÕ¶Õ¡ÕµÕ«Õ¶ Õ±Õ¡ÕµÕ¶";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Բացեք։";
+"accessibility.conference.lowerHand" = "Õ†Õ¾Õ¡Õ¦Õ¡Õ£Õ¸Ö‚ÕµÕ¶ Õ±Õ¥Õ¼Ö„Õ¨";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/id.lproj/Localizable.strings b/Ring/Ring/Resources/id.lproj/Localizable.strings
index 78ecba369..ea8b76234 100644
--- a/Ring/Ring/Resources/id.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/id.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Konfirmasi kata sandi";
+"global.confirm" = "Konfirmasi";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Konfirmasi";
+"global.connect" = "Hubungkan";
 
 // Scan
 "scan.badQrCode" = "Kode QR yang buruk";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Saya sudah punya akun";
 "welcome.linkDevice" = "Impor dari perangkat lain";
 "welcome.linkBackup" = "Impor dari arsip cadangan";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Buat akun Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Penautan akun";
-"linkToAccount.linkButtonTitle" = "Tautan";
-"linkToAccount.linkDeviceTitle" = "Tautkan perangkat";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Scan kode QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Kode 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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Impor akun Jami dari file arsip lokal.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Tautkan perangkat baru";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Memverifikasi";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Mulai panggilan suara";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Daring";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Diedit";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "Jeda panggilan";
+"accessibility.calls.default.hangUpCall" = "Angkat";
 "accessibility.calls.default.addParticipant" = "Tambah partisipan";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Buka percakapan";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Angkat";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Hentikan kamera";
+"accessibility.calls.alter.pauseCall" = "Lanjutkan panggilan";
+"accessibility.calls.alter.hangUpCall" = "Angkat";
+"accessibility.calls.alter.addParticipant" = "Tambah partisipan";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Buka percakapan";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "Turunkan tangan";
+"accessibility.conference.minimize" = "Minimalkan";
+"accessibility.conference.maximize" = "Maksimalkan";
+"accessibility.conference.setModerator" = "Atur moderator";
+"accessibility.conference.unsetModerator" = "Batal atur moderator";
+"accessibility.conference.muteAudio" = "Bisukan audio";
 "accessibility.conference.unmuteAudio" = "Bunyikan audio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Angkat";
+"accessibility.conference.lowerHand" = "Turunkan tangan";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ig.lproj/Localizable.strings b/Ring/Ring/Resources/ig.lproj/Localizable.strings
index 0a91592a8..84914cc0b 100644
--- a/Ring/Ring/Resources/ig.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ig.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Nyochaa paswọọdụ";
+"global.confirm" = "Kwado";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Kwado";
+"global.connect" = "Jikọọ";
 
 // Scan
 "scan.badQrCode" = "Usoro QR na-adịghị mma";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Enwere m akaụntụ m.";
 "welcome.linkDevice" = "Ịbubata site na ngwaọrụ ọzọ";
 "welcome.linkBackup" = "Import si ndabere nchekwa";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Mepụta akaụntụ Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Njikọ akaụntụ";
-"linkToAccount.linkButtonTitle" = "Njikọ";
-"linkToAccount.linkDeviceTitle" = "Ngwaọrụ njikọ";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Nyochaa koodu QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Usoro 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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Bubata akaụntụ Jami site na faịlụ ihe ndekọ mpaghara.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Jikọọ ngwaọrụ ọhụrụ";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Ịtụle";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Malite oku ọdịyo";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "N'Ịntanet";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "E Deziiri Ya";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
+"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.calls.default.pauseCall" = "Nkwupụta nkwụsịtụ";
 "accessibility.calls.default.hangUpCall" = "Hang up";
 "accessibility.calls.default.addParticipant" = "Tinye onye so";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Mkparịta ụka e meghere";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
-"accessibility.calls.default.raiseHand" = "Raise hand";
+"accessibility.calls.default.raiseHand" = "Welie aka gị";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Kwụsị igwefoto";
+"accessibility.calls.alter.pauseCall" = "Nchịkọta oku";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.addParticipant" = "Tinye onye so";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Mkparịta ụka e meghere";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
+"accessibility.calls.alter.raiseHand" = "Aka ala";
+"accessibility.conference.minimize" = "Mee ka ihe dịkwuo ala";
+"accessibility.conference.maximize" = "Mee Ka Ihe Dịkwuo Mma";
 "accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.conference.unsetModerator" = "Ịkwụsị ịhazi ihe";
+"accessibility.conference.muteAudio" = "Audio na-adịghị arụ ọrụ";
 "accessibility.conference.unmuteAudio" = "Ọkpụkpọ na-adịghị emechi emechi";
 "accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.lowerHand" = "Aka ala";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
index c5e246f81..de75b75d4 100644
--- a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Ora";
 "global.editPassword" = "Cambia password";
 "global.confirmPassword" = "Conferma password";
+"global.confirm" = "Conferma";
 "global.cameraDisabled" = "L'accesso alla fotocamera è disabilitato. Abilitalo nelle impostazioni.";
+"global.confirm" = "Conferma";
+"global.connect" = "Connetti";
 
 // Scan
 "scan.badQrCode" = "Codice QR errato";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Elenco pubblico";
 "smartlist.jamsResults" = "Risultati ricerca";
 "smartlist.conversations" = "Conversazioni";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Nessuna conversazione corrisponde.";
 "smartlist.newContact" = "Nuovo contatto";
 "smartlist.newGroup" = "Nuovo gruppo";
 "smartlist.accounts" = "Account";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Inserire il nome…";
 "smartlist.searchBar" = "Cerca";
 "smartlist.noNetworkConnectivity" = "Nessuna connessione di rete";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Assicurati che l'accesso alla rete sia consentito.";
 "smartlist.accountsTitle" = "Account";
 "smartlist.addAccountButton" = "+ Aggiungi contatto";
 "smartlist.noNumber" = "Il contatto selezionato non ha nessun numero";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Invita amici";
 "smartlist.accounts" = "Account";
 "smartlist.disableDonation" = "Non adesso";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Se ti piace usare Jami e pensi che la nostra missione sia importante, vuoi fare una donazione?";
 "smartlist.inSynchronization" = "conversazione in sincronizzazione";
 "smartlist.newMessage" = "Nuovo messaggio";
 
 // Conversation
 "conversation.addToContactsButton" = "Aggiungi ai contatti";
 "conversation.addToContactsLabel" = "Aggiungere ai contatti?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ non è nei tuoi contatti";
 "conversation.messagePlaceholder" = "Scrivi a";
 "conversation.errorSavingImage" = "Si è verificato un errore durante il salvataggio dell'immagine.";
 "conversation.receivedRequest" = "%@ ti ha mandato un invito alla conversazione.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Ho già un account";
 "welcome.linkDevice" = "Importa da un altro dispositivo";
 "welcome.linkBackup" = "Importa dal backup";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Crea un account Jami";
 "welcome.connectToJAMS" = "Connettiti a Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Usa Jami";
 "createAccount.lookingForUsernameAvailability" = "Sto cercando la disponibilità del nome utente…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Nome utente non valido. Inserire il nome utente corretto.";
 "createAccount.usernameAlreadyTaken" = "Nome utente già utilizzato";
 "createAccount.usernameValid" = "Il nome utente è disponibile.";
 "createAccount.UsernameNotRegisteredTitle" = "Errore di rete";
 "createAccount.UsernameNotRegisteredMessage" = "L'account è stato creato ma il nome utente non è stato registrato";
 "createAccount.timeoutTitle" = "Account creato";
 "createAccount.timeoutMessage" = "Registrazione del nome utente in corso. Attendere…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configura un account SIP esistente";
 "createAccount.creatingAccount" = "Creazione account";
 "createAccount.nameExplanation" = "Puoi scegliere un nome utente per essere facilmente trovato e contattato su Jami.";
 "createAccount.newAccount" = "Nuovo account";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "Un account Jami viene creato e memorizzato localmente solo su questo dispositivo, come archivio contenente le chiavi dell'account. L'accesso a questo archivio può essere protetto da una password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Associazione dell'account";
-"linkToAccount.linkButtonTitle" = "Associa";
-"linkToAccount.linkDeviceTitle" = "Associa dispositivo";
-"linkToAccount.linkDeviceMessage" = "Scegliere \"Associa un altro dispositivo\" dall'altra applicazione Jami per mostrare il codice QR o il PIN";
-"linkToAccount.explanationMessage" = "Per utilizzare un account Jami esistente su questo dispositivo è necessario un PIN.";
-"linkToAccount.pinPlaceholder" = "Codice PIN";
-"linkToAccount.pinLabel" = "Inserire il codice PIN";
-"linkToAccount.scanQRCode" = "Scansione del codice QR";
-"linkToAccount.explanationPinMessage" = "Per generare il codice PIN, accedere alle impostazioni di gestione dell'account sul dispositivo che contiene l'account che si desidera utilizzare. Seleziona \"Associa un altro dispositivo\". Otterrai il PIN necessario per completare questo modulo. Il PIN è valido solo per 10 minuti.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Codice 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.exit" = "Esci";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importa l'account Jami dal file di archivio locale.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Errore di revoca del dispositivo";
 "accountPage.linkDeviceTitle" = "Associa un altro dispositivo";
 "accountPage.other" = "Altro";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Se non è stato eseguito il backup dell'account o non è stato associato a un altro dispositivo, l'account e il nome utente registrato andranno PERSI IRREVOCABILMENTE.";
 "accountPage.inviteFriends" = "Invita amici";
 "accountPage.contactMeOnJamiTitle" = "Contattami su Jami!";
 "accountPage.contactMeOnJamiContant" = "Contattami usando \"%s\" sulla piattaforma di comunicazione distribuita Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Associa un altro dispositivo";
-"linkDevice.passwordError" = "Password errata. Riprovare con la password corretta.";
 "linkDevice.networkError" = "Si è verificato un errore di rete durante l'esportazione dell'account.";
-"linkDevice.defaultError" = "Si è verificato un errore durante l'esportazione dell'account.";
-"linkDevice.explanationMessage" = "Aprire Jami sul nuovo dispositivo e scegliere \"Associa questo dispositivo a un account\" per completare la procedura. Il codice PIN è valido per 10 minuti.";
-"linkDevice.hudMessage" = "Verifica";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Avvia chiamata vocale";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Chiudi";
 "accessibility.smartListSwitchAccounts" = "Cambia account";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "L'account attuale è  %@";
 "accessibility.smartListAddAccount" = "Aggiungi account";
 "accessibility.aboutJamiTitle" = "Informazioni su Jami";
 "accessibility.welcomeToJamiTitle" = "Benvenuto in Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Inserire il nome utente per verificare la disponibilità.";
 "accessibility.profilePicturePicker" = "Foto di profilo";
 "accessibility.profilePicturePickerHint" = "Toccare due volte per scattare una foto o selezionare un'immagine dalla galleria";
 "accessibility.swarmPicturePicker" = "Foto del gruppo";
 "accessibility.swarmPicturePickerHint" = "Toccare due volte per scattare una foto o selezionare un'immagine dalla galleria";
 "accessibility.accountSummaryQrCode" = "Codice QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Doppio tocco per vedere il codice QR dell'account";
+"accessibility.accountSummaryEditProfileHint" = "Doppio tocco per modificare il profilo";
 "accessibility.accountSummaryEditSettingsButton" = "Impostazioni";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Avvia chiamata vocale con %@";
+"accessibility.conversationStartVideoCall" = "Avvia videochiamata con %@";
 "accessibility.conversationComposeMessage" = "Scrivi un messaggio";
 "accessibility.conversationShareMedia" = "Condividi media";
 "accessibility.conversationCameraHint" = "Doppio tocco per aprire la fotocamera";
 "accessibility.audioPlayerPlay" = "Riproduci";
 "accessibility.audioPlayerPause" = "Pausa";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ messaggi non letti.";
 "accessibility.conversationRowBlocked" = "Conversazione bloccata";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Ultimo messaggio: %@";
+"accessibility.conversationRowSyncing" = "Sincronizzazione in corso";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Connesso";
 "accessibility.userPresenceAvailable" = "Disponibile";
-"accessibility.pendingRequestsRow" = "Invito ricevuto: %@ invito in attesa";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invito ricevuto: %@ invito in attesa";
 "accessibility.pendingRequestsRowHint" = "Doppio tocco per rivedere e rispondere agli inviti che hai ricevuto";
 "accessibility.pendingRequestsListBlockUser" = "Blocca il mittente dell'invito";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Rifiuta l'invito";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accetta l'invito";
 "accessibility.messageBubbleDeleted" = "Messaggio cancellato";
 "accessibility.messageBubbleEdited" = "Modificato";
 "accessibility.messageBubbleRead" = "Letto";
 "accessibility.messageBubbleUnread" = "Non letto";
-"accessibility.textNotAvailable" = "Messaggio di testo ricevuto il %@, contenuto non disponibile";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File ricevuto il %@, nome non disponibile";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, messaggio ricevuto il %@";
-"accessibility.text.sentOn" = "%@, messaggio inviato il %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , ricevuto il %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, inviato il %@";
-"accessibility.call.lasted" = "Durata";
-"accessibility.fileTransferNoName" = "File ricevuto il %@, nome non disponibile";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"accessibility.inReply" = "In risposta al messaggio";
+"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" = "Avvia fotocamera";
+"accessibility.calls.default.pauseCall" = "Metti in pausa la chiamata";
+"accessibility.calls.default.hangUpCall" = "Chiudi";
 "accessibility.calls.default.addParticipant" = "Aggiungi partecipante";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
+"accessibility.calls.default.switchCamera" = "Cambia fotocamera";
+"accessibility.calls.default.toggleSpeaker" = "Accendi l'altoparlante";
+"accessibility.calls.default.openConversation" = "Apri conversazione";
+"accessibility.calls.default.showDialpad" = "Mostra tastiera";
 "accessibility.calls.default.raiseHand" = "Alza mano";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.toggleAudio" = "Attiva microfono";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Riprendi la chiamata";
+"accessibility.calls.alter.hangUpCall" = "Chiudi";
+"accessibility.calls.alter.addParticipant" = "Aggiungi partecipante";
+"accessibility.calls.alter.switchCamera" = "Cambia fotocamera";
+"accessibility.calls.alter.toggleSpeaker" = "Spegni l'altoparlante";
+"accessibility.calls.alter.openConversation" = "Apri conversazione";
+"accessibility.calls.alter.showDialpad" = "Mostra tastiera";
+"accessibility.calls.alter.raiseHand" = "Abbassa la mano";
+"accessibility.conference.minimize" = "Minimizza";
+"accessibility.conference.maximize" = "Massimizza";
+"accessibility.conference.setModerator" = "Metti un moderatore";
+"accessibility.conference.unsetModerator" = "Rimuovi moderatore";
+"accessibility.conference.muteAudio" = "Disattiva microfono";
 "accessibility.conference.unmuteAudio" = "Attiva microfono";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Chiudi";
+"accessibility.conference.lowerHand" = "Abbassa la mano";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/it.lproj/Localizable.strings b/Ring/Ring/Resources/it.lproj/Localizable.strings
index 402743635..3602fc15e 100644
--- a/Ring/Ring/Resources/it.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Ora";
 "global.editPassword" = "Cambia password";
 "global.confirmPassword" = "Conferma password";
+"global.confirm" = "Conferma";
 "global.cameraDisabled" = "L'accesso alla fotocamera è disabilitato. Abilitalo nelle impostazioni.";
+"global.confirm" = "Conferma";
+"global.connect" = "Connetti";
 
 // Scan
 "scan.badQrCode" = "Codice QR errato";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Elenco pubblico";
 "smartlist.jamsResults" = "Risultati ricerca";
 "smartlist.conversations" = "Conversazioni";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Nessuna conversazione corrisponde.";
 "smartlist.newContact" = "Nuovo contatto";
 "smartlist.newGroup" = "Nuovo gruppo";
 "smartlist.accounts" = "Account";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Inserire il nome…";
 "smartlist.searchBar" = "Cerca";
 "smartlist.noNetworkConnectivity" = "Nessuna connessione di rete";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Assicurati che l'accesso alla rete sia consentito.";
 "smartlist.accountsTitle" = "Account";
 "smartlist.addAccountButton" = "+ Aggiungi contatto";
 "smartlist.noNumber" = "Il contatto selezionato non ha nessun numero";
@@ -120,14 +123,14 @@
 "smartlist.inviteFriends" = "Invita amici";
 "smartlist.accounts" = "Account";
 "smartlist.disableDonation" = "Non adesso";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Se ti piace usare Jami e pensi che la nostra missione sia importante, vuoi fare una donazione?";
 "smartlist.inSynchronization" = "conversazione in sincronizzazione";
 "smartlist.newMessage" = "Nuovo messaggio";
 
 // Conversation
 "conversation.addToContactsButton" = "Aggiungi ai contatti";
 "conversation.addToContactsLabel" = "Aggiungere ai contatti?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ non è nei tuoi contatti";
 "conversation.messagePlaceholder" = "Scrivi a";
 "conversation.errorSavingImage" = "Si è verificato un errore durante il salvataggio dell'immagine.";
 "conversation.receivedRequest" = "%@ ti ha mandato un invito alla conversazione.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Ho già un account";
 "welcome.linkDevice" = "Importa da un altro dispositivo";
 "welcome.linkBackup" = "Importa dal backup";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Crea un account Jami";
 "welcome.connectToJAMS" = "Connettiti a Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Usa Jami";
 "createAccount.lookingForUsernameAvailability" = "Sto cercando la disponibilità del nome utente…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Nome utente non valido. Inserire il nome utente corretto.";
 "createAccount.usernameAlreadyTaken" = "Nome utente già utilizzato";
 "createAccount.usernameValid" = "Il nome utente è disponibile.";
 "createAccount.UsernameNotRegisteredTitle" = "Errore di rete";
 "createAccount.UsernameNotRegisteredMessage" = "L'account è stato creato ma il nome utente non è stato registrato";
 "createAccount.timeoutTitle" = "Account creato";
 "createAccount.timeoutMessage" = "Registrazione del nome utente in corso. Attendere…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configura un account SIP esistente";
 "createAccount.creatingAccount" = "Creazione account";
 "createAccount.nameExplanation" = "Puoi scegliere un nome utente per essere facilmente trovato e contattato su Jami.";
 "createAccount.newAccount" = "Nuovo profilo";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "Un account Jami viene creato e memorizzato localmente solo su questo dispositivo, come archivio contenente le chiavi dell'account. L'accesso a questo archivio può essere protetto da una password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Associazione dell'account";
-"linkToAccount.linkButtonTitle" = "Associa";
-"linkToAccount.linkDeviceTitle" = "Associa dispositivo";
-"linkToAccount.linkDeviceMessage" = "Scegliere \"Associa un altro dispositivo\" dall'altra applicazione Jami per mostrare il codice QR o il PIN";
-"linkToAccount.explanationMessage" = "Per utilizzare un account Jami esistente su questo dispositivo è necessario un PIN.";
-"linkToAccount.pinPlaceholder" = "Codice PIN";
-"linkToAccount.pinLabel" = "Inserire il codice PIN";
-"linkToAccount.scanQRCode" = "Scansione del codice QR";
-"linkToAccount.explanationPinMessage" = "Per generare il codice PIN, accedere alle impostazioni di gestione dell'account sul dispositivo che contiene l'account che si desidera utilizzare. Seleziona \"Associa un altro dispositivo\". Otterrai il PIN necessario per completare questo modulo. Il PIN è valido solo per 10 minuti.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Codice 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.exit" = "Esci";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importa l'account Jami dal file di archivio locale.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Errore di revoca del dispositivo";
 "accountPage.linkDeviceTitle" = "Associa un altro dispositivo";
 "accountPage.other" = "Altro";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Se non è stato eseguito il backup dell'account o non è stato associato a un altro dispositivo, l'account e il nome utente registrato andranno PERSI IRREVOCABILMENTE.";
 "accountPage.inviteFriends" = "Invita amici";
 "accountPage.contactMeOnJamiTitle" = "Contattami su Jami!";
 "accountPage.contactMeOnJamiContant" = "Contattami usando \"%s\" sulla piattaforma di comunicazione distribuita Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Associa un altro dispositivo";
-"linkDevice.passwordError" = "Password errata. Riprovare con la password corretta.";
 "linkDevice.networkError" = "Si è verificato un errore di rete durante l'esportazione dell'account.";
-"linkDevice.defaultError" = "Si è verificato un errore durante l'esportazione dell'account.";
-"linkDevice.explanationMessage" = "Aprire Jami sul nuovo dispositivo e scegliere \"Associa questo dispositivo a un account\" per completare la procedura. Il codice PIN è valido per 10 minuti.";
-"linkDevice.hudMessage" = "Verifica";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Avvia chiamata vocale";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Chiudi";
 "accessibility.smartListSwitchAccounts" = "Cambia account";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "L'account attuale è  %@";
 "accessibility.smartListAddAccount" = "Aggiungi account";
 "accessibility.aboutJamiTitle" = "Informazioni su Jami";
 "accessibility.welcomeToJamiTitle" = "Benvenuto in Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Inserire il nome utente per verificare la disponibilità.";
 "accessibility.profilePicturePicker" = "Foto di profilo";
 "accessibility.profilePicturePickerHint" = "Toccare due volte per scattare una foto o selezionare un'immagine dalla galleria";
 "accessibility.swarmPicturePicker" = "Foto del gruppo";
 "accessibility.swarmPicturePickerHint" = "Toccare due volte per scattare una foto o selezionare un'immagine dalla galleria";
 "accessibility.accountSummaryQrCode" = "Codice QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Doppio tocco per vedere il codice QR dell'account";
+"accessibility.accountSummaryEditProfileHint" = "Doppio tocco per modificare il profilo";
 "accessibility.accountSummaryEditSettingsButton" = "Impostazioni";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Avvia chiamata vocale con %@";
+"accessibility.conversationStartVideoCall" = "Avvia videochiamata con %@";
 "accessibility.conversationComposeMessage" = "Scrivi un messaggio";
 "accessibility.conversationShareMedia" = "Condividi media";
 "accessibility.conversationCameraHint" = "Doppio tocco per aprire la fotocamera";
 "accessibility.audioPlayerPlay" = "Riproduci";
 "accessibility.audioPlayerPause" = "Pausa";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ messaggi non letti.";
 "accessibility.conversationRowBlocked" = "Conversazione bloccata";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Ultimo messaggio: %@";
+"accessibility.conversationRowSyncing" = "Sincronizzazione in corso";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Connesso";
 "accessibility.userPresenceAvailable" = "Disponibile";
-"accessibility.pendingRequestsRow" = "Invito ricevuto: %@ invito in attesa";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invito ricevuto: %@ invito in attesa";
 "accessibility.pendingRequestsRowHint" = "Doppio tocco per rivedere e rispondere agli inviti che hai ricevuto";
 "accessibility.pendingRequestsListBlockUser" = "Blocca il mittente dell'invito";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Rifiuta l'invito";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accetta l'invito";
 "accessibility.messageBubbleDeleted" = "Messaggio cancellato";
 "accessibility.messageBubbleEdited" = "Modificato";
 "accessibility.messageBubbleRead" = "Letto";
 "accessibility.messageBubbleUnread" = "Non letto";
-"accessibility.textNotAvailable" = "Messaggio di testo ricevuto il %@, contenuto non disponibile";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File ricevuto il %@, nome non disponibile";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, messaggio ricevuto il %@";
-"accessibility.text.sentOn" = "%@, messaggio inviato il %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , ricevuto il %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, inviato il %@";
-"accessibility.call.lasted" = "Durata";
-"accessibility.fileTransferNoName" = "File ricevuto il %@, nome non disponibile";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"accessibility.inReply" = "In risposta al messaggio";
+"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" = "Avvia fotocamera";
+"accessibility.calls.default.pauseCall" = "Metti in pausa la chiamata";
+"accessibility.calls.default.hangUpCall" = "Chiudi";
 "accessibility.calls.default.addParticipant" = "Aggiungi partecipante";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
+"accessibility.calls.default.switchCamera" = "Cambia fotocamera";
+"accessibility.calls.default.toggleSpeaker" = "Accendi l'altoparlante";
+"accessibility.calls.default.openConversation" = "Apri conversazione";
+"accessibility.calls.default.showDialpad" = "Mostra tastiera";
 "accessibility.calls.default.raiseHand" = "Alza mano";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
-"accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.toggleAudio" = "Attiva microfono";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
+"accessibility.calls.alter.pauseCall" = "Riprendi la chiamata";
+"accessibility.calls.alter.hangUpCall" = "Chiudi";
+"accessibility.calls.alter.addParticipant" = "Aggiungi partecipante";
+"accessibility.calls.alter.switchCamera" = "Cambia fotocamera";
+"accessibility.calls.alter.toggleSpeaker" = "Spegni l'altoparlante";
+"accessibility.calls.alter.openConversation" = "Apri conversazione";
+"accessibility.calls.alter.showDialpad" = "Mostra tastiera";
+"accessibility.calls.alter.raiseHand" = "Abbassa la mano";
+"accessibility.conference.minimize" = "Minimizza";
+"accessibility.conference.maximize" = "Massimizza";
+"accessibility.conference.setModerator" = "Metti un moderatore";
+"accessibility.conference.unsetModerator" = "Rimuovi moderatore";
+"accessibility.conference.muteAudio" = "Disattiva microfono";
 "accessibility.conference.unmuteAudio" = "Attiva microfono";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Chiudi";
+"accessibility.conference.lowerHand" = "Abbassa la mano";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ja.lproj/Localizable.strings b/Ring/Ring/Resources/ja.lproj/Localizable.strings
index 863dd7bda..6a735a6d4 100644
--- a/Ring/Ring/Resources/ja.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ja.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "時刻";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "暗証語の再入力";
+"global.confirm" = "確認";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "確認";
+"global.connect" = "接続";
 
 // Scan
 "scan.badQrCode" = "誤ったQRコード";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "すでにアカウントを持っている";
 "welcome.linkDevice" = "他のデバイスから輸入する";
 "welcome.linkBackup" = "アーカイブバックアップからインポート";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jamiアカウントを作成する";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "アカウントを関連付けています";
-"linkToAccount.linkButtonTitle" = "リンク";
-"linkToAccount.linkDeviceTitle" = "機器を関連付ける";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QRコードをスキャン";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "終了";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "ローカルアーカイブからJamiアカウントをインポート";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "新しいデバイスを連結する";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "検証中";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "音声通話を開始";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "オンライン";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "編集";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "通話を一時停止";
+"accessibility.calls.default.hangUpCall" = "通話終了";
 "accessibility.calls.default.addParticipant" = "参加者を追加";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "会話を開く";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "手を挙げる";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "カメラを止める";
 "accessibility.calls.alter.pauseCall" = "通話を再開";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "通話終了";
+"accessibility.calls.alter.addParticipant" = "参加者を追加";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "会話を開く";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "手を下げる";
+"accessibility.conference.minimize" = "最小化";
+"accessibility.conference.maximize" = "最大化";
+"accessibility.conference.setModerator" = "調停者を設定";
+"accessibility.conference.unsetModerator" = "調停者を取り消し";
+"accessibility.conference.muteAudio" = "音声を消音する";
 "accessibility.conference.unmuteAudio" = "音声無音";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "通話終了";
+"accessibility.conference.lowerHand" = "手を下げる";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/kk.lproj/Localizable.strings b/Ring/Ring/Resources/kk.lproj/Localizable.strings
index 2089dc361..0eac8f5af 100644
--- a/Ring/Ring/Resources/kk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/kk.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Парольді растау";
+"global.confirm" = "Куәлікті растау";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Куәлікті растау";
+"global.connect" = "Қосылыңыз";
 
 // Scan
 "scan.badQrCode" = "Жаман QR код";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Менде есеп бар.";
 "welcome.linkDevice" = "Басқа құрылғыдан импорттау";
 "welcome.linkBackup" = "Архивті резервтік көшірмеден импорттау";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami тіркелгісін құру";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Есептік жазбаларды байланыстыру";
-"linkToAccount.linkButtonTitle" = "Тізім";
-"linkToAccount.linkDeviceTitle" = "Қосылу құрылғысы";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR кодын сканерлеу";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Жергiлiктi мұрағат файлынан Jami тіркелгiн импорттау.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Жаңа құрылғыны қосу";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Тексеру";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Аудио шақыруды бастау";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Онлайн";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Жазу";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "Тындық шақыру";
+"accessibility.calls.default.hangUpCall" = "Ашыңыз";
 "accessibility.calls.default.addParticipant" = "Қатысушыны қосу";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Ашық әңгіме";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Қолын көтеру";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Стенд камерасы";
 "accessibility.calls.alter.pauseCall" = "Қайталау шақыру";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Ашыңыз";
+"accessibility.calls.alter.addParticipant" = "Қатысушыны қосу";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Ашық әңгіме";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "Төменгі қол";
+"accessibility.conference.minimize" = "Ең төмендеу";
+"accessibility.conference.maximize" = "Максималды";
+"accessibility.conference.setModerator" = "Модераторды орнату";
+"accessibility.conference.unsetModerator" = "Модераторды орнату";
+"accessibility.conference.muteAudio" = "Ауызды үнсіз";
 "accessibility.conference.unmuteAudio" = "Ауызды үнсіз қалдыру";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Ашыңыз";
+"accessibility.conference.lowerHand" = "Төменгі қол";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/kn.lproj/Localizable.strings b/Ring/Ring/Resources/kn.lproj/Localizable.strings
index 1555e0ba8..744662f1d 100644
--- a/Ring/Ring/Resources/kn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/kn.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "ಪಾಸ್ವರ್ಡ್ ದೃಢೀಕರಿಸಿ";
+"global.confirm" = "ದೃಢೀಕರಿಸಿ";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "ದೃಢೀಕರಿಸಿ";
+"global.connect" = "ಸಂಪರ್ಕ";
 
 // Scan
 "scan.badQrCode" = "ಕೆಟ್ಟ QR ಕೋಡ್";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "ನನ್ನ ಬಳಿ ಈಗಾಗಲೇ ಖಾತೆ ಇದೆ.";
 "welcome.linkDevice" = "ಮತ್ತೊಂದು ಸಾಧನದಿಂದ ಆಮದು";
 "welcome.linkBackup" = "ಆರ್ಕೈವ್ ಬ್ಯಾಕಪ್ನಿಂದ ಆಮದು";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "ಜಾಮಿ ಖಾತೆಯನ್ನು ರಚಿಸಿ";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "ಖಾತೆಗಳನ್ನು ಸಂಪರ್ಕಿಸುವುದು";
-"linkToAccount.linkButtonTitle" = "ಲಿಂಕ್";
-"linkToAccount.linkDeviceTitle" = "ಲಿಂಕ್ ಸಾಧನ";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "ಕ್ಯೂಆರ್ ಕೋಡ್";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "ಜಾಮಿ ಖಾತೆಯನ್ನು ಸ್ಥಳೀಯ ಆರ್ಕೈವ್ ಫೈಲ್ನಿಂದ ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "ಹೊಸ ಸಾಧನ ಲಿಂಕ್";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "ಪರಿಶೀಲನೆ";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ಆಡಿಯೋ ಕರೆ ಆರಂಭಿಸಿ";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "ಆನ್ಲೈನ್";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "ಸಂಪಾದನೆ";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "ವಿರಾಮ ಕರೆ";
+"accessibility.calls.default.hangUpCall" = "ಮುಚ್ಚಿ";
 "accessibility.calls.default.addParticipant" = "ಭಾಗವಹಿಸುವವರನ್ನು ಸೇರಿಸುವುದು";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "ಮುಕ್ತ ಸಂಭಾಷಣೆ";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "ಕೈ ಎತ್ತಿ";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "ಕ್ಯಾಮೆರಾ ನಿಲ್ಲಿಸಿ";
 "accessibility.calls.alter.pauseCall" = "ಪುನರಾರಂಭ ಕರೆ";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "ಮುಚ್ಚಿ";
+"accessibility.calls.alter.addParticipant" = "ಭಾಗವಹಿಸುವವರನ್ನು ಸೇರಿಸುವುದು";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "ಮುಕ್ತ ಸಂಭಾಷಣೆ";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "ಕೆಳ ಕೈ";
+"accessibility.conference.minimize" = "ಕಡಿಮೆ ಮಾಡಿ";
+"accessibility.conference.maximize" = "ಗರಿಷ್ಠ ಮಟ್ಟದಲ್ಲಿ";
+"accessibility.conference.setModerator" = "ಮಾಡರೇಟರ್ ಅನ್ನು ಹೊಂದಿಸಿ";
+"accessibility.conference.unsetModerator" = "ಡಿಸ್ಇನ್ಸೆಟ್ ಮಾಡರೇಟರ್";
+"accessibility.conference.muteAudio" = "ಮೂಕ ಆಡಿಯೋ";
 "accessibility.conference.unmuteAudio" = "ಅನಿರ್ದಿಷ್ಟ ಆಡಿಯೋ";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "ಮುಚ್ಚಿ";
+"accessibility.conference.lowerHand" = "ಕೆಳ ಕೈ";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
index 2e0c6470a..9b5ef88dc 100644
--- a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "암호 확인";
+"global.confirm" = "확인";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "확인";
+"global.connect" = "ì—°ê²°";
 
 // Scan
 "scan.badQrCode" = "나쁜 QR 코드";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "이미 계좌가 있어요";
 "welcome.linkDevice" = "다른 장치에서 수입";
 "welcome.linkBackup" = "파일 백업에서 가져온";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami 계정을 생성";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "계좌 연결";
-"linkToAccount.linkButtonTitle" = "ì—°ê²°";
-"linkToAccount.linkDeviceTitle" = "연결 장치";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR 코드를 스캔";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "종료";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "자미 계정을 로컬 아카이브 파일에서 가져오세요.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "새로운 장치를 연결";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "확인";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "오디오 호출을 시작";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "온라인";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "편집";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "무음 마이크";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "휴식 통화";
+"accessibility.calls.default.hangUpCall" = "- ";
 "accessibility.calls.default.addParticipant" = "참가자를 추가";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "열린 대화";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "손 들기";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "카메라를 멈추";
 "accessibility.calls.alter.pauseCall" = "다시 전화";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "- ";
+"accessibility.calls.alter.addParticipant" = "참가자를 추가";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "열린 대화";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "하위 손";
+"accessibility.conference.minimize" = "최소화";
+"accessibility.conference.maximize" = "최대한 활용";
+"accessibility.conference.setModerator" = "조정기를 설정";
+"accessibility.conference.unsetModerator" = "설정하지 않는 모더레이터";
+"accessibility.conference.muteAudio" = "음향이 무성";
 "accessibility.conference.unmuteAudio" = "무음 음향";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "- ";
+"accessibility.conference.lowerHand" = "하위 손";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ko.lproj/Localizable.strings b/Ring/Ring/Resources/ko.lproj/Localizable.strings
index 2e0c6470a..6fac12c2d 100644
--- a/Ring/Ring/Resources/ko.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ko.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "암호 확인";
+"global.confirm" = "확인";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "확인";
+"global.connect" = "ì—°ê²°";
 
 // Scan
 "scan.badQrCode" = "나쁜 QR 코드";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "이미 계좌가 있어요";
 "welcome.linkDevice" = "다른 장치에서 수입";
 "welcome.linkBackup" = "파일 백업에서 가져온";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami 계정을 생성";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "계좌 연결";
-"linkToAccount.linkButtonTitle" = "ì—°ê²°";
-"linkToAccount.linkDeviceTitle" = "연결 장치";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR 코드를 스캔";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "종료";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "자미 계정을 로컬 아카이브 파일에서 가져오세요.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "새로운 장치를 연결";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "확인";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "오디오 호출을 시작";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "온라인";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "편집";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.pauseCall" = "휴식 통화";
+"accessibility.calls.default.hangUpCall" = "- ";
 "accessibility.calls.default.addParticipant" = "참가자를 추가";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "열린 대화";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "손 들기";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "카메라를 멈추";
 "accessibility.calls.alter.pauseCall" = "다시 전화";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "- ";
+"accessibility.calls.alter.addParticipant" = "참가자를 추가";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "열린 대화";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "하위 손";
+"accessibility.conference.minimize" = "최소화";
+"accessibility.conference.maximize" = "최대한 활용";
+"accessibility.conference.setModerator" = "조정기를 설정";
+"accessibility.conference.unsetModerator" = "설정하지 않는 모더레이터";
+"accessibility.conference.muteAudio" = "음향이 무성";
 "accessibility.conference.unmuteAudio" = "무음 음향";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "- ";
+"accessibility.conference.lowerHand" = "하위 손";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/lt.lproj/Localizable.strings b/Ring/Ring/Resources/lt.lproj/Localizable.strings
index f02b21554..d9c1893d9 100644
--- a/Ring/Ring/Resources/lt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/lt.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Laikas";
 "global.editPassword" = "Taisyti slaptažodį";
 "global.confirmPassword" = "Patvirtinkite slaptažodį";
+"global.confirm" = "Patvirtinti";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Patvirtinti";
+"global.connect" = "Prisijungti";
 
 // Scan
 "scan.badQrCode" = "Blogas QR kodas";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Paskyros susiejimas";
-"linkToAccount.linkButtonTitle" = "Susieti";
-"linkToAccount.linkDeviceTitle" = "Susieti įrenginį";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN kodas";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skenuokite QR kodÄ…";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR kodas";
+"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" = "Išeiti";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importuoti Jami paskyrą iš vietinio archyvo failo.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Susieti naują įrenginį";
-"linkDevice.passwordError" = "Neteisingas slaptažodis. Bandykite dar kartą naudodami teisingą slaptažodį.";
 "linkDevice.networkError" = "Eksportuojant paskyrą įvyko tinklo klaida.";
-"linkDevice.defaultError" = "Eksportuojant paskyrą įvyko klaida.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verifying";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Pradėti garso skambutį";
@@ -531,53 +552,55 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Prisijungęs";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Atmesti pakvietimÄ…";
 "accessibility.pendingRequestsListAcceptInvitation" = "Priimti pakvietimÄ…";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "Išdavinimas";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Išjungti mikrofoną";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Pristabdyti skambutį";
+"accessibility.calls.default.hangUpCall" = "Padėti ragelį";
 "accessibility.calls.default.addParticipant" = "Pridėti dalyvį";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Atverti pokalbį";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Pakelti rankÄ…";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stokkamera";
 "accessibility.calls.alter.pauseCall" = "Pratęsti skambutį";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Padėti ragelį";
+"accessibility.calls.alter.addParticipant" = "Pridėti dalyvį";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Atverti pokalbį";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "Nuleisti rankÄ…";
+"accessibility.conference.minimize" = "Suskleisti";
+"accessibility.conference.maximize" = "Maksimaliai";
+"accessibility.conference.setModerator" = "Įdiegti moderatorių";
+"accessibility.conference.unsetModerator" = "Neįjungtas moderatorius";
+"accessibility.conference.muteAudio" = "Nutildyti garsÄ…";
 "accessibility.conference.unmuteAudio" = "Nepaklausytas garso įrašas";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Padėti ragelį";
+"accessibility.conference.lowerHand" = "Nuleisti rankÄ…";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ml.lproj/Localizable.strings b/Ring/Ring/Resources/ml.lproj/Localizable.strings
index ed944f14e..35c4d0d11 100644
--- a/Ring/Ring/Resources/ml.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ml.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "പാസ്വേഡ് സ്ഥിരീകരിക്കുക";
+"global.confirm" = "സ്ഥിരീകരണം";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "സ്ഥിരീകരണം";
+"global.connect" = "ബന്ധിപ്പിക്കുക";
 
 // Scan
 "scan.badQrCode" = "മോശം ക്യുആർ കോഡ്";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "എനിക്ക് ഒരു അക്കൌണ്ട് ഉണ്ട്";
 "welcome.linkDevice" = "മറ്റൊരു ഉപകരണത്തിൽ നിന്നും ഇറക്കുമതി ചെയ്യുക";
 "welcome.linkBackup" = "ആർക്കൈവ് ബാക്കപ്പ് നിന്നും ഇറക്കുമതി ചെയ്യുക";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "ജാമി അക്കൌണ്ട് സൃഷ്ടിക്കുക";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "അക്കൌണ്ട് ബന്ധിപ്പിക്കൽ";
-"linkToAccount.linkButtonTitle" = "ലിങ്ക്";
-"linkToAccount.linkDeviceTitle" = "ലിങ്ക് ഉപകരണം";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "ക്യുആർ കോഡ് സ്കാൻ ചെയ്യുക";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "ക്യുആർ കോഡ്";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "ജാമി അക്കൌണ്ട് പ്രാദേശിക ആർക്കൈവ് ഫയലിൽ നിന്നും ഇറക്കുമതി ചെയ്യുക.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "പുതിയ ഉപകരണം ലിങ്ക് ചെയ്യുക";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "പരിശോധന";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ഓഡിയോ കോൾ ആരംഭിക്കുക";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "ഓൺലൈൻ";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "പരിഷ്ക്കരിക്കുക";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "മിണ്ടാത്ത മൈക്രോഫോൺ";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "ഇടവേള വിളി";
+"accessibility.calls.default.hangUpCall" = "അടയ്ക്കുക";
 "accessibility.calls.default.addParticipant" = "പങ്കാളിയെ കൂട്ടിച്ചേർക്കുക";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "തുറന്ന സംഭാഷണം";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "കൈ ഉയര് ത്തുക";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "ക്യാമറ നിർത്തുക";
 "accessibility.calls.alter.pauseCall" = "പുനരാരംഭിക്കുക";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "അടയ്ക്കുക";
+"accessibility.calls.alter.addParticipant" = "പങ്കാളിയെ കൂട്ടിച്ചേർക്കുക";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "തുറന്ന സംഭാഷണം";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "താഴത്തെ കൈ";
+"accessibility.conference.minimize" = "പരിമിതപ്പെടുത്തുക";
+"accessibility.conference.maximize" = "പരമാവധി";
+"accessibility.conference.setModerator" = "മോഡറേറ്റർ സജ്ജമാക്കുക";
+"accessibility.conference.unsetModerator" = "മോഡറേറ്റർ അൺസെറ്റ് ചെയ്യുക";
+"accessibility.conference.muteAudio" = "നിശബ്ദ ശബ്ദം";
 "accessibility.conference.unmuteAudio" = "നിശബ്ദമായ ഓഡിയോ";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "അടയ്ക്കുക";
+"accessibility.conference.lowerHand" = "താഴത്തെ കൈ";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings b/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
index 2043c2da3..0b3abbf0b 100644
--- a/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Хууль нууц товчлуул";
+"global.confirm" = "Дашрамд";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Дашрамд";
+"global.connect" = "Харилцаа холбоо";
 
 // Scan
 "scan.badQrCode" = "Зур QR код";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Би аль хэдийнээ бүртгэлтэй.";
 "welcome.linkDevice" = "Өөр төхөөрөмжээс импортлох";
 "welcome.linkBackup" = "Архивын нусхабар захиргаас импортлох";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami-ийн дансыг бий болгох";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Нягтлан бодох бүртгэлийн холбоо";
-"linkToAccount.linkButtonTitle" = "Зэвсэглэл";
-"linkToAccount.linkDeviceTitle" = "Зэвсэглэлтэй холболт";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR код сканируулна";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Джами-ийн дансыг орон нутгийн архив файлын сангаас импортлоод байна.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Шинэ төхөөрөмжийг холбох";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Хяналт шалгах";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Зэвсэгт дуу дуулах";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Онлайн";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Хөгжүүлэн";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Улаан чимээгүй микрофон";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Халдааны зогсоол";
+"accessibility.calls.default.hangUpCall" = "-Хэлээч.";
 "accessibility.calls.default.addParticipant" = "Үүнд оролцогч нэмнэ";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Нээлттэй ярилцлага";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Та гар нь дээшлүүлж";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Сэтгэлтэй камер";
 "accessibility.calls.alter.pauseCall" = "Зураг сурталчилгаа";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "-Хэлээч.";
+"accessibility.calls.alter.addParticipant" = "Үүнд оролцогч нэмнэ";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Нээлттэй ярилцлага";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "Доод гар";
+"accessibility.conference.minimize" = "Хөгжлийн багасгах";
+"accessibility.conference.maximize" = "Хамгийн их хэмжээний";
+"accessibility.conference.setModerator" = "Модератор байгуулж";
+"accessibility.conference.unsetModerator" = "Улаанбаатар";
+"accessibility.conference.muteAudio" = "Улаан дуу";
 "accessibility.conference.unmuteAudio" = "Утасны үнэгүй";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "-Хэлээч.";
+"accessibility.conference.lowerHand" = "Доод гар";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/mr.lproj/Localizable.strings b/Ring/Ring/Resources/mr.lproj/Localizable.strings
index 7a42ae4d9..730f377fb 100644
--- a/Ring/Ring/Resources/mr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/mr.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "पासवर्ड पुष्टी करा";
+"global.confirm" = "पुष्टी करा";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "पुष्टी करा";
+"global.connect" = "कनेक्ट करा";
 
 // Scan
 "scan.badQrCode" = "खराब क्यूआर कोड";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "माझ्याकडे आधीच खाते आहे";
 "welcome.linkDevice" = "दुसर्या उपकरणाकडून आयात";
 "welcome.linkBackup" = "बॅकअप बॅकअपमधून आयात";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami खाते तयार करा";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "खाते जोडणे";
-"linkToAccount.linkButtonTitle" = "दुवा";
-"linkToAccount.linkDeviceTitle" = "दुवा साधना";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR कोड स्कॅन करा";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "जिमी खाते स्थानिक संग्रहण फाइलमधून आयात करा.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "नवीन डिव्हाइस लिंक करा";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "तपासणी";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ऑडिओ कॉल सुरू करा";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "ऑनलाईन";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "संपादित";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "गप्प मायक्रोफोन";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "विराम कॉल";
+"accessibility.calls.default.hangUpCall" = "बंद करा";
 "accessibility.calls.default.addParticipant" = "सहभागी जोडा";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "मोकळी चर्चा";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "हात उंचावा";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "कॅमेरा थांबवा";
 "accessibility.calls.alter.pauseCall" = "पुनरावृत्ती कॉल";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "बंद करा";
+"accessibility.calls.alter.addParticipant" = "सहभागी जोडा";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "मोकळी चर्चा";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "खालचा हात";
+"accessibility.conference.minimize" = "कमीत कमी करा";
+"accessibility.conference.maximize" = "जास्तीत जास्त";
+"accessibility.conference.setModerator" = "मॉडरेटर सेट करा";
+"accessibility.conference.unsetModerator" = "अनसेट मॉडरेटर";
+"accessibility.conference.muteAudio" = "गप्प आवाज";
 "accessibility.conference.unmuteAudio" = "अनमूट ऑडिओ";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "बंद करा";
+"accessibility.conference.lowerHand" = "खालचा हात";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ms.lproj/Localizable.strings b/Ring/Ring/Resources/ms.lproj/Localizable.strings
index 2b863b543..29cf7ca9d 100644
--- a/Ring/Ring/Resources/ms.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ms.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Masa";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Sahkan kata laluan";
+"global.confirm" = "സ്ഥിരീകരണം";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "സ്ഥിരീകരണം";
+"global.connect" = "ബന്ധിപ്പിക്കുക";
 
 // Scan
 "scan.badQrCode" = "മോശം ക്യുആർ കോഡ്";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "എനിക്ക് ഒരു അക്കൌണ്ട് ഉണ്ട്";
 "welcome.linkDevice" = "മറ്റൊരു ഉപകരണത്തിൽ നിന്നും ഇറക്കുമതി ചെയ്യുക";
 "welcome.linkBackup" = "ആർക്കൈവ് ബാക്കപ്പ് നിന്നും ഇറക്കുമതി ചെയ്യുക";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "ജാമി അക്കൌണ്ട് സൃഷ്ടിക്കുക";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "അക്കൌണ്ട് ബന്ധിപ്പിക്കൽ";
-"linkToAccount.linkButtonTitle" = "ലിങ്ക്";
-"linkToAccount.linkDeviceTitle" = "ലിങ്ക് ഉപകരണം";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "ക്യുആർ കോഡ് സ്കാൻ ചെയ്യുക";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "ക്യുആർ കോഡ്";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "ജാമി അക്കൌണ്ട് പ്രാദേശിക ആർക്കൈവ് ഫയലിൽ നിന്നും ഇറക്കുമതി ചെയ്യുക.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "പുതിയ ഉപകരണം ലിങ്ക് ചെയ്യുക";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "പരിശോധന";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ഓഡിയോ കോൾ ആരംഭിക്കുക";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "ഓൺലൈൻ";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "പരിഷ്ക്കരിക്കുക";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "മിണ്ടാത്ത മൈക്രോഫോൺ";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "ഇടവേള വിളി";
+"accessibility.calls.default.hangUpCall" = "Putuskan";
 "accessibility.calls.default.addParticipant" = "പങ്കാളിയെ കൂട്ടിച്ചേർക്കുക";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "തുറന്ന സംഭാഷണം";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "കൈ ഉയര് ത്തുക";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "ക്യാമറ നിർത്തുക";
 "accessibility.calls.alter.pauseCall" = "പുനരാരംഭിക്കുക";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Putuskan";
+"accessibility.calls.alter.addParticipant" = "പങ്കാളിയെ കൂട്ടിച്ചേർക്കുക";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "തുറന്ന സംഭാഷണം";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "താഴത്തെ കൈ";
+"accessibility.conference.minimize" = "പരിമിതപ്പെടുത്തുക";
+"accessibility.conference.maximize" = "പരമാവധി";
+"accessibility.conference.setModerator" = "മോഡറേറ്റർ സജ്ജമാക്കുക";
+"accessibility.conference.unsetModerator" = "മോഡറേറ്റർ അൺസെറ്റ് ചെയ്യുക";
+"accessibility.conference.muteAudio" = "Matikan bunyi";
 "accessibility.conference.unmuteAudio" = "നിശബ്ദമായ ഓഡിയോ";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Putuskan";
+"accessibility.conference.lowerHand" = "താഴത്തെ കൈ";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/nan.lproj/Localizable.strings b/Ring/Ring/Resources/nan.lproj/Localizable.strings
index eb2e4043d..dc25b013c 100644
--- a/Ring/Ring/Resources/nan.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nan.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "æ—¶é—´";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "确认密码";
+"global.confirm" = "確認";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "確認";
+"global.connect" = "连接";
 
 // Scan
 "scan.badQrCode" = "Bad QR code";
@@ -120,7 +123,7 @@
 "smartlist.inviteFriends" = "Invite friends";
 "smartlist.accounts" = "账户";
 "smartlist.disableDonation" = "现在不要";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "如果您喜欢使用 Jami 并相信我们的使命,您愿意捐款吗?";
 "smartlist.inSynchronization" = "conversation in synchronization";
 "smartlist.newMessage" = "新消息";
 
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "I already have an account";
 "welcome.linkDevice" = "Import from another device";
 "welcome.linkBackup" = "從封存備份匯入";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "建立 Jami 帳號";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -181,7 +184,7 @@
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
 "createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以便他人在 Jami 上找到并联系您。";
 "createAccount.newAccount" = "新增帳號";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Account linking";
-"linkToAccount.linkButtonTitle" = "链接";
-"linkToAccount.linkDeviceTitle" = "关联设备";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "使用此设备上的现有Jami帐户需要PIN码。";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "输入PIN码";
-"linkToAccount.scanQRCode" = "扫描 QR 码";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "二维码";
+"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" = "離開";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Device revocation error";
 "accountPage.linkDeviceTitle" = "Link another device";
 "accountPage.other" = "Other";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "如果该帐户未备份或添加到其他设备,则该帐户和注册用户名将不可找回地丢失。";
 "accountPage.inviteFriends" = "Invite friends";
 "accountPage.contactMeOnJamiTitle" = "Contact me on Jami!";
 "accountPage.contactMeOnJamiContant" = "Contact me using “%s” on the Jami distributed communication platform: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "关联新设备";
-"linkDevice.passwordError" = "使用该密码无法解锁您的账户。";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verifying";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -531,53 +552,55 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "線上";
 "accessibility.userPresenceAvailable" = "可获得的";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "拒绝邀请";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accept invitation";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "已编辑";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "关闭麦克风";
+"accessibility.calls.default.toggleVideo" = "启动摄像头";
+"accessibility.calls.default.pauseCall" = "暫停通話";
+"accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "麦克风静音";
+"accessibility.calls.alter.toggleVideo" = "关闭摄像头";
 "accessibility.calls.alter.pauseCall" = "恢复通话";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "挂断";
+"accessibility.calls.alter.addParticipant" = "添加参与者";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "打开会话";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
-"accessibility.calls.alter.raiseHand" = "Lower hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.calls.alter.raiseHand" = "放下手";
+"accessibility.conference.minimize" = "最小化";
+"accessibility.conference.maximize" = "最大化";
+"accessibility.conference.setModerator" = "設定主持人";
+"accessibility.conference.unsetModerator" = "取消設定主持人";
+"accessibility.conference.muteAudio" = "静音";
 "accessibility.conference.unmuteAudio" = "取消静音";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "挂断";
+"accessibility.conference.lowerHand" = "放下手";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/nb.lproj/Localizable.strings b/Ring/Ring/Resources/nb.lproj/Localizable.strings
index c1ff05607..afb3ca252 100644
--- a/Ring/Ring/Resources/nb.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nb.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Tid";
 "global.editPassword" = "Endre passord";
 "global.confirmPassword" = "Bekreft passord";
+"global.confirm" = "Bekreft";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Bekreft";
+"global.connect" = "Koble til";
 
 // Scan
 "scan.badQrCode" = "Ugyldig QR kode";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Jeg har allerede en konto";
 "welcome.linkDevice" = "Import fra en annen enhet";
 "welcome.linkBackup" = "Importer fra sikkerhetskopi";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "opprette Jami-konto";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Kontotilknyttning";
-"linkToAccount.linkButtonTitle" = "Lenk";
-"linkToAccount.linkDeviceTitle" = "Tilknytt enhet";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skanne QR-kode";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR kode";
+"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" = "Avslutt";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Import Jami konto fra lokale arkiv fil.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Tilknytt ny enhet";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Bekrefter";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Start lydsamtale";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Tilkoblet";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Redigert";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Koble ut mikrofon";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Sett samtale på vent";
+"accessibility.calls.default.hangUpCall" = "Legg på";
 "accessibility.calls.default.addParticipant" = "Legg til deltager";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Ã…pne samtale";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Rekk opp hånden";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stopp kamera";
 "accessibility.calls.alter.pauseCall" = "Gjenopta samtale";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Legg på";
+"accessibility.calls.alter.addParticipant" = "Legg til deltager";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Ã…pne samtale";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Ta ned hånden";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.conference.minimize" = "Minimer";
+"accessibility.conference.maximize" = "Maksimer";
+"accessibility.conference.setModerator" = "Angi ordstyrer";
+"accessibility.conference.unsetModerator" = "Avløs ordstyrer";
+"accessibility.conference.muteAudio" = "Koble ut lyden";
 "accessibility.conference.unmuteAudio" = "Slå på lyden";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Legg på";
+"accessibility.conference.lowerHand" = "Ta ned hånden";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ne.lproj/Localizable.strings b/Ring/Ring/Resources/ne.lproj/Localizable.strings
index 786e4848e..9d4847ad3 100644
--- a/Ring/Ring/Resources/ne.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ne.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "पासवर्ड पुष्टि गर्नुहोस्";
+"global.confirm" = "पुष्टि गर्नुहोस्";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "पुष्टि गर्नुहोस्";
+"global.connect" = "जोड्नुहोस्";
 
 // Scan
 "scan.badQrCode" = "खराब QR कोड";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "मेरो खाता छ";
 "welcome.linkDevice" = "अर्को उपकरणबाट आयात";
 "welcome.linkBackup" = "अभिलेख प्रतिस्थापनबाट आयात";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami खाता सिर्जना गर्नुहोस्";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "खाताहरू जोड्ने";
-"linkToAccount.linkButtonTitle" = "लिंक";
-"linkToAccount.linkDeviceTitle" = "लिङ्क उपकरण";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR कोड स्क्यान गर्नुहोस्";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "स्थानीय अभिलेख फाइलबाट जामी खाता आयात गर्नुहोस्।";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "नयाँ यन्त्रलाई लिंक गर्नुहोस्";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "प्रमाणिकरण";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "अडियो कल सुरु गर्नुहोस्";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "अनलाइन";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "सम्पादन";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "गहिरो माइक्रोफोन";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "विरामको लागि कल";
+"accessibility.calls.default.hangUpCall" = "बन्द गर";
 "accessibility.calls.default.addParticipant" = "सहभागी थप";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "खुला कुराकानी";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "हात उठाउनुहोस्";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "क्यामेरा रोक्नुहोस्";
 "accessibility.calls.alter.pauseCall" = "पुनः कल";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "बन्द गर";
+"accessibility.calls.alter.addParticipant" = "सहभागी थप";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "खुला कुराकानी";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "तलको हात";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.conference.minimize" = "कम्तिमा";
+"accessibility.conference.maximize" = "अधिकतम";
+"accessibility.conference.setModerator" = "मोडरेटर सेट गर्नुहोस्";
+"accessibility.conference.unsetModerator" = "अनसेट मोडरेटर";
+"accessibility.conference.muteAudio" = "अडियो बन्द";
 "accessibility.conference.unmuteAudio" = "अनमोल अडियो";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "बन्द गर";
+"accessibility.conference.lowerHand" = "तलको हात";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/nl.lproj/Localizable.strings b/Ring/Ring/Resources/nl.lproj/Localizable.strings
index 7a05e3d6a..5582c10c8 100644
--- a/Ring/Ring/Resources/nl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Tijd";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Bevestig wachtwoord";
+"global.confirm" = "Bevestigen";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Bevestigen";
+"global.connect" = "Verbinden";
 
 // Scan
 "scan.badQrCode" = "Verkeerde QR-code";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Ik heb al een account.";
 "welcome.linkDevice" = "Import van een ander apparaat";
 "welcome.linkBackup" = "Importeren van back-uparchief";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Maak een account op Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Account koppelen";
-"linkToAccount.linkButtonTitle" = "Koppelen";
-"linkToAccount.linkDeviceTitle" = "Apparaat koppelen";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Scan QR-code";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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" = "Afsluiten";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importeer Jami-account uit het lokale archiefbestand.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Nieuw apparaat koppelen";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verifiëren";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Audio-oproep starten";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Gecorrigeerd";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Microfoon dempen";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Pauze oproep";
+"accessibility.calls.default.hangUpCall" = "Ophangen";
 "accessibility.calls.default.addParticipant" = "Deelnemer toevoegen";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Gesprek openen";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Hand opsteken";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stopcamera";
 "accessibility.calls.alter.pauseCall" = "Hervat het gesprek";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Ophangen";
+"accessibility.calls.alter.addParticipant" = "Deelnemer toevoegen";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Gesprek openen";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Onderaan hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.conference.minimize" = "Minimaliseren";
+"accessibility.conference.maximize" = "Maximaliseren";
+"accessibility.conference.setModerator" = "Stel moderator in";
+"accessibility.conference.unsetModerator" = "De moderator is niet ingesteld.";
+"accessibility.conference.muteAudio" = "Geluid dempen";
 "accessibility.conference.unmuteAudio" = "Niet-gemakkelijk geluid";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Ophangen";
+"accessibility.conference.lowerHand" = "Onderaan hand";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/nn.lproj/Localizable.strings b/Ring/Ring/Resources/nn.lproj/Localizable.strings
index b31ad67b1..35793cf17 100644
--- a/Ring/Ring/Resources/nn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nn.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Bekreft passord";
+"global.confirm" = "Bekreft";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Bekreft";
+"global.connect" = "Knytta";
 
 // Scan
 "scan.badQrCode" = "DÃ¥leg QR-kod";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Eg har allereie ein konto";
 "welcome.linkDevice" = "Import frå ein annan enhet";
 "welcome.linkBackup" = "Import frå backup";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Skapa Jami-konto";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Kontokoppbinding";
-"linkToAccount.linkButtonTitle" = "Link";
-"linkToAccount.linkDeviceTitle" = "Linketøy";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skanna QR-kode";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR-kode";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar Jami-kontoen frå lokal arkivfil.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Link nytt utstyr";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verifisering";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Start lydsamtale";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "PÃ¥ nett";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Redigert";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Stum mikrofon";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Pause ring";
+"accessibility.calls.default.hangUpCall" = "Henga opp";
 "accessibility.calls.default.addParticipant" = "Legg til deltakar";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Ã…pen samtale";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Rekk opp handa";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stopp kamera";
 "accessibility.calls.alter.pauseCall" = "Fortsett samtalen";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Henga opp";
+"accessibility.calls.alter.addParticipant" = "Legg til deltakar";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Ã…pen samtale";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Nedre hand";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
+"accessibility.conference.minimize" = "Minimer det";
+"accessibility.conference.maximize" = "Maksimalgjøre";
 "accessibility.conference.setModerator" = "Set moderator";
 "accessibility.conference.unsetModerator" = "Unset moderator";
-"accessibility.conference.muteAudio" = "Mute audio";
+"accessibility.conference.muteAudio" = "Stum lyd";
 "accessibility.conference.unmuteAudio" = "Utimt lyd";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Henga opp";
+"accessibility.conference.lowerHand" = "Nedre hand";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/oc.lproj/Localizable.strings b/Ring/Ring/Resources/oc.lproj/Localizable.strings
index 1d399957a..aa1645249 100644
--- a/Ring/Ring/Resources/oc.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/oc.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Confirmar lo senhal";
+"global.confirm" = "Confirmacion";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirmacion";
+"global.connect" = "Se connectar";
 
 // Scan
 "scan.badQrCode" = "Marrit QR còdi";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Ai ja un compte";
 "welcome.linkDevice" = "Importar d'un autre dispositiu";
 "welcome.linkBackup" = "Importar d’una salvagarda";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Creacion d' un compte Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Rencontre de compte";
-"linkToAccount.linkButtonTitle" = "Link";
-"linkToAccount.linkDeviceTitle" = "Dispositiu de ligam";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Escanar lo còdi QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Còdi 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.exit" = "Quitar";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar lo compte Jami del fichièr d'archiu local.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Link dispositiu novèl";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verificacion";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Començar l'audio-call";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "En linha";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Edicion";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Micròfon silenciós";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Pausa de trucar";
+"accessibility.calls.default.hangUpCall" = "Ã’c, tanca.";
 "accessibility.calls.default.addParticipant" = "Ajustar participant";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Dobrir conversacions";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Levant la man";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Camèra d' arrestacion";
 "accessibility.calls.alter.pauseCall" = "Reviure l' apèl";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Ã’c, tanca.";
+"accessibility.calls.alter.addParticipant" = "Ajustar participant";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Dobrir conversacions";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Man inferiora";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Reduire";
+"accessibility.conference.maximize" = "Maximizar";
+"accessibility.conference.setModerator" = "Configuracion de moderator";
+"accessibility.conference.unsetModerator" = "Moderator desactivat";
 "accessibility.conference.muteAudio" = "Copar lo son";
 "accessibility.conference.unmuteAudio" = "Audio imut";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Ã’c, tanca.";
+"accessibility.conference.lowerHand" = "Man inferiora";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/or.lproj/Localizable.strings b/Ring/Ring/Resources/or.lproj/Localizable.strings
index ada4af4c3..f64d24219 100644
--- a/Ring/Ring/Resources/or.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/or.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Confirm password";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Bad QR code";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Account linking";
-"linkToAccount.linkButtonTitle" = "Link";
-"linkToAccount.linkDeviceTitle" = "Link device";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Scan QR code";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Import Jami account from local archive file.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Link new device";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verifying";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Start audio call";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,17 +565,16 @@
 "accessibility.messageBubbleEdited" = "Edited";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
+"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.calls.default.pauseCall" = "Pause call";
 "accessibility.calls.default.hangUpCall" = "Hang up";
 "accessibility.calls.default.addParticipant" = "Add participant";
@@ -563,8 +584,8 @@
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Raise hand";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
 "accessibility.calls.alter.pauseCall" = "Resume call";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
 "accessibility.calls.alter.addParticipant" = "Add participant";
@@ -581,3 +602,5 @@
 "accessibility.conference.unmuteAudio" = "Unmute audio";
 "accessibility.conference.hangup" = "Hang up";
 "accessibility.conference.lowerHand" = "Lower hand";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/pa.lproj/Localizable.strings b/Ring/Ring/Resources/pa.lproj/Localizable.strings
index e40a267c2..2b27c51bd 100644
--- a/Ring/Ring/Resources/pa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pa.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Confirm password";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "ਜੋੜੋ";
 
 // Scan
 "scan.badQrCode" = "Bad QR code";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "ਖਾਤਾ ਲਿੰਕ ਕਰਨਾ";
-"linkToAccount.linkButtonTitle" = "Link";
-"linkToAccount.linkDeviceTitle" = "ਡੀਵਾਈਸ ਲਿੰਕ ਕਰੋ";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Scan QR code";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Import Jami account from local archive file.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "ਨਵਾਂ ਡੀਵਾਈਸ ਲਿੰਕ ਕਰੋ";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "ਪੁਸ਼ਟੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Start audio call";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "ਆਨਲਾਈਨ";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,19 +565,18 @@
 "accessibility.messageBubbleEdited" = "Edited";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
+"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" = "ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਬੰਦ ਕਰੋ";
+"accessibility.calls.default.toggleVideo" = "Start camera";
 "accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"accessibility.calls.default.hangUpCall" = "ਕਾਲ ਕੱਟੋ";
 "accessibility.calls.default.addParticipant" = "Add participant";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
@@ -563,10 +584,10 @@
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Raise hand";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
 "accessibility.calls.alter.pauseCall" = "Resume call";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "ਕਾਲ ਕੱਟੋ";
 "accessibility.calls.alter.addParticipant" = "Add participant";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
@@ -574,10 +595,12 @@
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Lower hand";
 "accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
+"accessibility.conference.maximize" = "ਵੱਡਾ ਕਰੋ";
 "accessibility.conference.setModerator" = "Set moderator";
 "accessibility.conference.unsetModerator" = "Unset moderator";
 "accessibility.conference.muteAudio" = "Mute audio";
 "accessibility.conference.unmuteAudio" = "Unmute audio";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "ਕਾਲ ਕੱਟੋ";
 "accessibility.conference.lowerHand" = "Lower hand";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/pl.lproj/Localizable.strings b/Ring/Ring/Resources/pl.lproj/Localizable.strings
index f1a10e866..cbc503d90 100644
--- a/Ring/Ring/Resources/pl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Czas";
 "global.editPassword" = "Edytuj hasło";
 "global.confirmPassword" = "Potwierdź hasło";
+"global.confirm" = "Potwierdź";
 "global.cameraDisabled" = "Dostęp do kamery jest wyłączony. Włącz go w ustawieniach urządzenia, aby skorzystać z tej funkcji.";
+"global.confirm" = "Potwierdź";
+"global.connect" = "Połącz";
 
 // Scan
 "scan.badQrCode" = "Niepoprawny kod QR";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Mam już konto.";
 "welcome.linkDevice" = "Importuje siÄ™ z innego urzÄ…dzenia";
 "welcome.linkBackup" = "Importuj z archiwum kopii zapasowej";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Utworz konto Jami";
 "welcome.connectToJAMS" = "Połącz się z serwerem zarządzania kontami Jami (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Łączenie konta";
-"linkToAccount.linkButtonTitle" = "Połącz";
-"linkToAccount.linkDeviceTitle" = "Połącz urządzenie";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skanowanie kodu QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Importuj konto";
+"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.exit" = "Wyjdź";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importuj konto Jami z lokalnego archiwum.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Połącz nowe urządzenie";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Weryfikowanie";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Rozpocznij połączenie głosowe";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Dostępne";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Wydany w wersji";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Wycisz mikrofon";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Wstrzymaj połączenie";
+"accessibility.calls.default.hangUpCall" = "Rozłącz się";
 "accessibility.calls.default.addParticipant" = "Dodaj uczestnika";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Otwórz rozmowę";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Podnieś rękę";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "/Zatrzymaj kamerÄ™";
 "accessibility.calls.alter.pauseCall" = "Wznów połączenie";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Rozłącz się";
+"accessibility.calls.alter.addParticipant" = "Dodaj uczestnika";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Otwórz rozmowę";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Dolna ręka";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Zminimalizuj";
+"accessibility.conference.maximize" = "Maksymalizuj";
+"accessibility.conference.setModerator" = "Zaznacz moderatora";
+"accessibility.conference.unsetModerator" = "Odznacz moderatora";
 "accessibility.conference.muteAudio" = "Wyłącz dźwięk";
 "accessibility.conference.unmuteAudio" = "Wyłącz wyciszenie dźwięku";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Rozłącz się";
+"accessibility.conference.lowerHand" = "Dolna ręka";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
index 70a159f89..97afce450 100644
--- a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Czas";
 "global.editPassword" = "Edytuj hasło";
 "global.confirmPassword" = "Potwierdź hasło";
+"global.confirm" = "Potwierdź";
 "global.cameraDisabled" = "Dostęp do kamery jest wyłączony. Włącz go w ustawieniach urządzenia, aby skorzystać z tej funkcji.";
+"global.confirm" = "Potwierdź";
+"global.connect" = "Połącz";
 
 // Scan
 "scan.badQrCode" = "Niepoprawny kod QR";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Mam już konto.";
 "welcome.linkDevice" = "Importuje siÄ™ z innego urzÄ…dzenia";
 "welcome.linkBackup" = "Importuj z archiwum kopii zapasowej";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Utworz konto Jami";
 "welcome.connectToJAMS" = "Połącz się z serwerem zarządzania kontami Jami (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Łączenie konta";
-"linkToAccount.linkButtonTitle" = "Połącz";
-"linkToAccount.linkDeviceTitle" = "Połącz urządzenie";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skanowanie kodu QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Importuj konto";
+"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.exit" = "Zakończ";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importuj konto Jami z lokalnego archiwum.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Połącz nowe urządzenie";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Weryfikowanie";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Rozpocznij połączenie głosowe";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Dostępne";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Edytowany";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Wycisz mikrofon";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Wstrzymaj połączenie";
+"accessibility.calls.default.hangUpCall" = "Odłoż słuchawkę";
 "accessibility.calls.default.addParticipant" = "Dodaj uczestnika";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Otwórz rozmowę";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Podnieś rękę";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "/Zatrzymaj kamerÄ™";
 "accessibility.calls.alter.pauseCall" = "Wznów połączenie";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Odłoż słuchawkę";
+"accessibility.calls.alter.addParticipant" = "Dodaj uczestnika";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Otwórz rozmowę";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Dolna ręka";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Minimalizuj";
+"accessibility.conference.maximize" = "Maksymalizuj";
+"accessibility.conference.setModerator" = "Zaznacz moderatora";
+"accessibility.conference.unsetModerator" = "Odznacz moderatora";
 "accessibility.conference.muteAudio" = "Wyłącz dźwięk";
 "accessibility.conference.unmuteAudio" = "Wyłącz wyciszenie dźwięku";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Odłoż słuchawkę";
+"accessibility.conference.lowerHand" = "Dolna ręka";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
index 2f2b4f552..1ca9a9e9e 100644
--- a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Tempo";
 "global.editPassword" = "Editar palavra-passe";
 "global.confirmPassword" = "Confirmar senha";
+"global.confirm" = "Confirmar";
 "global.cameraDisabled" = "O acesso à câmara está desativado. Ative-o nas configurações do dispositivo para poder utilizar esta funcionalidade.";
+"global.confirm" = "Confirmar";
+"global.connect" = "Conectar";
 
 // Scan
 "scan.badQrCode" = "Código QR ilegível";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Eu já tenho uma conta";
 "welcome.linkDevice" = "Importar de outro dispositivo";
 "welcome.linkBackup" = "Importar de um arquivo de backup";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Criar conta do Jami";
 "welcome.connectToJAMS" = "Conectar ao servidor de gestão de conta Jami (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "Uma conta Jami é criada e armazenada localmente apenas neste dispositivo como um arquivo que contém as suas chaves de conta. O acesso ao arquivo pode, opcionalmente, ser protegido com uma palavra-passe.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Vinculação de conta";
-"linkToAccount.linkButtonTitle" = "Vincular";
-"linkToAccount.linkDeviceTitle" = "Vincular dispositivo";
-"linkToAccount.linkDeviceMessage" = "Escolha “Vincular um novo dispositivo” a partir de outra aplicação Jami para mostrar o código QR ou gerar um código PIN.";
-"linkToAccount.explanationMessage" = "É necessário um código PIN para utilizar uma conta Jami existente neste dispositivo.";
-"linkToAccount.pinPlaceholder" = "Código PIN";
-"linkToAccount.pinLabel" = "Introduza o código PIN";
-"linkToAccount.scanQRCode" = "Escanar código QR";
-"linkToAccount.explanationPinMessage" = "Para gerar o código PIN, aceda às configurações de gestão da conta no dispositivo que contém a conta à qual pretende ligar. Selecione “Vincular novo dispositivo”. Receberá o código PIN necessário para preencher este formulário. O código PIN expira dentro de 10 minutos.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Código 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.exit" = "Sair";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importa a conta Jami do arquivo local.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Vincular novo dispositivo";
-"linkDevice.passwordError" = "Palavra-passe incorreta. Tente novamente com a palavra-passe correta.";
 "linkDevice.networkError" = "Ocorreu um erro de rede durante a exportação da conta.";
-"linkDevice.defaultError" = "Ocorreu um erro durante a exportação da conta.";
-"linkDevice.explanationMessage" = "Abra o Jami no novo dispositivo e selecione “Vincular este dispositivo a uma conta” para concluir o processo. O código PIN expira dentro de 10 minutos.";
-"linkDevice.hudMessage" = "Verificando";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Iniciar chamada de áudio";
@@ -531,53 +552,55 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Disponível";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Recusar convite";
 "accessibility.pendingRequestsListAcceptInvitation" = "Aceitar convite";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Desativar microfone";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Pausa chamada";
+"accessibility.calls.default.hangUpCall" = "Desligar";
 "accessibility.calls.default.addParticipant" = "Adicionar participante";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Conversa em curso";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Levantar a mão";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Ativar microfone";
+"accessibility.calls.alter.toggleVideo" = "Parar a câmera";
 "accessibility.calls.alter.pauseCall" = "Retornar chamada";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Desligar";
+"accessibility.calls.alter.addParticipant" = "Adicionar participante";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Conversa em curso";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Abaixar a mão";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Minimizar";
+"accessibility.conference.maximize" = "Maximizar";
+"accessibility.conference.setModerator" = "Definir moderador";
+"accessibility.conference.unsetModerator" = "Moderador não definido";
 "accessibility.conference.muteAudio" = "Desabilitar som do áudio";
 "accessibility.conference.unmuteAudio" = "Ligar áudio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Desligar";
+"accessibility.conference.lowerHand" = "Abaixar a mão";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/pt.lproj/Localizable.strings b/Ring/Ring/Resources/pt.lproj/Localizable.strings
index 72715762f..9c8455b99 100644
--- a/Ring/Ring/Resources/pt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Tempo";
 "global.editPassword" = "Editar palavra-passe";
 "global.confirmPassword" = "Confirmar palavra-passe";
+"global.confirm" = "Confirmar";
 "global.cameraDisabled" = "O acesso à câmara está desativado. Ative-o nas configurações do dispositivo para poder utilizar esta funcionalidade.";
+"global.confirm" = "Confirmar";
+"global.connect" = "Conectar";
 
 // Scan
 "scan.badQrCode" = "Código QR inválido";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Já tenho uma conta";
 "welcome.linkDevice" = "Importar de outro dispositivo";
 "welcome.linkBackup" = "Importar do arquivo de cópia de segurança";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Criar uma conta Jami";
 "welcome.connectToJAMS" = "Conectar ao servidor de gestão de conta Jami (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "Uma conta Jami é criada e armazenada localmente apenas neste dispositivo como um arquivo que contém as suas chaves de conta. O acesso ao arquivo pode, opcionalmente, ser protegido com uma palavra-passe.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Vinculação de contas";
-"linkToAccount.linkButtonTitle" = "Vincular";
-"linkToAccount.linkDeviceTitle" = "Vincular dispositivo";
-"linkToAccount.linkDeviceMessage" = "Escolha “Vincular um novo dispositivo” a partir de outra aplicação Jami para mostrar o código QR ou gerar um código PIN.";
-"linkToAccount.explanationMessage" = "É necessário um código PIN para utilizar uma conta Jami existente neste dispositivo.";
-"linkToAccount.pinPlaceholder" = "Código PIN";
-"linkToAccount.pinLabel" = "Introduza o código PIN";
-"linkToAccount.scanQRCode" = "Digitalizar código QR";
-"linkToAccount.explanationPinMessage" = "Para gerar o código PIN, aceda às configurações de gestão da conta no dispositivo que contém a conta à qual pretende ligar. Selecione “Vincular novo dispositivo”. Receberá o código PIN necessário para preencher este formulário. O código PIN expira dentro de 10 minutos.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Código 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.exit" = "Sair";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar a conta Jami do ficheiro local.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Vincular novo dispositivo";
-"linkDevice.passwordError" = "Palavra-passe incorreta. Tente novamente com a palavra-passe correta.";
 "linkDevice.networkError" = "Ocorreu um erro de rede durante a exportação da conta.";
-"linkDevice.defaultError" = "Ocorreu um erro durante a exportação da conta.";
-"linkDevice.explanationMessage" = "Abra o Jami no novo dispositivo e selecione “Vincular este dispositivo a uma conta” para concluir o processo. O código PIN expira dentro de 10 minutos.";
-"linkDevice.hudMessage" = "A verificar";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Começar chamada de áudio";
@@ -531,53 +552,55 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Ligado";
 "accessibility.userPresenceAvailable" = "Disponível";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Recusar convite";
 "accessibility.pendingRequestsListAcceptInvitation" = "Aceitar convite";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Silenciar microfone";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Pausar chamada";
+"accessibility.calls.default.hangUpCall" = "Desligar";
 "accessibility.calls.default.addParticipant" = "Adicionar participante";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Abrir conversação";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Levantar a mão";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Ativar microfone";
+"accessibility.calls.alter.toggleVideo" = "Parar a câmara";
 "accessibility.calls.alter.pauseCall" = "Retomar chamada";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Desligar";
+"accessibility.calls.alter.addParticipant" = "Adicionar participante";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Abrir conversação";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Baixar mão";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Minimizar";
+"accessibility.conference.maximize" = "Maximizar";
+"accessibility.conference.setModerator" = "Definir moderador";
+"accessibility.conference.unsetModerator" = "Moderador não definido";
 "accessibility.conference.muteAudio" = "Desativar som do áudio";
 "accessibility.conference.unmuteAudio" = "Ligar áudio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Desligar";
+"accessibility.conference.lowerHand" = "Baixar mão";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
index 341e14e99..965f3c2e7 100644
--- a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Tempo";
 "global.editPassword" = "Editar palavra-passe";
 "global.confirmPassword" = "Confirmar palavra-passe";
+"global.confirm" = "Confirmar";
 "global.cameraDisabled" = "O acesso à câmara está desativado. Ative-o nas configurações do dispositivo para poder utilizar esta funcionalidade.";
+"global.confirm" = "Confirmar";
+"global.connect" = "Conectar";
 
 // Scan
 "scan.badQrCode" = "Código QR inválido";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Já tenho uma conta";
 "welcome.linkDevice" = "Importar de outro dispositivo";
 "welcome.linkBackup" = "Importar do arquivo de cópia de segurança";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Criar uma conta Jami";
 "welcome.connectToJAMS" = "Conectar ao servidor de gestão de conta Jami (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "Uma conta Jami é criada e armazenada localmente apenas neste dispositivo como um arquivo que contém as suas chaves de conta. O acesso ao arquivo pode, opcionalmente, ser protegido com uma palavra-passe.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Vinculação de contas";
-"linkToAccount.linkButtonTitle" = "Vincular";
-"linkToAccount.linkDeviceTitle" = "Vincular dispositivo";
-"linkToAccount.linkDeviceMessage" = "Escolha “Vincular um novo dispositivo” a partir de outra aplicação Jami para mostrar o código QR ou gerar um código PIN.";
-"linkToAccount.explanationMessage" = "É necessário um código PIN para utilizar uma conta Jami existente neste dispositivo.";
-"linkToAccount.pinPlaceholder" = "Código PIN";
-"linkToAccount.pinLabel" = "Introduza o código PIN";
-"linkToAccount.scanQRCode" = "Digitalizar código QR";
-"linkToAccount.explanationPinMessage" = "Para gerar o código PIN, aceda às configurações de gestão da conta no dispositivo que contém a conta à qual pretende ligar. Selecione “Vincular novo dispositivo”. Receberá o código PIN necessário para preencher este formulário. O código PIN expira dentro de 10 minutos.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Código 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.exit" = "Sair";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importar a conta Jami do ficheiro local.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Vincular novo dispositivo";
-"linkDevice.passwordError" = "Palavra-passe incorreta. Tente novamente com a palavra-passe correta.";
 "linkDevice.networkError" = "Ocorreu um erro de rede durante a exportação da conta.";
-"linkDevice.defaultError" = "Ocorreu um erro durante a exportação da conta.";
-"linkDevice.explanationMessage" = "Abra o Jami no novo dispositivo e selecione “Vincular este dispositivo a uma conta” para concluir o processo. O código PIN expira dentro de 10 minutos.";
-"linkDevice.hudMessage" = "A verificar";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Começar chamada de áudio";
@@ -531,53 +552,55 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Ligado";
 "accessibility.userPresenceAvailable" = "Disponível";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Recusar convite";
 "accessibility.pendingRequestsListAcceptInvitation" = "Aceitar convite";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "Editado";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Silenciar microfone";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Pausar chamada";
+"accessibility.calls.default.hangUpCall" = "Desligar";
 "accessibility.calls.default.addParticipant" = "Adicionar participante";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Abrir conversação";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Levantar a mão";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Ativar microfone";
+"accessibility.calls.alter.toggleVideo" = "Parar a câmara";
 "accessibility.calls.alter.pauseCall" = "Retomar chamada";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Desligar";
+"accessibility.calls.alter.addParticipant" = "Adicionar participante";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Abrir conversação";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Baixar mão";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Minimizar";
+"accessibility.conference.maximize" = "Maximizar";
+"accessibility.conference.setModerator" = "Definir moderador";
+"accessibility.conference.unsetModerator" = "Moderador não definido";
 "accessibility.conference.muteAudio" = "Desativar som do áudio";
 "accessibility.conference.unmuteAudio" = "Ligar áudio";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "Desligar";
+"accessibility.conference.lowerHand" = "Baixar mão";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ro.lproj/Localizable.strings b/Ring/Ring/Resources/ro.lproj/Localizable.strings
index 82a31f4c3..190406631 100644
--- a/Ring/Ring/Resources/ro.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Ora";
 "global.editPassword" = "Schimbă parola";
 "global.confirmPassword" = "Confirmă parola";
+"global.confirm" = "Confirmă";
 "global.cameraDisabled" = "Accesul la cameră este dezactivat. Activează-l din reglări.";
+"global.confirm" = "Confirmă";
+"global.connect" = "Conectează";
 
 // Scan
 "scan.badQrCode" = "Codul QR e greșit";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Lista publică";
 "smartlist.jamsResults" = "Rezultatele căutării";
 "smartlist.conversations" = "Conversații";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Nicio conversație nu corespunde căutării.";
 "smartlist.newContact" = "Contact nou";
 "smartlist.newGroup" = "Grup nou";
 "smartlist.accounts" = "Conturi";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Introdu numele…";
 "smartlist.searchBar" = "Caută";
 "smartlist.noNetworkConnectivity" = "Nu există conectare la rețea";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Asigură-te că accesul la rețea este permis.";
 "smartlist.accountsTitle" = "Conturi";
 "smartlist.addAccountButton" = "+ Adaugă un cont";
 "smartlist.noNumber" = "Contactul ales nu are niciun număr";
@@ -127,7 +130,7 @@
 // Conversation
 "conversation.addToContactsButton" = "Adaugă la contacte";
 "conversation.addToContactsLabel" = "Adaugi la contacte?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ nu este în contactele tale";
 "conversation.messagePlaceholder" = "Scrie pentru";
 "conversation.errorSavingImage" = "A apărut o eroare în timpul salvării imaginii.";
 "conversation.receivedRequest" = "%@ ți-a trimis o invitație la conversație.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Am deja un cont";
 "welcome.linkDevice" = "Importă din alt aparat";
 "welcome.linkBackup" = "Importă din copia de rezervă";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Creează un cont Jami";
 "welcome.connectToJAMS" = "Conectează-te la Serverului de Administrare a Conturilor Jami (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Folosește Jami";
 "createAccount.lookingForUsernameAvailability" = "Caut disponibilitatea numelui de utilizator…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Numele este greșit. Trebuie introdus numele corect.";
 "createAccount.usernameAlreadyTaken" = "Nume ales deja";
 "createAccount.usernameValid" = "Numele este disponibil.";
 "createAccount.UsernameNotRegisteredTitle" = "Eroare de rețea";
 "createAccount.UsernameNotRegisteredMessage" = "Contul a fost creat, dar numele de utilizator nu a fost înscris";
 "createAccount.timeoutTitle" = "Cont creat";
 "createAccount.timeoutMessage" = "Înscriere în curs a numelui de utilizator. Așteaptă…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurează un cont SIP existent";
 "createAccount.creatingAccount" = "Se creează contul";
 "createAccount.nameExplanation" = "Poți alege un nume de utilizator pentru a fi ușor de găsit și de contactat pe Jami.";
 "createAccount.newAccount" = "Cont nou";
@@ -192,15 +195,21 @@
 "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.waitLinkToAccountTitle" = "Asocierea contului";
-"linkToAccount.linkButtonTitle" = "Asociază";
-"linkToAccount.linkDeviceTitle" = "Asociază aparatul";
-"linkToAccount.linkDeviceMessage" = "Alege „Asociază alt aparat” din cealaltă aplicație Jami pentru a afișa codul QR sau PIN-ul.";
-"linkToAccount.explanationMessage" = "Este necesar un PIN pentru a utiliza un cont Jami existent cu acest aparat.";
-"linkToAccount.pinPlaceholder" = "Cod PIN";
-"linkToAccount.pinLabel" = "Introdu codul PIN";
-"linkToAccount.scanQRCode" = "Scanează codul QR";
-"linkToAccount.explanationPinMessage" = "Pentru generarea codului PIN, du-te la reglările contului în aparatul care conține contul pe care vrei să-l folosești. Alege „Asociază alt aparat” și vei obține PIN-ul necesar. Acest PIN este valabil doar 10 minute.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Cod 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.exit" = "Ieșire";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importă contul Jami din fișierul arhivei.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Eroare la eliminarea aparatului";
 "accountPage.linkDeviceTitle" = "Asociază alt aparat";
 "accountPage.other" = "Altele";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Dacă acest cont nu a fost asociat cu alt aparat și nu ai o copie de rezervă, va fi pierdut DEFINITIV împreună cu numele înscris.";
 "accountPage.inviteFriends" = "Invită prieteni";
 "accountPage.contactMeOnJamiTitle" = "Contactează-mă pe Jami!";
 "accountPage.contactMeOnJamiContant" = "Contactează-mă folosind „%s” pe platforma distribuită de comunicare Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Asociază un nou aparat";
-"linkDevice.passwordError" = "Parolă greșită. Încearcă din nou cu parola corectă.";
 "linkDevice.networkError" = "A apărut o eroare de rețea în timpul exportării contului.";
-"linkDevice.defaultError" = "A apărut o eroare în timpul exportării contului.";
-"linkDevice.explanationMessage" = "Pentru a completa procesul, deschide Jami în noul aparat și alege „Asociază acest aparat cu un cont”. Codul PIN este valabil 10 minute.";
-"linkDevice.hudMessage" = "Se verifică";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ÃŽncepe un apel vocal";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "ÃŽnchide";
 "accessibility.smartListSwitchAccounts" = "Schimbă contul";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Contul actual este %@";
 "accessibility.smartListAddAccount" = "Adaugă un cont";
 "accessibility.aboutJamiTitle" = "Despre Jami";
 "accessibility.welcomeToJamiTitle" = "Bine ai venit pe Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Introdu un nume de utilizator pentru a verifica dacă este disponibil.";
 "accessibility.profilePicturePicker" = "Poză de profil";
 "accessibility.profilePicturePickerHint" = "Atinge de două ori pentru a face o poză sau ca să alegi una din galerie";
 "accessibility.swarmPicturePicker" = "Poza grupului";
 "accessibility.swarmPicturePickerHint" = "Atinge de două ori pentru a face o poză sau ca să alegi una din galerie";
 "accessibility.accountSummaryQrCode" = "Cod QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Atinge de două ori pentru a vedea codul QR al contului";
+"accessibility.accountSummaryEditProfileHint" = "Atinge de două ori pentru a modifica profilul";
 "accessibility.accountSummaryEditSettingsButton" = "Reglări";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "ÃŽncepe un apel vocal cu %@";
+"accessibility.conversationStartVideoCall" = "ÃŽncepe un apel video cu %@";
 "accessibility.conversationComposeMessage" = "Scrie un mesaj";
 "accessibility.conversationShareMedia" = "Distribuie Media";
 "accessibility.conversationCameraHint" = "Atinge de două ori pentru a deschide camera";
 "accessibility.audioPlayerPlay" = "Start";
 "accessibility.audioPlayerPause" = "Pauză";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ mesaje necitite.";
 "accessibility.conversationRowBlocked" = "Conversație blocată";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Ultimul mesaj: %@";
+"accessibility.conversationRowSyncing" = "Sincronizare în curs";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Conectat";
 "accessibility.userPresenceAvailable" = "Disponibil";
-"accessibility.pendingRequestsRow" = "Invitație primită: %@ invitație în așteptare";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitație primită: %@ invitație în așteptare";
 "accessibility.pendingRequestsRowHint" = "Atinge de două ori pentru a examina și a răspunde la invitațiile pe care le-ai primit";
 "accessibility.pendingRequestsListBlockUser" = "Blochează expeditorul invitației";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Refuză invitația";
 "accessibility.pendingRequestsListAcceptInvitation" = "Acceptă invitația";
 "accessibility.messageBubbleDeleted" = "Mesaj șters";
 "accessibility.messageBubbleEdited" = "Modificat";
 "accessibility.messageBubbleRead" = "Citit";
 "accessibility.messageBubbleUnread" = "Necitit";
-"accessibility.textNotAvailable" = "Mesaj text primit pe %@, conținutul nu este disponibil";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Fișier primit pe %@, numele nu este disponibil";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, mesaj primit pe %@";
-"accessibility.text.sentOn" = "%@, mesaj trimis pe %@";
-"accessibility.fileTransfer.receivedOn" = "Fișier: %@ , primit pe %@";
-"accessibility.fileTransfer.sentOn" = "Fișier: %@, trimis pe %@";
-"accessibility.call.lasted" = "Durata";
-"accessibility.fileTransferNoName" = "Fișier primit pe %@, numele nu este disponibil";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"accessibility.inReply" = "Ca răspuns la mesaj";
+"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" = "Oprește microfonul";
+"accessibility.calls.default.toggleVideo" = "Pornește camera";
+"accessibility.calls.default.pauseCall" = "Pauză apel";
+"accessibility.calls.default.hangUpCall" = "ÃŽnchide";
 "accessibility.calls.default.addParticipant" = "Adaugă un participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
+"accessibility.calls.default.switchCamera" = "Schimbă camera";
+"accessibility.calls.default.toggleSpeaker" = "Pornește difuzorul";
+"accessibility.calls.default.openConversation" = "Deschide conversația";
+"accessibility.calls.default.showDialpad" = "Arată tastatura";
 "accessibility.calls.default.raiseHand" = "Mîna sus";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Pornește microfonul";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
 "accessibility.calls.alter.pauseCall" = "Reia apelul";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
+"accessibility.calls.alter.hangUpCall" = "ÃŽnchide";
+"accessibility.calls.alter.addParticipant" = "Adaugă un participant";
+"accessibility.calls.alter.switchCamera" = "Schimbă camera";
+"accessibility.calls.alter.toggleSpeaker" = "Oprește difuzorul";
+"accessibility.calls.alter.openConversation" = "Deschide conversația";
+"accessibility.calls.alter.showDialpad" = "Arată tastatura";
 "accessibility.calls.alter.raiseHand" = "Coboară mîna";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Minimizează";
+"accessibility.conference.maximize" = "Maximizează";
+"accessibility.conference.setModerator" = "Pune un moderator";
+"accessibility.conference.unsetModerator" = "Elimină moderatorul";
 "accessibility.conference.muteAudio" = "Oprește microfonul";
 "accessibility.conference.unmuteAudio" = "Pornește microfonul";
-"accessibility.conference.hangup" = "Hang up";
-"accessibility.conference.lowerHand" = "Lower hand";
+"accessibility.conference.hangup" = "ÃŽnchide";
+"accessibility.conference.lowerHand" = "Coboară mîna";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
index e332c0f2b..040bc9b28 100644
--- a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Ora";
 "global.editPassword" = "Schimbă parola";
 "global.confirmPassword" = "Confirmă parola";
+"global.confirm" = "Confirmă";
 "global.cameraDisabled" = "Accesul la cameră este dezactivat. Activează-l din reglări.";
+"global.confirm" = "Confirmă";
+"global.connect" = "Conectează";
 
 // Scan
 "scan.badQrCode" = "Codul QR e greșit";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Lista publică";
 "smartlist.jamsResults" = "Rezultatele căutării";
 "smartlist.conversations" = "Conversații";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Nicio conversație nu corespunde căutării.";
 "smartlist.newContact" = "Contact nou";
 "smartlist.newGroup" = "Grup nou";
 "smartlist.accounts" = "Conturi";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Introdu numele…";
 "smartlist.searchBar" = "Caută";
 "smartlist.noNetworkConnectivity" = "Nicio legătură la rețea";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Asigură-te că accesul la rețea este permis.";
 "smartlist.accountsTitle" = "Conturi";
 "smartlist.addAccountButton" = "+ Adaugă un cont";
 "smartlist.noNumber" = "Contactul ales nu are niciun număr";
@@ -127,7 +130,7 @@
 // Conversation
 "conversation.addToContactsButton" = "Adaugă la contacte";
 "conversation.addToContactsLabel" = "Adaugi la contacte?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ nu este în contactele tale";
 "conversation.messagePlaceholder" = "Scrie pentru";
 "conversation.errorSavingImage" = "A apărut o eroare în timpul salvării imaginii.";
 "conversation.receivedRequest" = "%@ ți-a trimis o invitație la conversație.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Am deja un cont";
 "welcome.linkDevice" = "Importă din alt aparat";
 "welcome.linkBackup" = "Importă din copia de rezervă";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Creează un cont Jami";
 "welcome.connectToJAMS" = "Conectează-te la Serverului de Administrare a Conturilor Jami (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Folosește Jami";
 "createAccount.lookingForUsernameAvailability" = "Caut disponibilitatea numelui de utilizator…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Numele este greșit. Trebuie introdus numele corect.";
 "createAccount.usernameAlreadyTaken" = "Nume ales deja";
 "createAccount.usernameValid" = "Numele este disponibil.";
 "createAccount.UsernameNotRegisteredTitle" = "Eroare de rețea";
 "createAccount.UsernameNotRegisteredMessage" = "Contul a fost creat, dar numele de utilizator nu a fost înscris";
 "createAccount.timeoutTitle" = "Cont creat";
 "createAccount.timeoutMessage" = "Înscriere în curs a numelui de utilizator. Așteaptă…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Configurează un cont SIP existent";
 "createAccount.creatingAccount" = "Se creează contul";
 "createAccount.nameExplanation" = "Poți alege un nume de utilizator pentru a fi ușor de găsit și de contactat pe Jami.";
 "createAccount.newAccount" = "Cont nou";
@@ -192,15 +195,21 @@
 "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.waitLinkToAccountTitle" = "Asocierea contului";
-"linkToAccount.linkButtonTitle" = "Asociază";
-"linkToAccount.linkDeviceTitle" = "Asociază aparatul";
-"linkToAccount.linkDeviceMessage" = "Alege „Asociază alt aparat” din cealaltă aplicație Jami pentru a afișa codul QR sau PIN-ul.";
-"linkToAccount.explanationMessage" = "Este necesar un PIN pentru a utiliza un cont Jami existent cu acest aparat.";
-"linkToAccount.pinPlaceholder" = "Cod PIN";
-"linkToAccount.pinLabel" = "Introdu codul PIN";
-"linkToAccount.scanQRCode" = "Scanează codul QR";
-"linkToAccount.explanationPinMessage" = "Pentru generarea codului PIN, du-te la reglările contului în aparatul care conține contul pe care vrei să-l folosești. Alege „Asociază alt aparat” și vei obține PIN-ul necesar. Acest PIN este valabil doar 10 minute.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Cod 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.exit" = "Ieșire";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importă contul Jami din fișierul arhivei.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Eroare la eliminarea aparatului";
 "accountPage.linkDeviceTitle" = "Asociază alt aparat";
 "accountPage.other" = "Altele";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Dacă acest cont nu a fost asociat cu alt aparat și nu ai o copie de rezervă, va fi pierdut DEFINITIV împreună cu numele înscris.";
 "accountPage.inviteFriends" = "Invită prieteni";
 "accountPage.contactMeOnJamiTitle" = "Contactează-mă pe Jami!";
 "accountPage.contactMeOnJamiContant" = "Contactează-mă folosind „%s” pe platforma distribuită de comunicare Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Asociază un nou aparat";
-"linkDevice.passwordError" = "Parolă greșită. Încearcă din nou cu parola corectă.";
 "linkDevice.networkError" = "A apărut o eroare de rețea în timpul exportării contului.";
-"linkDevice.defaultError" = "A apărut o eroare în timpul exportării contului.";
-"linkDevice.explanationMessage" = "Pentru a completa procesul, deschide Jami în noul aparat și alege „Asociază acest aparat cu un cont”. Codul PIN este valabil 10 minute.";
-"linkDevice.hudMessage" = "Se verifică";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ÃŽncepe un apel vocal";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "ÃŽnchide";
 "accessibility.smartListSwitchAccounts" = "Schimbă contul";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Contul actual este %@";
 "accessibility.smartListAddAccount" = "Adaugă un cont";
 "accessibility.aboutJamiTitle" = "Despre Jami";
 "accessibility.welcomeToJamiTitle" = "Bine ai venit pe Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Introdu un nume de utilizator pentru a verifica dacă este disponibil.";
 "accessibility.profilePicturePicker" = "Poză de profil";
 "accessibility.profilePicturePickerHint" = "Atinge de două ori pentru a face o poză sau ca să alegi una din galerie";
 "accessibility.swarmPicturePicker" = "Poza grupului";
 "accessibility.swarmPicturePickerHint" = "Atinge de două ori pentru a face o poză sau ca să alegi una din galerie";
 "accessibility.accountSummaryQrCode" = "Cod QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Atinge de două ori pentru a vedea codul QR al contului";
+"accessibility.accountSummaryEditProfileHint" = "Atinge de două ori pentru a modifica profilul";
 "accessibility.accountSummaryEditSettingsButton" = "Reglări";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "ÃŽncepe un apel vocal cu %@";
+"accessibility.conversationStartVideoCall" = "ÃŽncepe un apel video cu %@";
 "accessibility.conversationComposeMessage" = "Scrie un mesaj";
 "accessibility.conversationShareMedia" = "Distribuie Media";
 "accessibility.conversationCameraHint" = "Atinge de două ori pentru a deschide camera";
 "accessibility.audioPlayerPlay" = "Start";
 "accessibility.audioPlayerPause" = "Pauză";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ mesaje necitite.";
 "accessibility.conversationRowBlocked" = "Conversație blocată";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Ultimul mesaj: %@";
+"accessibility.conversationRowSyncing" = "Sincronizare în curs";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Conectat";
 "accessibility.userPresenceAvailable" = "Disponibil";
-"accessibility.pendingRequestsRow" = "Invitație primită: %@ invitație în așteptare";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitație primită: %@ invitație în așteptare";
 "accessibility.pendingRequestsRowHint" = "Atinge de două ori pentru a examina și a răspunde la invitațiile pe care le-ai primit";
 "accessibility.pendingRequestsListBlockUser" = "Blochează expeditorul invitației";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Refuză invitația";
 "accessibility.pendingRequestsListAcceptInvitation" = "Acceptă invitația";
 "accessibility.messageBubbleDeleted" = "Mesaj șters";
 "accessibility.messageBubbleEdited" = "Modificat";
 "accessibility.messageBubbleRead" = "Citit";
 "accessibility.messageBubbleUnread" = "Necitit";
-"accessibility.textNotAvailable" = "Mesaj text primit pe %@, conținutul nu este disponibil";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Fișier primit pe %@, numele nu este disponibil";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, mesaj primit pe %@";
-"accessibility.text.sentOn" = "%@, mesaj trimis pe %@";
-"accessibility.fileTransfer.receivedOn" = "Fișier: %@ , primit pe %@";
-"accessibility.fileTransfer.sentOn" = "Fișier: %@, trimis pe %@";
-"accessibility.call.lasted" = "Durata";
-"accessibility.fileTransferNoName" = "Fișier primit pe %@, numele nu este disponibil";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"accessibility.inReply" = "Ca răspuns la mesaj";
+"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" = "Oprește microfonul";
+"accessibility.calls.default.toggleVideo" = "Pornește camera";
+"accessibility.calls.default.pauseCall" = "Pauză apel";
+"accessibility.calls.default.hangUpCall" = "ÃŽnchide";
 "accessibility.calls.default.addParticipant" = "Adaugă un participant";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
+"accessibility.calls.default.switchCamera" = "Schimbă camera";
+"accessibility.calls.default.toggleSpeaker" = "Pornește difuzorul";
+"accessibility.calls.default.openConversation" = "Deschide conversația";
+"accessibility.calls.default.showDialpad" = "Arată tastatura";
 "accessibility.calls.default.raiseHand" = "Mâna sus";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Pornește microfonul";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
 "accessibility.calls.alter.pauseCall" = "Reia apelul";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
+"accessibility.calls.alter.hangUpCall" = "ÃŽnchide";
+"accessibility.calls.alter.addParticipant" = "Adaugă un participant";
+"accessibility.calls.alter.switchCamera" = "Schimbă camera";
+"accessibility.calls.alter.toggleSpeaker" = "Oprește difuzorul";
+"accessibility.calls.alter.openConversation" = "Deschide conversația";
+"accessibility.calls.alter.showDialpad" = "Arată tastatura";
 "accessibility.calls.alter.raiseHand" = "Coboară mâna";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Minimizează";
+"accessibility.conference.maximize" = "Maximizează";
+"accessibility.conference.setModerator" = "Pune un moderator";
+"accessibility.conference.unsetModerator" = "Elimină moderatorul";
 "accessibility.conference.muteAudio" = "Oprește microfonul";
 "accessibility.conference.unmuteAudio" = "Pornește microfonul";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "ÃŽnchide";
 "accessibility.conference.lowerHand" = "Coboară mâna";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
index d60d8ef7a..53c2d5f06 100644
--- a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
@@ -19,7 +19,7 @@
  */
 
 // Global
-"global.accountSettings" = "Настройки аккаунта";
+"global.accountSettings" = "Настройки учетной записи";
 "global.username" = "Имя пользователя";
 "global.recommended" = "Рекомендуется";
 "global.password" = "Пароль";
@@ -57,7 +57,10 @@
 "global.time" = "Время";
 "global.editPassword" = "Изменить пароль";
 "global.confirmPassword" = "Подтверждение пароля";
+"global.confirm" = "Подтвердить";
 "global.cameraDisabled" = "Доступ к камере отключен. Включите его в настройках устройства, чтобы использовать эту функцию.";
+"global.confirm" = "Подтвердить";
+"global.connect" = "Соединение...";
 
 // Scan
 "scan.badQrCode" = "Плохой QR-code";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Публичный каталог";
 "smartlist.jamsResults" = "Результаты поиска";
 "smartlist.conversations" = "Разговоры";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Нет бесед, соответствующих запросу.";
 "smartlist.newContact" = "Новый контакт";
 "smartlist.newGroup" = "Новая группа";
 "smartlist.accounts" = "Учетные записи";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Введите имя…";
 "smartlist.searchBar" = "Поиск:";
 "smartlist.noNetworkConnectivity" = "Отсутствует сетевое подключение";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Убедитесь, что в настройках разрешен доступ к сотовой сети.";
 "smartlist.accountsTitle" = "Учетные записи";
 "smartlist.addAccountButton" = "+ Добавить аккаунт";
 "smartlist.noNumber" = "Выбранный контакт не имеет номера";
@@ -127,7 +130,7 @@
 // Conversation
 "conversation.addToContactsButton" = "Добавить в контакты";
 "conversation.addToContactsLabel" = "Добавить в контакты? ";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@нет в списке контактов";
 "conversation.messagePlaceholder" = "Написать сообщение";
 "conversation.errorSavingImage" = "При сохранении изображения в галерею произошла ошибка.";
 "conversation.receivedRequest" = "%@отправил(а) вам приглашение для беседы.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "У меня уже есть аккаунт";
 "welcome.linkDevice" = "Импортировать с другого устройства";
 "welcome.linkBackup" = "Импортировать из резервной копии";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Создать учетную запись Jami";
 "welcome.connectToJAMS" = "Подключиться к серверу управления аккаунтами Джами (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Присоединиться к Jami";
 "createAccount.lookingForUsernameAvailability" = "Проверка наличия имени пользователя…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Неверное имя пользователя. Введите правильное.";
 "createAccount.usernameAlreadyTaken" = "Имя пользователя уже занято";
 "createAccount.usernameValid" = "Имя пользователя доступно.";
 "createAccount.UsernameNotRegisteredTitle" = "Ошибка сети";
 "createAccount.UsernameNotRegisteredMessage" = "Аккаунт был создан но имя пользователя не было зарегистрировано";
 "createAccount.timeoutTitle" = "Аккаунт создан";
 "createAccount.timeoutMessage" = "Производится регистрация имени пользователя. Подождите...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Настройте существующую учетную запись SIP";
 "createAccount.creatingAccount" = "Создание аккаунта";
 "createAccount.nameExplanation" = "Вы можете выбрать имя пользователя, чтобы помочь другим найти и связаться с вами в Jami.";
 "createAccount.newAccount" = "Новая учетная запись";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "Аккаунт Джами создаётся локально и хранится только на этом устройстве в форме архива, содержащего ключи от вашей учётной записи. По желанию, доступ к архиву может быть защищён паролем.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Привязка аккаунта";
-"linkToAccount.linkButtonTitle" = "Ссылка";
-"linkToAccount.linkDeviceTitle" = "Привязать устройство";
-"linkToAccount.linkDeviceMessage" = "Выберите «Привязать новое устройство» в другом приложении Джами, чтобы показать QR-код или сгенерировать ПИН.";
-"linkToAccount.explanationMessage" = "Для использования существующего аккаунта Джами на этом устройстве требуется ПИН.";
-"linkToAccount.pinPlaceholder" = "PIN-код";
-"linkToAccount.pinLabel" = "Введите PIN-код";
-"linkToAccount.scanQRCode" = "Сканирование QR-кода";
-"linkToAccount.explanationPinMessage" = "Чтобы сгенерировать ПИН-код, перейдите в настройки управления аккаунтом на другом устройстве, где есть нужный аккаунт. Выберите «Привязать новое устройство». Появится ПИН-код, который нужно ввести на данном экране. ПИН действителен только 10 минут.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Выход";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Импортируйте аккаунт Jami из локального архивного файла.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Ошибка отзыва устройства";
 "accountPage.linkDeviceTitle" = "Привязать другое устройство";
 "accountPage.other" = "Другие";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Если учетная запись не была сохранена или добавлена ​​на другое устройство, она и зарегистрированное имя пользователя будут БЕЗВОЗВРАТНО УТРАЧЕНЫ.";
 "accountPage.inviteFriends" = "Пригласить друзей";
 "accountPage.contactMeOnJamiTitle" = "Свяжитесь со мной в Jami!";
 "accountPage.contactMeOnJamiContant" = "Свяжитесь со мной используя \"%s\" на платформе распределенной связи Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Привязать новое устройство";
-"linkDevice.passwordError" = "Неправильный пароль. Пожалуйста, попробуйте еще раз с правильным паролем.";
 "linkDevice.networkError" = "При экспорте учетной записи возникла ошибка сети.";
-"linkDevice.defaultError" = "При экспорте учетной записи возникла ошибка.";
-"linkDevice.explanationMessage" = "Чтобы завершить процесс, откройте Джами на новом устройстве и выберите опцию «Привязать это устройство к аккаунту». Ваш PIN-код будет действителен 10 минут.";
-"linkDevice.hudMessage" = "Верификация";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Начать аудиозвонок";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Закрыть";
 "accessibility.smartListSwitchAccounts" = "Сменить учетную запись";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Текущая учетная запись - это %@";
 "accessibility.smartListAddAccount" = "Добавить аккаунт";
 "accessibility.aboutJamiTitle" = "О Jami";
 "accessibility.welcomeToJamiTitle" = "Добро пожаловать в Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Введите имя пользователя для проверки доступности.";
 "accessibility.profilePicturePicker" = "Фото профиля";
 "accessibility.profilePicturePickerHint" = "Двойной клик, чтобы сделать снимок или выбрать изображение из библиотеки";
 "accessibility.swarmPicturePicker" = "Картинка группы";
 "accessibility.swarmPicturePickerHint" = "Двойной клик, чтобы сделать снимок или выбрать изображение из библиотеки";
 "accessibility.accountSummaryQrCode" = "QR-код";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Нажмите дважды для просмотра QR-кода учетной записи";
+"accessibility.accountSummaryEditProfileHint" = "Нажмите дважды для изменения профиля";
 "accessibility.accountSummaryEditSettingsButton" = "Настройки";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Начать аудиозвонок с %@";
+"accessibility.conversationStartVideoCall" = "Начать видеозвонок с %@";
 "accessibility.conversationComposeMessage" = "Составьте сообщение";
 "accessibility.conversationShareMedia" = "Поделиться медиа";
 "accessibility.conversationCameraHint" = "Коснитесь дважды, чтобы открыть камеру";
 "accessibility.audioPlayerPlay" = "Воспроизвести";
 "accessibility.audioPlayerPause" = "Пауза";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@непрочитанных сообщений.";
 "accessibility.conversationRowBlocked" = "Беседа заблокирована";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Последнее сообщение на %@";
+"accessibility.conversationRowSyncing" = "Выполняется синхронизация";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "В сети";
 "accessibility.userPresenceAvailable" = "Доступно";
-"accessibility.pendingRequestsRow" = "Получено приглашение: %@ожидает приглашения";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Получено приглашение: %@ожидает приглашения";
 "accessibility.pendingRequestsRowHint" = "Коснитесь дважды, чтобы просмотреть и ответить на полученные приглашения";
 "accessibility.pendingRequestsListBlockUser" = "Блокировать отправителя приглашения";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Отклонить приглашение";
 "accessibility.pendingRequestsListAcceptInvitation" = "Принять приглашение";
 "accessibility.messageBubbleDeleted" = "Сообщение удалено";
 "accessibility.messageBubbleEdited" = "Отредактировано";
 "accessibility.messageBubbleRead" = "Прочитано";
 "accessibility.messageBubbleUnread" = "Непрочитано";
-"accessibility.textNotAvailable" = "Текстовое сообщение получено на %@, содержимое недоступно";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Файл получен на %@, имя недоступно";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, сообщение получено на %@";
-"accessibility.text.sentOn" = "%@, сообщение отправлено на %@";
-"accessibility.fileTransfer.receivedOn" = "Файл:  %@, получен на %@";
-"accessibility.fileTransfer.sentOn" = "Файл:  %@, отправлен на  %@";
-"accessibility.call.lasted" = "Длился";
-"accessibility.fileTransferNoName" = "Файл получен на %@, имя недоступно";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.toggleAudio" = "Отключить микрофон";
+"accessibility.calls.default.toggleVideo" = "Включить камеру";
+"accessibility.calls.default.pauseCall" = "Приостановить звонок";
+"accessibility.calls.default.hangUpCall" = "Завершить";
 "accessibility.calls.default.addParticipant" = "Добавить участника";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
+"accessibility.calls.default.switchCamera" = "Переключить камеру";
+"accessibility.calls.default.toggleSpeaker" = "Включить динамик";
+"accessibility.calls.default.openConversation" = "Открыть разговор";
+"accessibility.calls.default.showDialpad" = "Показать панель набора номера";
 "accessibility.calls.default.raiseHand" = "Поднять руку";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Включить микрофон";
+"accessibility.calls.alter.toggleVideo" = "Остановить камеру";
 "accessibility.calls.alter.pauseCall" = "Продолжить звонок";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
+"accessibility.calls.alter.hangUpCall" = "Завершить";
+"accessibility.calls.alter.addParticipant" = "Добавить участника";
+"accessibility.calls.alter.switchCamera" = "Переключить камеру";
+"accessibility.calls.alter.toggleSpeaker" = "Выключить динамик";
+"accessibility.calls.alter.openConversation" = "Открыть разговор";
+"accessibility.calls.alter.showDialpad" = "Показать панель набора номера";
 "accessibility.calls.alter.raiseHand" = "Опущенная рука";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Минимизировать";
+"accessibility.conference.maximize" = "На весь экран";
+"accessibility.conference.setModerator" = "Установить модератора";
+"accessibility.conference.unsetModerator" = "Отменить установку модератора";
 "accessibility.conference.muteAudio" = "Отключить звук";
 "accessibility.conference.unmuteAudio" = "Включить звук";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Завершить";
 "accessibility.conference.lowerHand" = "Опущенная рука";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ru.lproj/Localizable.strings b/Ring/Ring/Resources/ru.lproj/Localizable.strings
index 07f38408d..99acd50c2 100644
--- a/Ring/Ring/Resources/ru.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Время";
 "global.editPassword" = "Изменить пароль";
 "global.confirmPassword" = "Подтверждение пароля";
+"global.confirm" = "Подтвердить";
 "global.cameraDisabled" = "Доступ к камере отключен. Включите его в настройках устройства, чтобы использовать эту функцию.";
+"global.confirm" = "Подтвердить";
+"global.connect" = "Соединение";
 
 // Scan
 "scan.badQrCode" = "Некорректный QR-код";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Публичный каталог";
 "smartlist.jamsResults" = "Результаты поиска";
 "smartlist.conversations" = "Разговоры";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Нет бесед, соответствующих запросу.";
 "smartlist.newContact" = "Новый контакт";
 "smartlist.newGroup" = "Новая группа";
 "smartlist.accounts" = "Аккаунты";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Введите имя…";
 "smartlist.searchBar" = "Поиск";
 "smartlist.noNetworkConnectivity" = "Нет подключения к сети";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Убедитесь, что в настройках разрешен доступ к сотовой сети.";
 "smartlist.accountsTitle" = "Аккаунты";
 "smartlist.addAccountButton" = "+ Добавить аккаунт";
 "smartlist.noNumber" = "У выбранного контакта нет номера";
@@ -127,7 +130,7 @@
 // Conversation
 "conversation.addToContactsButton" = "Добавить в контакты";
 "conversation.addToContactsLabel" = "Добавить в контакты?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@нет в списке контактов";
 "conversation.messagePlaceholder" = "Написать сообщение";
 "conversation.errorSavingImage" = "При сохранении изображения в галерею произошла ошибка.";
 "conversation.receivedRequest" = "%@отправил(а) вам приглашение для беседы.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "У меня уже есть аккаунт";
 "welcome.linkDevice" = "Импортировать с другого устройства";
 "welcome.linkBackup" = "Импортировать из резервной копии";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Создать учетную запись Jami";
 "welcome.connectToJAMS" = "Подключиться к серверу управления аккаунтами Джами (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Присоединиться к Джами";
 "createAccount.lookingForUsernameAvailability" = "Проверка наличия имени пользователя…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Неверное имя пользователя. Введите правильное.";
 "createAccount.usernameAlreadyTaken" = "Имя пользователя уже занято";
 "createAccount.usernameValid" = "Имя пользователя доступно.";
 "createAccount.UsernameNotRegisteredTitle" = "Ошибка сети";
 "createAccount.UsernameNotRegisteredMessage" = "Аккаунт был создан, но имя пользователя не было зарегистрировано";
 "createAccount.timeoutTitle" = "Аккаунт создан";
 "createAccount.timeoutMessage" = "Производится регистрация имени пользователя. Подождите...";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Настройте существующую учетную запись SIP";
 "createAccount.creatingAccount" = "Создание аккаунта";
 "createAccount.nameExplanation" = "Вы можете выбрать имя пользователя, чтобы помочь другим найти и связаться с вами в Джами.";
 "createAccount.newAccount" = "Новый аккаунт";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "Аккаунт Джами создаётся локально и хранится только на этом устройстве в форме архива, содержащего ключи от вашей учётной записи. При желании доступ к архиву может быть защищён паролем.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Привязка аккаунта";
-"linkToAccount.linkButtonTitle" = "Привязать";
-"linkToAccount.linkDeviceTitle" = "Привязать устройство";
-"linkToAccount.linkDeviceMessage" = "Выберите «Привязать новое устройство» в другом приложении Джами, чтобы показать QR-код или сгенерировать ПИН.";
-"linkToAccount.explanationMessage" = "Для использования существующего аккаунта Джами на этом устройстве требуется ПИН.";
-"linkToAccount.pinPlaceholder" = "ПИН-код";
-"linkToAccount.pinLabel" = "Введите PIN-код";
-"linkToAccount.scanQRCode" = "Сканирование QR-кода";
-"linkToAccount.explanationPinMessage" = "Чтобы сгенерировать ПИН-код, перейдите в настройки управления аккаунтом на другом устройстве, где есть нужный аккаунт Джами. Выберите «Привязать новое устройство». Появится ПИН-код, который нужно ввести на данном экране. ПИН действителен только 10 минут.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Выход";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Импортируйте аккаунт Джами из локального архивного файла.";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Ошибка отзыва устройства";
 "accountPage.linkDeviceTitle" = "Привязать другое устройство";
 "accountPage.other" = "Другой";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Если учетная запись не была сохранена или добавлена ​​на другое устройство, она и зарегистрированное имя пользователя будут БЕЗВОЗВРАТНО УТРАЧЕНЫ.";
 "accountPage.inviteFriends" = "Пригласить друзей";
 "accountPage.contactMeOnJamiTitle" = "Свяжитесь со мной в Джами!";
 "accountPage.contactMeOnJamiContant" = "Свяжитесь со мной по адресу «%s» на платформе распределенной связи Джами: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Привязать новое устройство";
-"linkDevice.passwordError" = "Неправильный пароль. Пожалуйста, попробуйте еще раз с правильным паролем.";
 "linkDevice.networkError" = "При экспорте учетной записи возникла ошибка сети.";
-"linkDevice.defaultError" = "При экспорте учетной записи возникла ошибка.";
-"linkDevice.explanationMessage" = "Чтобы завершить процесс, откройте Джами на новом устройстве и выберите опцию «Привязать это устройство к аккаунту». Ваш PIN-код будет действителен 10 минут.";
-"linkDevice.hudMessage" = "Проверка";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Начать голосовой вызов";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Закрыть";
 "accessibility.smartListSwitchAccounts" = "Сменить учетную запись";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Текущая учетная запись - это %@";
 "accessibility.smartListAddAccount" = "Добавить аккаунт";
 "accessibility.aboutJamiTitle" = "О программе Джами";
 "accessibility.welcomeToJamiTitle" = "Добро пожаловать в Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Введите имя пользователя для проверки доступности.";
 "accessibility.profilePicturePicker" = "Фото профиля";
 "accessibility.profilePicturePickerHint" = "Двойной клик, чтобы сделать снимок или выбрать изображение из библиотеки";
 "accessibility.swarmPicturePicker" = "Картинка группы";
 "accessibility.swarmPicturePickerHint" = "Двойной клик, чтобы сделать снимок или выбрать изображение из библиотеки";
 "accessibility.accountSummaryQrCode" = "QR-код";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Нажмите дважды для просмотра QR-кода учетной записи";
+"accessibility.accountSummaryEditProfileHint" = "Нажмите дважды для изменения профиля";
 "accessibility.accountSummaryEditSettingsButton" = "Настройки";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Начать аудиозвонок с %@";
+"accessibility.conversationStartVideoCall" = "Начать видеозвонок с %@";
 "accessibility.conversationComposeMessage" = "Составьте сообщение";
 "accessibility.conversationShareMedia" = "Поделиться медиа";
 "accessibility.conversationCameraHint" = "Коснитесь дважды, чтобы открыть камеру";
 "accessibility.audioPlayerPlay" = "Проиграть";
 "accessibility.audioPlayerPause" = "Пауза";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@непрочитанных сообщений.";
 "accessibility.conversationRowBlocked" = "Беседа заблокирована";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Последнее сообщение на %@";
+"accessibility.conversationRowSyncing" = "Выполняется синхронизация";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "В сети";
 "accessibility.userPresenceAvailable" = "Доступно";
-"accessibility.pendingRequestsRow" = "Получено приглашение: %@ожидает приглашения";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Получено приглашение: %@ожидает приглашения";
 "accessibility.pendingRequestsRowHint" = "Коснитесь дважды, чтобы просмотреть и ответить на полученные приглашения";
 "accessibility.pendingRequestsListBlockUser" = "Блокировать отправителя приглашения";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Отклонить приглашение";
 "accessibility.pendingRequestsListAcceptInvitation" = "Принять приглашение";
 "accessibility.messageBubbleDeleted" = "Сообщение удалено";
 "accessibility.messageBubbleEdited" = "Отредактировано";
 "accessibility.messageBubbleRead" = "Прочитано";
 "accessibility.messageBubbleUnread" = "Непрочитано";
-"accessibility.textNotAvailable" = "Текстовое сообщение получено на %@, содержимое недоступно";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "Файл получен на %@, имя недоступно";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, сообщение получено на %@";
-"accessibility.text.sentOn" = "%@, сообщение отправлено на %@";
-"accessibility.fileTransfer.receivedOn" = "Файл: %@, получен на %@";
-"accessibility.fileTransfer.sentOn" = "Файл: %@, отправлен на  %@";
-"accessibility.call.lasted" = "Длился";
-"accessibility.fileTransferNoName" = "Файл получен на %@, имя недоступно";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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.calls.default.toggleAudio" = "Выключить микрофон";
+"accessibility.calls.default.toggleVideo" = "Включить камеру";
+"accessibility.calls.default.pauseCall" = "Приостановить вызов";
+"accessibility.calls.default.hangUpCall" = "Повесить трубку";
 "accessibility.calls.default.addParticipant" = "Добавить участника";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
+"accessibility.calls.default.switchCamera" = "Переключить камеру";
+"accessibility.calls.default.toggleSpeaker" = "Включить динамик";
+"accessibility.calls.default.openConversation" = "Открыть разговор";
+"accessibility.calls.default.showDialpad" = "Показать панель набора номера";
 "accessibility.calls.default.raiseHand" = "Поднять руку";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Включить микрофон";
+"accessibility.calls.alter.toggleVideo" = "Остановить камеру";
 "accessibility.calls.alter.pauseCall" = "Возобновить вызов";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
+"accessibility.calls.alter.hangUpCall" = "Повесить трубку";
+"accessibility.calls.alter.addParticipant" = "Добавить участника";
+"accessibility.calls.alter.switchCamera" = "Переключить камеру";
+"accessibility.calls.alter.toggleSpeaker" = "Выключить динамик";
+"accessibility.calls.alter.openConversation" = "Открыть разговор";
+"accessibility.calls.alter.showDialpad" = "Показать панель набора номера";
 "accessibility.calls.alter.raiseHand" = "Опущенная рука";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Свернуть";
+"accessibility.conference.maximize" = "Максимизировать";
+"accessibility.conference.setModerator" = "Установить модератора";
+"accessibility.conference.unsetModerator" = "Отменить установку модератора";
 "accessibility.conference.muteAudio" = "Отключить звук";
 "accessibility.conference.unmuteAudio" = "Включить звук";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Повесить трубку";
 "accessibility.conference.lowerHand" = "Опущенная рука";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/si.lproj/Localizable.strings b/Ring/Ring/Resources/si.lproj/Localizable.strings
index 380239b32..687ea830f 100644
--- a/Ring/Ring/Resources/si.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/si.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Confirm password";
+"global.confirm" = "Confirm";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Confirm";
+"global.connect" = "Connect";
 
 // Scan
 "scan.badQrCode" = "Bad QR code";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Account linking";
-"linkToAccount.linkButtonTitle" = "Link";
-"linkToAccount.linkDeviceTitle" = "Link device";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Scan QR code";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Import Jami account from local archive file.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Link new device";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verifying";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Start audio call";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,17 +565,16 @@
 "accessibility.messageBubbleEdited" = "Edited";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
+"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.calls.default.pauseCall" = "Pause call";
 "accessibility.calls.default.hangUpCall" = "Hang up";
 "accessibility.calls.default.addParticipant" = "Add participant";
@@ -563,8 +584,8 @@
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Raise hand";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop camera";
 "accessibility.calls.alter.pauseCall" = "Resume call";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
 "accessibility.calls.alter.addParticipant" = "Add participant";
@@ -581,3 +602,5 @@
 "accessibility.conference.unmuteAudio" = "Unmute audio";
 "accessibility.conference.hangup" = "Hang up";
 "accessibility.conference.lowerHand" = "Lower hand";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
index cb35cfa1c..9f3f5c2c6 100644
--- a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "ÄŒas";
 "global.editPassword" = "Zmeniť heslo";
 "global.confirmPassword" = "Potvrďte heslo";
+"global.confirm" = "Potvrdiť";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Potvrdiť";
+"global.connect" = "Pripojiť";
 
 // Scan
 "scan.badQrCode" = "Zlý QR kód";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Už mám účet.";
 "welcome.linkDevice" = "Import z iného zariadenia";
 "welcome.linkBackup" = "Importovať zo zálohovaného archívu";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Vytvorte účet Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Prepájanie účtu";
-"linkToAccount.linkButtonTitle" = "Prepojiť";
-"linkToAccount.linkDeviceTitle" = "Prepájanie zariadenia";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skenovanie QR kódu";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR kód";
+"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" = "Odísť";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importujte účet Jami z miestneho archívu.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Prepojiť nové zariadenie";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Overovanie";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Začať audio hovor";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Vytvorené";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Stlmiť mikrofón";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Závok na pauzu";
+"accessibility.calls.default.hangUpCall" = "Zložiť";
 "accessibility.calls.default.addParticipant" = "Pridať účastníka";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Otvoriť konverzáciu";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Zdvihnite ruku";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Zastavte kameru";
 "accessibility.calls.alter.pauseCall" = "Prepracovať hovor";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Zložiť";
+"accessibility.calls.alter.addParticipant" = "Pridať účastníka";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Otvoriť konverzáciu";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Dolná ruka";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Minimalizovať";
+"accessibility.conference.maximize" = "Maximálne";
+"accessibility.conference.setModerator" = "Nastaviť moderátor";
+"accessibility.conference.unsetModerator" = "Odstaviť moderátor";
 "accessibility.conference.muteAudio" = "Stlmiť zvuk";
 "accessibility.conference.unmuteAudio" = "Nevymazaný zvuk";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Zložiť";
 "accessibility.conference.lowerHand" = "Dolná ruka";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/sk.lproj/Localizable.strings b/Ring/Ring/Resources/sk.lproj/Localizable.strings
index b5610cd14..ba232e146 100644
--- a/Ring/Ring/Resources/sk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "ÄŒas";
 "global.editPassword" = "Zmeniť heslo";
 "global.confirmPassword" = "Potvrďte heslo";
+"global.confirm" = "Potvrdiť";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Potvrdiť";
+"global.connect" = "Pripojiť";
 
 // Scan
 "scan.badQrCode" = "Zlý QR kód";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Už mám účet.";
 "welcome.linkDevice" = "Import z iného zariadenia";
 "welcome.linkBackup" = "Importovať zo zálohovaného archívu";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Vytvorte účet Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Prepájanie účtu";
-"linkToAccount.linkButtonTitle" = "Prepojiť";
-"linkToAccount.linkDeviceTitle" = "Prepájanie zariadenia";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skenovanie QR kódu";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR kód";
+"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" = "Odísť";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importujte účet Jami z miestneho archívu.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Prepojiť nové zariadenie";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Overovanie";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Začať audio hovor";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Online";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Vytvorené";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Stlmiť mikrofón";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Závok na pauzu";
+"accessibility.calls.default.hangUpCall" = "Zložiť";
 "accessibility.calls.default.addParticipant" = "Pridať účastníka";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Otvoriť konverzáciu";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Zdvihnite ruku";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Zastavte kameru";
 "accessibility.calls.alter.pauseCall" = "Prepracovať hovor";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Zložiť";
+"accessibility.calls.alter.addParticipant" = "Pridať účastníka";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Otvoriť konverzáciu";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Dolná ruka";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Minimalizovať";
+"accessibility.conference.maximize" = "Maximálne";
+"accessibility.conference.setModerator" = "Nastaviť moderátor";
+"accessibility.conference.unsetModerator" = "Odstaviť moderátor";
 "accessibility.conference.muteAudio" = "Stlmiť zvuk";
 "accessibility.conference.unmuteAudio" = "Nevymazaný zvuk";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Zložiť";
 "accessibility.conference.lowerHand" = "Dolná ruka";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/sl.lproj/Localizable.strings b/Ring/Ring/Resources/sl.lproj/Localizable.strings
index 0b8fa581d..41562b196 100644
--- a/Ring/Ring/Resources/sl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sl.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "ÄŒas";
 "global.editPassword" = "Uredi geslo";
 "global.confirmPassword" = "Potrdite geslo";
+"global.confirm" = "Potrdi";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Potrdi";
+"global.connect" = "Poveži";
 
 // Scan
 "scan.badQrCode" = "Napačna QR-koda";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Račun že imam";
 "welcome.linkDevice" = "Uvozi z druge naprave";
 "welcome.linkBackup" = "Uvozi iz varnostne kopije arhiva";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Ustvarite račun Jami";
 "welcome.connectToJAMS" = "Poveži s strežnikom JAMS (Jami Account Management Server)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "Račun Jami je ustvarjen in hranjen krajevno samo na tej napravi, kot arhiv, ki vsebuje ključe vašega računa. Dostop do arhiva lahko dodatno zaščitite z geslom.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Povezovanje računa";
-"linkToAccount.linkButtonTitle" = "Poveži";
-"linkToAccount.linkDeviceTitle" = "Poveži napravo";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "Za uporabo obstoječega računa Jami na tej napravi je potrebna koda PIN.";
-"linkToAccount.pinPlaceholder" = "Koda PIN";
-"linkToAccount.pinLabel" = "Vnesite kodo PIN";
-"linkToAccount.scanQRCode" = "Preberi QR-kodo";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR-koda";
+"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" = "Izhod";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Uvozite račun Jami iz krajevne arhivske datoteke.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Poveži novo napravo";
-"linkDevice.passwordError" = "Nepravilno geslo. Poskusite znova s pravim geslom.";
 "linkDevice.networkError" = "Pri izvažanju računa je prišlo do omrežne napake.";
-"linkDevice.defaultError" = "Pri izvažanju računa je prišlo do napake.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Preverjanje";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Začni zvočni klic";
@@ -531,53 +552,55 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Povezan";
 "accessibility.userPresenceAvailable" = "Na voljo";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Zavrni povabilo";
 "accessibility.pendingRequestsListAcceptInvitation" = "Sprejmi povabilo";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "Urejeno";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Izključi mikrofon";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Zadrži klic";
+"accessibility.calls.default.hangUpCall" = "Prekini";
 "accessibility.calls.default.addParticipant" = "Dodaj sodelujočega";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Odpri pogovor";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Dvigni roko";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Izklopi kamero";
 "accessibility.calls.alter.pauseCall" = "Nadaljuj klic";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
-"accessibility.calls.alter.addParticipant" = "Add participant";
+"accessibility.calls.alter.hangUpCall" = "Prekini";
+"accessibility.calls.alter.addParticipant" = "Dodaj sodelujočega";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Odpri pogovor";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Spusti roko";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Zmanjšaj";
+"accessibility.conference.maximize" = "Povečaj";
+"accessibility.conference.setModerator" = "Nastavi moderatorja";
+"accessibility.conference.unsetModerator" = "Odstavi moderatorja";
 "accessibility.conference.muteAudio" = "Utišaj zvok";
 "accessibility.conference.unmuteAudio" = "Vključi zvok";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Prekini";
 "accessibility.conference.lowerHand" = "Spusti roko";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
index 59b0cd496..5fbfa16c3 100644
--- a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Kohë";
 "global.editPassword" = "Përpunoni fjalëkalim";
 "global.confirmPassword" = "Ripohoni fjalëkalimin";
+"global.confirm" = "Ripohoje";
 "global.cameraDisabled" = "Përdorimi i kamerës është i çaktivizuar. Që të mund të përdorni këtë veçori, aktivizojeni te rregullimet e pajisjes.";
+"global.confirm" = "Ripohoje";
+"global.connect" = "Lidhu";
 
 // Scan
 "scan.badQrCode" = "Kod QR i gabuar";
@@ -100,7 +103,7 @@
 "smartlist.results" = "Drejtori publike";
 "smartlist.jamsResults" = "Përfundime kërkimi";
 "smartlist.conversations" = "Biseda";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "S’ka ndonjë bisedë që përkon me kërkimin.";
 "smartlist.newContact" = "Kontakt i ri";
 "smartlist.newGroup" = "Grup i ri";
 "smartlist.accounts" = "Llogari";
@@ -110,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Jepni emër…";
 "smartlist.searchBar" = "Kërkim";
 "smartlist.noNetworkConnectivity" = "Pa lidhje në rrjet";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Siguroni që te rregullimet është lejuar përdorim celular.";
 "smartlist.accountsTitle" = "Llogari";
 "smartlist.addAccountButton" = "+ Shtoni llogari";
 "smartlist.noNumber" = "Kontakti i përzgjedhur s’ka ndonjë numër";
@@ -127,7 +130,7 @@
 // Conversation
 "conversation.addToContactsButton" = "Shtoje te Kontaktet";
 "conversation.addToContactsLabel" = "Të shtohet te kontaktet?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ s’gjendet te lista e kontakteve";
 "conversation.messagePlaceholder" = "Shkruajini";
 "conversation.errorSavingImage" = "Ndodhi një gabim teksa ruhej figura te galeria.";
 "conversation.receivedRequest" = "%@ ju dërgoi një ftesë bisede.";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Kam tashmë një llogari";
 "welcome.linkDevice" = "Importoni nga pajisje tjetër";
 "welcome.linkBackup" = "Importoni prej kopjeruajtjeje arkivi";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Krijoni një llogari Jami";
 "welcome.connectToJAMS" = "Lidhuni te Shërbyes Administrimi Llogarish Jami (JAMS)";
 
 // Creation Profile Screen
@@ -174,14 +177,14 @@
 // Create Account form
 "createAccount.createAccountFormTitle" = "Bëhuni pjesë e Jami-t";
 "createAccount.lookingForUsernameAvailability" = "Po kontrollohet a është i zënë emri i përdoruesit…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.invalidUsername" = "Emër përdoruesi i pavlefshëm. Ju lutemi, jepni emrin e saktë të përdoruesit.";
 "createAccount.usernameAlreadyTaken" = "Emër përdoruesi tashmë i zënë";
 "createAccount.usernameValid" = "Emri i përdoruesit është i lirë.";
 "createAccount.UsernameNotRegisteredTitle" = "Gabim rrjeti";
 "createAccount.UsernameNotRegisteredMessage" = "Llogaria u krijua, por emri i përdoruesit s’u regjistrua";
 "createAccount.timeoutTitle" = "Llogaria u Krijua";
 "createAccount.timeoutMessage" = "Regjistrimi i emrit të përdoruesit është në ecuri e sipër. Ju lutemi, prisni…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Formësoni llogari SIP ekzistuese";
 "createAccount.creatingAccount" = "Po krijohet llogari";
 "createAccount.nameExplanation" = "Mund të zgjidhni një emër përdoruesi, për t’i ndihmuar të tjerët t’ju gjejnë dhe të komunikojmë më lehtë me ju në Jami.";
 "createAccount.newAccount" = "Llogari e re";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "Një llogari Jami krijohet dhe depozitohet lokalisht vetëm në këtë pajisje, si një arkiv që përmban kyçet e veta të llogarisë. Hyrja në arkiv, në daçi, mund të mbrohet me një fjalëkalimi.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Lidhje llogarish";
-"linkToAccount.linkButtonTitle" = "Lidhje";
-"linkToAccount.linkDeviceTitle" = "Lidhni pajisje";
-"linkToAccount.linkDeviceMessage" = "Që të shfaqet kodi QR, apo që të prodhohet një PIN, zgjidhni “Lidhni pajisje të re”, që nga një aplikacion tjetër Jami.";
-"linkToAccount.explanationMessage" = "Për të përdorur një llogari ekzistuese Jami në këtë pajisje, lypset një PIN.";
-"linkToAccount.pinPlaceholder" = "PIN";
-"linkToAccount.pinLabel" = "Jepni PIN-in";
-"linkToAccount.scanQRCode" = "Skanoni kod QR";
-"linkToAccount.explanationPinMessage" = "Për të prodhuar kod PIN, kaloni te rregullimet e administrimit të llogarive te pajisja që përmban llogarinë që doni të lidhni. Përzgjidhni “Lidhni pajisje të re”. Do të merrni PIN-in e nevojshëm për plotësimin e këtij formulari. PIN-i do të skadojë pas 10 minutash.";
+"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.exit" = "Dalje";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importo llogari Jami prej një kartele vendore arkiv";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Gabim shfuqizimi pajisjeje";
 "accountPage.linkDeviceTitle" = "Lidhni një pajisje tjetër";
 "accountPage.other" = "Tjetër";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "Nëse llogaria s’është kopjeruajtur, apo shtuar te një pajisje tjetër, ajo dhe emri i përdoruesit regjistruar për të do të HUMBIN NË MËNYRË TË PAKTHYESHME.";
 "accountPage.inviteFriends" = "Ftoni shokë";
 "accountPage.contactMeOnJamiTitle" = "Lidhuni me mua në Jami!";
 "accountPage.contactMeOnJamiContant" = "Lidhuni me mua duke përdorur “%s” në platformën e komunikimeve të shpërndara Jami: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Lidhni pajisje të re";
-"linkDevice.passwordError" = "Fjalëkalim i pasaktë. Ju lutemi, riprovoni me fjalëkalimin e saktë.";
 "linkDevice.networkError" = "Ndodhi një gabim rrjeti teksa eksportohej llogaria.";
-"linkDevice.defaultError" = "Ndodhi një gabim teksa eksportohej llogaria.";
-"linkDevice.explanationMessage" = "Që të plotësohet procesi, hapni Jami-n në pajisjen e re dhe zgjidhni “Lidhe këtë pajisje me një llogari”. Kodi PIN do të skadojë pas 10 minutash.";
-"linkDevice.hudMessage" = "Po verifikohet";
+"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" = "Llogaria u importua me sukses te pajisja e re.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Filloni thirrje audio";
@@ -508,76 +529,78 @@
 // Accessibility
 "accessibility.close" = "Mbylle";
 "accessibility.smartListSwitchAccounts" = "Ndërroni llogari";
-"accessibility.smartListConnectedAs" = "The current account is %@";
+"accessibility.smartListConnectedAs" = "Llogaria e tanishme është %@";
 "accessibility.smartListAddAccount" = "Shtoni llogari";
 "accessibility.aboutJamiTitle" = "Mbi Jami-n";
 "accessibility.welcomeToJamiTitle" = "Mirë se vini te Jami";
-"accessibility.createAccountVerifyUsernamePrompt" = "Enter username to check availability.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Jepni emër përdoruesi që të shihet në është i lirë.";
 "accessibility.profilePicturePicker" = "Foto profili";
 "accessibility.profilePicturePickerHint" = "Prekeni dy herë, që të bëni një foto, ose të përzgjidhni një foto nga fototeka";
 "accessibility.swarmPicturePicker" = "Foto grupi";
 "accessibility.swarmPicturePickerHint" = "Prekeni dy herë, që të bëni një foto, ose të përzgjidhni një foto nga fototeka";
 "accessibility.accountSummaryQrCode" = "Kod QR";
-"accessibility.accountSummaryQrCodeHint" = "Double-tap to view the account QR code";
-"accessibility.accountSummaryEditProfileHint" = "Double-tap to edit the profile";
+"accessibility.accountSummaryQrCodeHint" = "Prekeni dy herë që të shihni kodin QR të llogarisë";
+"accessibility.accountSummaryEditProfileHint" = "Prekeni dy herë që të përpunoni profilin";
 "accessibility.accountSummaryEditSettingsButton" = "Rregullime";
-"accessibility.conversationStartVoiceCall" = "Start audio call with %@";
-"accessibility.conversationStartVideoCall" = "Start video call with %@";
+"accessibility.conversationStartVoiceCall" = "Filloni një thirrje me audio me %@";
+"accessibility.conversationStartVideoCall" = "Filloni një thirrje me video me %@";
 "accessibility.conversationComposeMessage" = "Hartoni një mesazh";
 "accessibility.conversationShareMedia" = "Ndani media me të tjerë";
 "accessibility.conversationCameraHint" = "Prekeni dy herë që të hapet kamera";
 "accessibility.audioPlayerPlay" = "Luaje";
 "accessibility.audioPlayerPause" = "Pushim";
-"accessibility.conversationRowUnreadCount" = "%@ unread messages.";
+"accessibility.conversationRowUnreadCount" = "%@ mesazhe të palexuar.";
 "accessibility.conversationRowBlocked" = "Biseda u bllokua";
-"accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Mesazhi i fundit më %@";
+"accessibility.conversationRowSyncing" = "Njëkohësim në ecuri e sipër";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Në linjë";
 "accessibility.userPresenceAvailable" = "I lirë";
-"accessibility.pendingRequestsRow" = "U mor ftesë: %@ ftesë pezull";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"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";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "Hidhe poshtë ftesën";
 "accessibility.pendingRequestsListAcceptInvitation" = "Pranoje ftesën";
 "accessibility.messageBubbleDeleted" = "Mesazhi u fshi";
 "accessibility.messageBubbleEdited" = "U përpunua";
-"accessibility.messageBubbleRead" = "Read";
-"accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.messageBubbleRead" = "Të lexuar";
+"accessibility.messageBubbleUnread" = "Të palexuar";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"accessibility.inReply" = "Në përgjigje të mesazhit";
+"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" = "Heshtoje mikrofonin";
+"accessibility.calls.default.toggleVideo" = "Vëre kamerë në punë";
+"accessibility.calls.default.pauseCall" = "Ndale thirren";
+"accessibility.calls.default.hangUpCall" = "Mbylle thirrjen";
 "accessibility.calls.default.addParticipant" = "Shtoni pjesëmarrës";
-"accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
-"accessibility.calls.default.showDialpad" = "Show dialpad";
+"accessibility.calls.default.switchCamera" = "Ndërro kamerën";
+"accessibility.calls.default.toggleSpeaker" = "Hap altoparlantin";
+"accessibility.calls.default.openConversation" = "Hap bisedë";
+"accessibility.calls.default.showDialpad" = "Shfaq pjesën numerike";
 "accessibility.calls.default.raiseHand" = "Ngrini dorën";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Hiqi heshtimin mikrofonit";
+"accessibility.calls.alter.toggleVideo" = "Ndale kamerën";
 "accessibility.calls.alter.pauseCall" = "Rimerre thirrjen";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "Mbylle thirrjen";
 "accessibility.calls.alter.addParticipant" = "Shtoni pjesëmarrës";
-"accessibility.calls.alter.switchCamera" = "Switch camera";
-"accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
-"accessibility.calls.alter.showDialpad" = "Show dialpad";
+"accessibility.calls.alter.switchCamera" = "Ndërro kamerën";
+"accessibility.calls.alter.toggleSpeaker" = "Mbyll altoparlantin";
+"accessibility.calls.alter.openConversation" = "Hap bisedë";
+"accessibility.calls.alter.showDialpad" = "Shfaq pjesën numerike";
 "accessibility.calls.alter.raiseHand" = "Uleni dorën";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Minimizoje";
+"accessibility.conference.maximize" = "Maksimizoje";
+"accessibility.conference.setModerator" = "Caktoni moderator";
+"accessibility.conference.unsetModerator" = "Hiqe nga moderator";
 "accessibility.conference.muteAudio" = "Mbylli zërin";
 "accessibility.conference.unmuteAudio" = "Riktheji zërin";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Mbylle thirrjen";
 "accessibility.conference.lowerHand" = "Uleni dorën";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/sr.lproj/Localizable.strings b/Ring/Ring/Resources/sr.lproj/Localizable.strings
index ce1523f53..57ed89a2e 100644
--- a/Ring/Ring/Resources/sr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Vreme";
 "global.editPassword" = "Izmeni lozinku";
 "global.confirmPassword" = "Potvrdi lozinku";
+"global.confirm" = "Potvrdi";
 "global.cameraDisabled" = "Pristup kameri je onemogućen. Omogućite ga u podešavanjima uređaja da biste koristili ovu funkciju.";
+"global.confirm" = "Potvrdi";
+"global.connect" = "Poveži";
 
 // Scan
 "scan.badQrCode" = "Loš QR kod";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Već imam nalog";
 "welcome.linkDevice" = "Uvezite sa drugog uređaja";
 "welcome.linkBackup" = "Uvezi iz rezervne kopije arhive";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Napravite Jami nalog";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "Jami nalog se kreira i čuva lokalno samo na ovom uređaju kao arhiva koja sadrži ključeve naloga. Pristup arhivi se opciono može zaštititi lozinkom.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Povezivanje naloga";
-"linkToAccount.linkButtonTitle" = "Veza";
-"linkToAccount.linkDeviceTitle" = "Povežite uređaj";
-"linkToAccount.linkDeviceMessage" = "Izaberite „Poveži novi uređaj“ iz druge Jami aplikacije da biste prikazali QR kod ili generisali PIN kod.";
-"linkToAccount.explanationMessage" = "PIN kod je neophodan za korišćenje postojećeg Jami naloga na ovom uređaju.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skenirajte QR kod";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Увезив рачуна Џами из локалног архива.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Povežite novi uređaj";
-"linkDevice.passwordError" = "Нетачна лозинка. Покушајте поново са тачном лозинком.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Provera";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Započni audio poziv";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Na vezi";
 "accessibility.userPresenceAvailable" = "Dostupno";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Редактирана";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Isključi mikrofon";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Pauzirajte poziv";
+"accessibility.calls.default.hangUpCall" = "Prekini poziv";
 "accessibility.calls.default.addParticipant" = "Додајте учесника";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Отворени разговор";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Podigni ruku";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Стварајте камеру";
 "accessibility.calls.alter.pauseCall" = "Пронављање позива";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "Prekini poziv";
 "accessibility.calls.alter.addParticipant" = "Додајте учесника";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Отворени разговор";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Spusti ruku";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Smanji";
+"accessibility.conference.maximize" = "Uvećaj";
+"accessibility.conference.setModerator" = "Postavite moderatora";
+"accessibility.conference.unsetModerator" = "Ukloni moderatora";
 "accessibility.conference.muteAudio" = "Isključi zvuk";
 "accessibility.conference.unmuteAudio" = "Uključi zvuk";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Prekini poziv";
 "accessibility.conference.lowerHand" = "Spusti ruku";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings b/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
index b7a7a1ac9..c58d1aa7e 100644
--- a/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Vreme";
 "global.editPassword" = "Uredi lozinku";
 "global.confirmPassword" = "Потврди лозинку";
+"global.confirm" = "Потврди";
 "global.cameraDisabled" = "Pristup kameri je onemogućen. Omogućite ga u podešavanjima uređaja da biste koristili ovu funkciju.";
+"global.confirm" = "Потврди";
+"global.connect" = "Повежи се";
 
 // Scan
 "scan.badQrCode" = "Лош QR код";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Већ имам налог";
 "welcome.linkDevice" = "Увоз из другог уређаја";
 "welcome.linkBackup" = "Импорт из архивног резервног копија";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Стварити рачун Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "Jami nalog se kreira i čuva lokalno samo na ovom uređaju kao arhiva koja sadrži ključeve naloga. Pristup arhivi se opciono može zaštititi lozinkom.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Повезивање налога";
-"linkToAccount.linkButtonTitle" = "Веза";
-"linkToAccount.linkDeviceTitle" = "Уредица за повезивање";
-"linkToAccount.linkDeviceMessage" = "Izaberite „Poveži novi uređaj“ iz druge Jami aplikacije da biste prikazali KR kod ili generisali PIN kod.";
-"linkToAccount.explanationMessage" = "PIN kod je neophodan za korišćenje postojećeg Jami naloga na ovom uređaju.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Скан QR кода";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Увезив рачуна Џами из локалног архива.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Сврнути ново уређај";
-"linkDevice.passwordError" = "Нетачна лозинка. Покушајте поново са тачном лозинком.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Проверка";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Почне аудио позив";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "На мрежи";
 "accessibility.userPresenceAvailable" = "Dostupno";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Редактирана";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Искључи микрофон";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Позив паузе";
+"accessibility.calls.default.hangUpCall" = "Прекини позив";
 "accessibility.calls.default.addParticipant" = "Додајте учесника";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Отвори разговор";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Подигни руку";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Стварајте камеру";
 "accessibility.calls.alter.pauseCall" = "Пронављање позива";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "Прекини позив";
 "accessibility.calls.alter.addParticipant" = "Додајте учесника";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Отвори разговор";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Ниже руке";
-"accessibility.conference.minimize" = "Minimize";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.minimize" = "Минимализирајте";
+"accessibility.conference.maximize" = "Увећај";
+"accessibility.conference.setModerator" = "Уредимо модератор";
+"accessibility.conference.unsetModerator" = "Упременимо модератор";
 "accessibility.conference.muteAudio" = "Уморан аудио";
 "accessibility.conference.unmuteAudio" = "Неуглашен аудио";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Прекини позив";
 "accessibility.conference.lowerHand" = "Ниже руке";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/sv.lproj/Localizable.strings b/Ring/Ring/Resources/sv.lproj/Localizable.strings
index a4a905dd1..448d30cf3 100644
--- a/Ring/Ring/Resources/sv.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sv.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Tid";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Bekräfta lösenord";
+"global.confirm" = "Bekräfta";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Bekräfta";
+"global.connect" = "Anslut";
 
 // Scan
 "scan.badQrCode" = "Felaktig QR-kod";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Jag har redan ett konto.";
 "welcome.linkDevice" = "Import från en annan enhet";
 "welcome.linkBackup" = "Importera från arkiverad säkerhetskopia";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Skapa Jami-konto";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Kontokoppling";
-"linkToAccount.linkButtonTitle" = "Länka";
-"linkToAccount.linkDeviceTitle" = "Koppla enhet";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Skanna QR-kod";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Importera konto";
+"linkToAccount.showQrCode" = "QR-kod";
+"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" = "Avsluta";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importera Jami-konto från lokal arkivfil.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Koppla ny enhet";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verifierar";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Starta ljudsamtal";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Ansluten";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Redigerad";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Stäng av mikrofon";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Pausa samtal";
+"accessibility.calls.default.hangUpCall" = "Lägg på";
 "accessibility.calls.default.addParticipant" = "Lägg till deltagare";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Öppna konversation";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Räck upp handen";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stäng kamera";
 "accessibility.calls.alter.pauseCall" = "Ã…teruppta samtalet";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "Lägg på";
 "accessibility.calls.alter.addParticipant" = "Lägg till deltagare";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Öppna konversation";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Ta ned handen ";
 "accessibility.conference.minimize" = "Minimera";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "Maximera";
+"accessibility.conference.setModerator" = "Ange moderator. ";
+"accessibility.conference.unsetModerator" = "Moderator inte åsatt. ";
 "accessibility.conference.muteAudio" = "Pausa ljud";
 "accessibility.conference.unmuteAudio" = "Sätt på ljud";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Lägg på";
 "accessibility.conference.lowerHand" = "Ta ned handen ";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/sw.lproj/Localizable.strings b/Ring/Ring/Resources/sw.lproj/Localizable.strings
index f3384e1df..4f9a4b452 100644
--- a/Ring/Ring/Resources/sw.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sw.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Tathmini password";
+"global.confirm" = "Tumia";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Tumia";
+"global.connect" = "Unganisha";
 
 // Scan
 "scan.badQrCode" = "Nambari mbaya ya QR";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Mimi tayari nina akaunti";
 "welcome.linkDevice" = "Uagizaji kutoka kifaa kingine";
 "welcome.linkBackup" = "Kuagiza kutoka kumbukumbu ya kumbukumbu";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Unda akaunti ya Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Kuunganisha akaunti";
-"linkToAccount.linkButtonTitle" = "Kiungo";
-"linkToAccount.linkDeviceTitle" = "Kifaa cha kuunganisha";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Scan QR code";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Nambari ya 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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Kuagiza akaunti Jami kutoka faili ya kumbukumbu ya ndani.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Unganisha kifaa kipya";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Kufanya uthibitisho";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Kuanza wito wa sauti";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Mtandaoni";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Iliyohaririwa";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Kipaza sauti";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Kuomba kwa muda";
+"accessibility.calls.default.hangUpCall" = "Funga";
 "accessibility.calls.default.addParticipant" = "Ongeza mshiriki";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Mazungumzo ya wazi";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Kuinua mkono";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Stop kamera";
 "accessibility.calls.alter.pauseCall" = "Kuendelea wito";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "Funga";
 "accessibility.calls.alter.addParticipant" = "Ongeza mshiriki";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Mazungumzo ya wazi";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Mkono wa chini";
 "accessibility.conference.minimize" = "Punguza";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "Kufanya yote uwezayo";
+"accessibility.conference.setModerator" = "Weka moderator";
+"accessibility.conference.unsetModerator" = "Moderator kutoweka";
 "accessibility.conference.muteAudio" = "Sauti isiyo na sauti";
 "accessibility.conference.unmuteAudio" = "Sauti isiyo na sauti";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Funga";
 "accessibility.conference.lowerHand" = "Mkono wa chini";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/ta.lproj/Localizable.strings b/Ring/Ring/Resources/ta.lproj/Localizable.strings
index 7ded27b82..264408ef8 100644
--- a/Ring/Ring/Resources/ta.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ta.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "கடவுச்சொல்லை உறுதிப்படுத்தவும்";
+"global.confirm" = "உறுதிப்படுத்தவும்";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "உறுதிப்படுத்தவும்";
+"global.connect" = "இணைக்கவும்";
 
 // Scan
 "scan.badQrCode" = "கெட்ட QR குறியீடு";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "எனக்கு ஏற்கனவே ஒரு கணக்கு இருக்கிறது";
 "welcome.linkDevice" = "மற்றொரு சாதனத்திலிருந்து இறக்குமதி";
 "welcome.linkBackup" = "காப்புரிமை காப்புரிமை இருந்து இறக்குமதி";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "ஜாமி கணக்கை உருவாக்கவும்";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "கணக்கு இணைப்பு";
-"linkToAccount.linkButtonTitle" = "இணைப்பு";
-"linkToAccount.linkDeviceTitle" = "இணைப்பு சாதனம்";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR குறியீட்டை ஸ்கேன் செய்யவும்";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "உள்ளூர் காப்பக கோப்பிலிருந்து ஜாமி கணக்கை இறக்குமதி செய்யுங்கள்.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "புதிய சாதனத்தை இணைக்கவும்";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "சரிபார்ப்பு";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ஆடியோ அழைப்பைத் தொடங்கவும்";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "இணையத்தில்";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "தொகுப்பு";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "மைக்ரோஃபோன் முடக்கப்பட்டது";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "இடைநிறுத்த அழைப்பு";
+"accessibility.calls.default.hangUpCall" = "மூடிடு";
 "accessibility.calls.default.addParticipant" = "பங்கேற்பாளரை சேர்க்கவும்";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "திறந்த உரையாடல்";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "கை உயர்த்தி";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "கேமரா நிறுத்த";
 "accessibility.calls.alter.pauseCall" = "அழைப்பைத் தொடங்குதல்";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "மூடிடு";
 "accessibility.calls.alter.addParticipant" = "பங்கேற்பாளரை சேர்க்கவும்";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "திறந்த உரையாடல்";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "கீழ் கை";
 "accessibility.conference.minimize" = "குறைக்கவும்";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "அதிகபட்சமாக";
+"accessibility.conference.setModerator" = "அமை அமை அமைப்பான்";
+"accessibility.conference.unsetModerator" = "அமைக்கப்படாத மாடரேட்டர்";
 "accessibility.conference.muteAudio" = "மவுண்ட் ஆடியோ";
 "accessibility.conference.unmuteAudio" = "ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி ஒலி";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "மூடிடு";
 "accessibility.conference.lowerHand" = "கீழ் கை";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/te.lproj/Localizable.strings b/Ring/Ring/Resources/te.lproj/Localizable.strings
index a087e2be9..7b09b95f9 100644
--- a/Ring/Ring/Resources/te.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/te.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "పాస్వర్డ్ను నిర్ధారించు";
+"global.confirm" = "ధృవీకరించు";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "ధృవీకరించు";
+"global.connect" = "కనెక్ట్";
 
 // Scan
 "scan.badQrCode" = "చెడ్డ QR కోడ్";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "నాకు ఇప్పటికే ఒక ఖాతా ఉంది";
 "welcome.linkDevice" = "మరొక పరికరము నుండి దిగుమతి";
 "welcome.linkBackup" = "ఆర్కైవ్ బ్యాకప్ నుండి దిగుమతి";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "జమి ఖాతాను సృష్టించు";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "ఖాతా లింకింగ్";
-"linkToAccount.linkButtonTitle" = "లింక్";
-"linkToAccount.linkDeviceTitle" = "లింక్ పరికరం";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR కోడ్ స్కాన్";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "స్థానిక ఆర్కైవ్ ఫైల్ నుండి జామి ఖాతాను దిగుమతి చేయండి.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "కొత్త పరికరానికి లింక్";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "తనిఖీ";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "ఆడియో కాల్ ప్రారంభించండి";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "ఆన్లైన్";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "సవరణ";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "మ్యూట్ మైక్రోఫోన్";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "విరామం కాల్";
+"accessibility.calls.default.hangUpCall" = "మూసివేయండి";
 "accessibility.calls.default.addParticipant" = "పాల్గొనేవారిని జోడించండి";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "బహిరంగ సంభాషణ";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "చేతి పైకి";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "స్టాప్ కెమెరా";
 "accessibility.calls.alter.pauseCall" = "పునఃప్రారంభం కాల్";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "మూసివేయండి";
 "accessibility.calls.alter.addParticipant" = "పాల్గొనేవారిని జోడించండి";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "బహిరంగ సంభాషణ";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "దిగువ చేతి";
 "accessibility.conference.minimize" = "తక్కువ స్థాయిలో";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "గరిష్టంగా";
+"accessibility.conference.setModerator" = "మోడరేటర్ సెట్";
+"accessibility.conference.unsetModerator" = "సెట్టింగ్ను తొలగించు";
 "accessibility.conference.muteAudio" = "మూత ఆడియో";
 "accessibility.conference.unmuteAudio" = "నిశ్శబ్ద ఆడియో";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "మూసివేయండి";
 "accessibility.conference.lowerHand" = "దిగువ చేతి";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/th.lproj/Localizable.strings b/Ring/Ring/Resources/th.lproj/Localizable.strings
index 30de02334..d5594b2fc 100644
--- a/Ring/Ring/Resources/th.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/th.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "ยืนยันปัสริด";
+"global.confirm" = "ยืนยัน";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "ยืนยัน";
+"global.connect" = "เชื่อมต่อ";
 
 // Scan
 "scan.badQrCode" = "รหัส QR ที่ไม่ดี";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "ฉันมีบัญชีแล้ว";
 "welcome.linkDevice" = "การนําเข้าจากอุปกรณ์อื่น";
 "welcome.linkBackup" = "นำเข้าจากข้อมูลสำรองที่เก็บถาวร";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "สร้างบัญชี Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "การเชื่อมโยงบัญชี";
-"linkToAccount.linkButtonTitle" = "ลิงค์";
-"linkToAccount.linkDeviceTitle" = "เชื่อมโยงอุปกรณ์";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "ตรวจสอบรหัส QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "นําเข้าบัญชี Jami จากไฟล์อาร์คไฮเวอร์ท้องถิ่น";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "เชื่อมโยงอุปกรณ์ใหม่";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "กำลังยืนยัน";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "เริ่มการโทรเสียง";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "ออนไลน์";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "ปรับแต่ง";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "ปิดเสียงไมโครโฟน";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "การเรียกหยุด";
+"accessibility.calls.default.hangUpCall" = "วางสาย";
 "accessibility.calls.default.addParticipant" = "เพิ่มผู้เข้าร่วม";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "การพูดคุยเปิด";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "ยกมือ";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "กล้องหยุด";
 "accessibility.calls.alter.pauseCall" = "เริ่มการเรียก";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "วางสาย";
 "accessibility.calls.alter.addParticipant" = "เพิ่มผู้เข้าร่วม";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "การพูดคุยเปิด";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "มือต่ํา";
 "accessibility.conference.minimize" = "ลดน้อยลง";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "ทำให้สูงสุด";
+"accessibility.conference.setModerator" = "กําหนดผู้ปรับ";
+"accessibility.conference.unsetModerator" = "ปฏิทินไม่ตั้ง";
 "accessibility.conference.muteAudio" = "เสียงเงียบ";
 "accessibility.conference.unmuteAudio" = "เสียงไม่ปิด";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "วางสาย";
 "accessibility.conference.lowerHand" = "มือต่ํา";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/tr.lproj/Localizable.strings b/Ring/Ring/Resources/tr.lproj/Localizable.strings
index dddc7f4e6..2a51fc25b 100644
--- a/Ring/Ring/Resources/tr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tr.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Zaman";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Parolayı onayla";
+"global.confirm" = "Onayla";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Onayla";
+"global.connect" = "BaÄŸlan";
 
 // Scan
 "scan.badQrCode" = "Bozuk QR kod";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "- Hesabım var.";
 "welcome.linkDevice" = "Diğer aygıttan içe aktar";
 "welcome.linkBackup" = "Arşiv yedeklemesinden içe aktar";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami hesabı oluştur";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Hesap bağlantısı";
-"linkToAccount.linkButtonTitle" = "Bağlantı";
-"linkToAccount.linkDeviceTitle" = "Aygıt bağla";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR kodunu tarayın";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "QR kodu";
+"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" = "Çıkış";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Jami hesabını yerel arşiv dosyasından içe aktar.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Yeni aygıt bağla";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "DoÄŸrulama";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Sesli arama baÅŸlat";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Çevrim İçi";
 "accessibility.userPresenceAvailable" = "Uygun";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Düzenlendi";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Mikrofon sessiz";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Çağrıyı duraklat";
+"accessibility.calls.default.hangUpCall" = "Kapat";
 "accessibility.calls.default.addParticipant" = "Katılımcı ekle";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Konuşma aç";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "El kaldır";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Kamerayı kapat";
 "accessibility.calls.alter.pauseCall" = "Çağrıyı sürdür";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "Kapat";
 "accessibility.calls.alter.addParticipant" = "Katılımcı ekle";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Konuşma aç";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Elini indir";
 "accessibility.conference.minimize" = "En küçük";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "En büyük";
+"accessibility.conference.setModerator" = "Oturum başkanı ayarla";
+"accessibility.conference.unsetModerator" = "Oturum başkanı ayarını kaldır";
 "accessibility.conference.muteAudio" = "Sesi kapat";
 "accessibility.conference.unmuteAudio" = "Sesi aç";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Kapat";
 "accessibility.conference.lowerHand" = "Elini indir";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/tt.lproj/Localizable.strings b/Ring/Ring/Resources/tt.lproj/Localizable.strings
index a5f782f64..49620abc1 100644
--- a/Ring/Ring/Resources/tt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tt.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Парольне раслау";
+"global.confirm" = "Ышанычлылык";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Ышанычлылык";
+"global.connect" = "Бәйләнешкә кертү";
 
 // Scan
 "scan.badQrCode" = "Яман QR-код";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Минем инде хисабым бар.";
 "welcome.linkDevice" = "Башка җайланмадан импорт";
 "welcome.linkBackup" = "Архивлар резервтан импортлау";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Jami хисабы булдыру";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Хисапны бәйләү";
-"linkToAccount.linkButtonTitle" = "Сылтама";
-"linkToAccount.linkDeviceTitle" = "Сылтама төре";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "QR-кодны сканерлау";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Җәми хисабын җирле архив файлыннан импортлау.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Яңа җайланманы бәйлә";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Тикшерү";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Аудиокызылышны башлау";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Интернетта";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Редакция";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
+"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" = "Тыныч микрофон";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Тәртибе";
 "accessibility.calls.default.hangUpCall" = "Hang up";
 "accessibility.calls.default.addParticipant" = "Катнашучыны өстәү";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Ачык сөйләшү";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Кулыңны күтәр!";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Камераны туктатыгыз";
 "accessibility.calls.alter.pauseCall" = "Көйрәне дәвам итү";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
 "accessibility.calls.alter.addParticipant" = "Катнашучыны өстәү";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Ачык сөйләшү";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Түбән кул";
 "accessibility.conference.minimize" = "Бу эшне киметмәгез";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "Максимумлырак";
+"accessibility.conference.setModerator" = "Модераторны билгелә";
+"accessibility.conference.unsetModerator" = "Модераторны урнаштырмау";
 "accessibility.conference.muteAudio" = "Тыныч тавыш";
 "accessibility.conference.unmuteAudio" = "Тыныч тавыш";
 "accessibility.conference.hangup" = "Hang up";
 "accessibility.conference.lowerHand" = "Түбән кул";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/uk.lproj/Localizable.strings b/Ring/Ring/Resources/uk.lproj/Localizable.strings
index 5bcac82da..d875b4421 100644
--- a/Ring/Ring/Resources/uk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/uk.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Час";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Підтвердити пароль";
+"global.confirm" = "Підтвердження";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Підтвердження";
+"global.connect" = "З'єднати";
 
 // Scan
 "scan.badQrCode" = "Неприйнятний QR-код";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "У мене вже є рахунок.";
 "welcome.linkDevice" = "Імпорт з іншого пристрою";
 "welcome.linkBackup" = "Імпорт з архивного резервного копію";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Створення акаунту Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Поєднання облікових записів";
-"linkToAccount.linkButtonTitle" = "Зв'язати";
-"linkToAccount.linkDeviceTitle" = "Привʼязати пристрій";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Скануйте QR-код";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"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.exit" = "Вийти";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Імпортувати обліковий запис Jami з локального архівного файлу.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Привʼязати новий пристрій";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Перевірка";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Розпочати аудіодзвінок";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "У мережі";
 "accessibility.userPresenceAvailable" = "Доступні";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Редагування";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "Відключити мікрофон";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Призупинити дзвінок";
+"accessibility.calls.default.hangUpCall" = "Зупинити";
 "accessibility.calls.default.addParticipant" = "Додати учасників";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Відкрити розмову";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Підняти руку";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Зупинити камеру";
 "accessibility.calls.alter.pauseCall" = "Продовжити дзвінок";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "Зупинити";
 "accessibility.calls.alter.addParticipant" = "Додати учасників";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Відкрити розмову";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Нижня рука";
 "accessibility.conference.minimize" = "Зменьшити";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "Збільшити";
+"accessibility.conference.setModerator" = "Наведіть модератор";
+"accessibility.conference.unsetModerator" = "Не встановлюється модератор";
 "accessibility.conference.muteAudio" = "Відключити звук";
 "accessibility.conference.unmuteAudio" = "Незаглушенний аудіо";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "Зупинити";
 "accessibility.conference.lowerHand" = "Нижня рука";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/vi.lproj/Localizable.strings b/Ring/Ring/Resources/vi.lproj/Localizable.strings
index f56b7366b..7f85d9fb9 100644
--- a/Ring/Ring/Resources/vi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/vi.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "Time";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "Tiếp tục xác nhận mật khẩu";
+"global.confirm" = "Đảm nhận";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "Đảm nhận";
+"global.connect" = "Kết nối";
 
 // Scan
 "scan.badQrCode" = "Mã QR xấu";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "Tôi đã có tài khoản";
 "welcome.linkDevice" = "Nhập khẩu từ thiết bị khác";
 "welcome.linkBackup" = "Nhập từ sao lưu lưu lưu";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "Tạo tài khoản Jami";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Kết nối tài khoản";
-"linkToAccount.linkButtonTitle" = "Liên kết";
-"linkToAccount.linkDeviceTitle" = "Thiết bị liên kết";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Quét mã QR";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "Mã 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.exit" = "Exit";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Nhập vào tài khoản Jami từ tệp lưu trữ địa phương.";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "Kết nối thiết bị mới";
-"linkDevice.passwordError" = "Incorrect password. Please try again with the correct password.";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Kiểm tra";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Bắt đầu cuộc gọi âm thanh";
@@ -531,10 +552,11 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "Trên mạng";
 "accessibility.userPresenceAvailable" = "Available";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
 "accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
@@ -543,41 +565,42 @@
 "accessibility.messageBubbleEdited" = "Được biên tập";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
+"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" = "Tắt tiếng micrô";
+"accessibility.calls.default.toggleVideo" = "Start camera";
+"accessibility.calls.default.pauseCall" = "Tiếng gọi tạm dừng";
 "accessibility.calls.default.hangUpCall" = "Hang up";
 "accessibility.calls.default.addParticipant" = "Thêm người tham gia";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "Cuộc trò chuyện mở";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "Giơ tay";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "Unmute microphone";
+"accessibility.calls.alter.toggleVideo" = "Hình ảnh dừng";
 "accessibility.calls.alter.pauseCall" = "Đặt lại cuộc gọi";
 "accessibility.calls.alter.hangUpCall" = "Hang up";
 "accessibility.calls.alter.addParticipant" = "Thêm người tham gia";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "Cuộc trò chuyện mở";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "Tay dưới";
 "accessibility.conference.minimize" = "Giảm thiểu";
-"accessibility.conference.maximize" = "Maximize";
+"accessibility.conference.maximize" = "Tăng tối đa";
 "accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.unsetModerator" = "Moderator không cài đặt";
 "accessibility.conference.muteAudio" = "Âm thanh câm";
 "accessibility.conference.unmuteAudio" = "Đáp âm thanh không động";
 "accessibility.conference.hangup" = "Hang up";
 "accessibility.conference.lowerHand" = "Tay dưới";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
index f70eef0ba..ae2e592fe 100644
--- a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "æ—¶é—´";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "确认密码";
+"global.confirm" = "确认";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "确认";
+"global.connect" = "连接";
 
 // Scan
 "scan.badQrCode" = "无效的二维码";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "我已经有一个账户";
 "welcome.linkDevice" = "從其他裝置匯入";
 "welcome.linkBackup" = "从归档备份中导入";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "建立 Jami 帳號";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -181,7 +184,7 @@
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已创建账户";
 "createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以便他人在 Jami 上找到并联系您。";
 "createAccount.newAccount" = "新账户";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "账户关联";
-"linkToAccount.linkButtonTitle" = "关联";
-"linkToAccount.linkDeviceTitle" = "关联设备";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "使用此设备上的现有Jami帐户需要PIN码。";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "输入PIN码";
-"linkToAccount.scanQRCode" = "扫描 QR 码";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "二维码";
+"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" = "退出";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "设备吊销出错";
 "accountPage.linkDeviceTitle" = "关联另一台设备";
 "accountPage.other" = "å…¶ä»–";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "如果该帐户未备份或添加到其他设备,则该帐户和注册用户名将不可找回地丢失。";
 "accountPage.inviteFriends" = "Invite friends";
 "accountPage.contactMeOnJamiTitle" = "在 Jami 上联系我!";
 "accountPage.contactMeOnJamiContant" = "Contact me using “%s” on the Jami distributed communication platform: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "关联新设备";
-"linkDevice.passwordError" = "使用该密码无法解锁您的账户。";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "认证中";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -531,42 +552,42 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "在线";
 "accessibility.userPresenceAvailable" = "可获得的";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "拒绝邀请";
 "accessibility.pendingRequestsListAcceptInvitation" = "接受邀请";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "已编辑";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "关闭麦克风";
+"accessibility.calls.default.toggleVideo" = "启动摄像头";
+"accessibility.calls.default.pauseCall" = "暂停通话";
+"accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "麦克风静音";
+"accessibility.calls.alter.toggleVideo" = "关闭摄像头";
 "accessibility.calls.alter.pauseCall" = "恢复通话";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "挂断";
 "accessibility.calls.alter.addParticipant" = "添加参与者";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
@@ -574,10 +595,12 @@
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "放下手";
 "accessibility.conference.minimize" = "最小化";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "最大化";
+"accessibility.conference.setModerator" = "设置管理员";
+"accessibility.conference.unsetModerator" = "取消设置管理员";
 "accessibility.conference.muteAudio" = "静音";
 "accessibility.conference.unmuteAudio" = "取消静音";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "挂断";
 "accessibility.conference.lowerHand" = "放下手";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
index 441f6a0c9..818734d86 100644
--- a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "時間";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "確認密碼";
+"global.confirm" = "確認";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "確認";
+"global.connect" = "連線";
 
 // Scan
 "scan.badQrCode" = "不正確的 QR code";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "我已经有一个账户";
 "welcome.linkDevice" = "從其他裝置匯入";
 "welcome.linkBackup" = "從封存備份匯入";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "建立 Jami 帳號";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -181,7 +184,7 @@
 "createAccount.UsernameNotRegisteredMessage" = "帳號已建立,但未註冊使用者名稱";
 "createAccount.timeoutTitle" = "已建立帳號";
 "createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以帮助其他人更容易地找到和联系您在Jami.";
 "createAccount.newAccount" = "新增帳號";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "帳號連結";
-"linkToAccount.linkButtonTitle" = "連結";
-"linkToAccount.linkDeviceTitle" = "連結裝置";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "使用此设备上的现有Jami帐户需要PIN码。";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "输入PIN码";
-"linkToAccount.scanQRCode" = "扫描 QR 码";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"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" = "離開";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "裝置撤銷錯誤";
 "accountPage.linkDeviceTitle" = "連結其他裝置";
 "accountPage.other" = "å…¶ä»–";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "如果该帐户未备份或添加到其他设备,则该帐户和注册用户名将不可找回地丢失。";
 "accountPage.inviteFriends" = "Invite friends";
 "accountPage.contactMeOnJamiTitle" = "在 Jami 上聯絡我";
 "accountPage.contactMeOnJamiContant" = "Contact me using “%s” on the Jami distributed communication platform: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "連結新裝置";
-"linkDevice.passwordError" = "使用该密码无法解锁您的账户。";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "正在驗證";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "開始音訊通話";
@@ -531,42 +552,42 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "線上";
 "accessibility.userPresenceAvailable" = "可获得的";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "拒绝邀请";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accept invitation";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "已编辑";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "麥克風靜音";
+"accessibility.calls.default.toggleVideo" = "启动摄像头";
+"accessibility.calls.default.pauseCall" = "暫停通話";
+"accessibility.calls.default.hangUpCall" = "掛斷";
 "accessibility.calls.default.addParticipant" = "新增參與者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "開啟對話";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "舉手";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "麦克风静音";
+"accessibility.calls.alter.toggleVideo" = "关闭摄像头";
 "accessibility.calls.alter.pauseCall" = "恢復通話";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "掛斷";
 "accessibility.calls.alter.addParticipant" = "新增參與者";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
@@ -574,10 +595,12 @@
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "放下手";
 "accessibility.conference.minimize" = "最小化";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "最大化";
+"accessibility.conference.setModerator" = "設定主持人";
+"accessibility.conference.unsetModerator" = "取消設定主持人";
 "accessibility.conference.muteAudio" = "靜音";
 "accessibility.conference.unmuteAudio" = "取消靜音";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "掛斷";
 "accessibility.conference.lowerHand" = "放下手";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
index 3ec1e4b3e..dc25b013c 100644
--- a/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "æ—¶é—´";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "确认密码";
+"global.confirm" = "確認";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "確認";
+"global.connect" = "连接";
 
 // Scan
 "scan.badQrCode" = "Bad QR code";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "I already have an account";
 "welcome.linkDevice" = "Import from another device";
 "welcome.linkBackup" = "從封存備份匯入";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "建立 Jami 帳號";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -181,7 +184,7 @@
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
 "createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以便他人在 Jami 上找到并联系您。";
 "createAccount.newAccount" = "新增帳號";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "Account linking";
-"linkToAccount.linkButtonTitle" = "链接";
-"linkToAccount.linkDeviceTitle" = "关联设备";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "使用此设备上的现有Jami帐户需要PIN码。";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "输入PIN码";
-"linkToAccount.scanQRCode" = "扫描 QR 码";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "二维码";
+"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" = "離開";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "Device revocation error";
 "accountPage.linkDeviceTitle" = "Link another device";
 "accountPage.other" = "Other";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "如果该帐户未备份或添加到其他设备,则该帐户和注册用户名将不可找回地丢失。";
 "accountPage.inviteFriends" = "Invite friends";
 "accountPage.contactMeOnJamiTitle" = "Contact me on Jami!";
 "accountPage.contactMeOnJamiContant" = "Contact me using “%s” on the Jami distributed communication platform: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "关联新设备";
-"linkDevice.passwordError" = "使用该密码无法解锁您的账户。";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "Verifying";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -531,53 +552,55 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "線上";
 "accessibility.userPresenceAvailable" = "可获得的";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "拒绝邀请";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accept invitation";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "已编辑";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "关闭麦克风";
+"accessibility.calls.default.toggleVideo" = "启动摄像头";
+"accessibility.calls.default.pauseCall" = "暫停通話";
+"accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "麦克风静音";
+"accessibility.calls.alter.toggleVideo" = "关闭摄像头";
 "accessibility.calls.alter.pauseCall" = "恢复通话";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "挂断";
 "accessibility.calls.alter.addParticipant" = "添加参与者";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "打开会话";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "放下手";
 "accessibility.conference.minimize" = "最小化";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "最大化";
+"accessibility.conference.setModerator" = "設定主持人";
+"accessibility.conference.unsetModerator" = "取消設定主持人";
 "accessibility.conference.muteAudio" = "静音";
 "accessibility.conference.unmuteAudio" = "取消静音";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "挂断";
 "accessibility.conference.lowerHand" = "放下手";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/zh.lproj/Localizable.strings b/Ring/Ring/Resources/zh.lproj/Localizable.strings
index 8f6771e02..08c4d4013 100644
--- a/Ring/Ring/Resources/zh.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "æ—¶é—´";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "确认密码";
+"global.confirm" = "確認";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "確認";
+"global.connect" = "连接";
 
 // Scan
 "scan.badQrCode" = "无效的二维码";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "我已经有一个账户";
 "welcome.linkDevice" = "從其他裝置匯入";
 "welcome.linkBackup" = "从归档备份中导入";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "建立 Jami 帳號";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -181,7 +184,7 @@
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
 "createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以帮助其他人更容易地找到和联系您在Jami.";
 "createAccount.newAccount" = "新增帳號";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "关联账户";
-"linkToAccount.linkButtonTitle" = "关联";
-"linkToAccount.linkDeviceTitle" = "关联设备";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "使用此设备上的现有Jami帐户需要PIN码。";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "输入PIN码";
-"linkToAccount.scanQRCode" = "扫描 QR 码";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "二维码";
+"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" = "離開";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "设备吊销出错";
 "accountPage.linkDeviceTitle" = "关联另一台设备";
 "accountPage.other" = "å…¶ä»–";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "如果该帐户未备份或添加到其他设备,则该帐户和注册用户名将不可找回地丢失。";
 "accountPage.inviteFriends" = "Invite friends";
 "accountPage.contactMeOnJamiTitle" = "在 Jami 上联系我!";
 "accountPage.contactMeOnJamiContant" = "Contact me using “%s” on the Jami distributed communication platform: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "关联新设备";
-"linkDevice.passwordError" = "使用该密码无法解锁您的账户。";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "正在驗證";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -531,53 +552,55 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "線上";
 "accessibility.userPresenceAvailable" = "可获得的";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "拒绝邀请";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accept invitation";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "已编辑";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "关闭麦克风";
+"accessibility.calls.default.toggleVideo" = "启动摄像头";
+"accessibility.calls.default.pauseCall" = "暂停通话";
+"accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "麦克风静音";
+"accessibility.calls.alter.toggleVideo" = "关闭摄像头";
 "accessibility.calls.alter.pauseCall" = "恢复通话";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "挂断";
 "accessibility.calls.alter.addParticipant" = "添加参与者";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
-"accessibility.calls.alter.openConversation" = "Open conversation";
+"accessibility.calls.alter.openConversation" = "打开会话";
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "放下手";
 "accessibility.conference.minimize" = "最小化";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "最大化";
+"accessibility.conference.setModerator" = "設定主持人";
+"accessibility.conference.unsetModerator" = "取消設定主持人";
 "accessibility.conference.muteAudio" = "靜音";
 "accessibility.conference.unmuteAudio" = "取消静音";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "挂断";
 "accessibility.conference.lowerHand" = "放下手";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
diff --git a/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings b/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
index c1b582694..53f55d0fa 100644
--- a/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
@@ -57,7 +57,10 @@
 "global.time" = "æ—¶é—´";
 "global.editPassword" = "Edit password";
 "global.confirmPassword" = "确认密码";
+"global.confirm" = "確認";
 "global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.confirm" = "確認";
+"global.connect" = "连接";
 
 // Scan
 "scan.badQrCode" = "无效的二维码";
@@ -159,7 +162,7 @@
 "welcome.haveAccount" = "我已经有一个账户";
 "welcome.linkDevice" = "從其他裝置匯入";
 "welcome.linkBackup" = "从归档备份中导入";
-"welcome.createAccount" = "Create Jami account";
+"welcome.createAccount" = "建立 Jami 帳號";
 "welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
 
 // Creation Profile Screen
@@ -181,7 +184,7 @@
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
 "createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以帮助其他人更容易地找到和联系您在Jami.";
 "createAccount.newAccount" = "新增帳號";
@@ -192,15 +195,21 @@
 "createAccount.encryptExplanation" = "A Jami account is created and stored locally only on this device as an archive containing its account keys. Access to the archive can optionally be protected with a password.";
 
 // Link To Account form
-"linkToAccount.waitLinkToAccountTitle" = "关联账户";
-"linkToAccount.linkButtonTitle" = "关联";
-"linkToAccount.linkDeviceTitle" = "关联设备";
-"linkToAccount.linkDeviceMessage" = "Choose “Link new device” from another Jami app to show the QR code or generate a PIN code.";
-"linkToAccount.explanationMessage" = "使用此设备上的现有Jami帐户需要PIN码。";
-"linkToAccount.pinPlaceholder" = "PIN code";
-"linkToAccount.pinLabel" = "输入PIN码";
-"linkToAccount.scanQRCode" = "扫描 QR 码";
-"linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
+"linkToAccount.importAccount" = "Import account";
+"linkToAccount.showQrCode" = "二维码";
+"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" = "離開";
+"linkToAccount.shareMessage" = "Your code is: %@";
+"linkToAccount.alertTile" = "Do you want to exit?";
+"linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -301,7 +310,7 @@
 "accountPage.deviceRevocationError" = "设备吊销出错";
 "accountPage.linkDeviceTitle" = "关联另一台设备";
 "accountPage.other" = "å…¶ä»–";
-"accountPage.removeAccountMessage" = "If the account has not been backed up or added to another device, the account and registered username will be IRREVOCABLY LOST.";
+"accountPage.removeAccountMessage" = "如果该帐户未备份或添加到其他设备,则该帐户和注册用户名将不可找回地丢失。";
 "accountPage.inviteFriends" = "Invite friends";
 "accountPage.contactMeOnJamiTitle" = "在 Jami 上联系我!";
 "accountPage.contactMeOnJamiContant" = "Contact me using “%s” on the Jami distributed communication platform: https://jami.net";
@@ -416,11 +425,23 @@
 
 // Link New Device
 "linkDevice.title" = "关联新设备";
-"linkDevice.passwordError" = "使用该密码无法解锁您的账户。";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
-"linkDevice.defaultError" = "An error occurred while exporting the account.";
-"linkDevice.explanationMessage" = "Open Jami on the new device and choose “Link this device to an account” to complete the process. The PIN code will expire in 10 minutes.";
-"linkDevice.hudMessage" = "正在驗證";
+"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.";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -531,42 +552,42 @@
 "accessibility.conversationRowUnreadCount" = "%@ unread messages.";
 "accessibility.conversationRowBlocked" = "Conversation blocked";
 "accessibility.conversationRowSyncing" = "Synchronization in progress";
-"accessibility.conversationRowLastMessage" = "Last message on %@";
+"accessibility.conversationRowLastMessage" = "Last message at %@";
 "accessibility.userPresenceOnline" = "線上";
 "accessibility.userPresenceAvailable" = "可获得的";
-"accessibility.pendingRequestsRow" = "Invitation received: %@ pending invitation";
+"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowSingular" = "Invitation received: %@ pending invitation";
 "accessibility.pendingRequestsRowHint" = "Double-tap to review and reply to invitations you received";
 "accessibility.pendingRequestsListBlockUser" = "Block invitation sender";
-"accessibility.pendingRequestsListRejectInvitation" = "Decline invitation";
+"accessibility.pendingRequestsListRejectInvitation" = "拒绝邀请";
 "accessibility.pendingRequestsListAcceptInvitation" = "Accept invitation";
 "accessibility.messageBubbleDeleted" = "Message deleted";
 "accessibility.messageBubbleEdited" = "已编辑";
 "accessibility.messageBubbleRead" = "Read";
 "accessibility.messageBubbleUnread" = "Unread";
-"accessibility.textNotAvailable" = "Text message received on %@, content not available";
+"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
 "accessibility.fileTransferNoName" = "File received on %@, name not available";
 "accessibility.inReply" = "In reply to message";
-"accessibility.text.receivedOn" = "%@, message received on %@";
-"accessibility.text.sentOn" = "%@, message sent on %@";
-"accessibility.fileTransfer.receivedOn" = "File: %@ , received on %@";
-"accessibility.fileTransfer.sentOn" = "File: %@, sent on %@";
-"accessibility.call.lasted" = "Lasted";
-"accessibility.fileTransferNoName" = "File received on %@, name not available";
-"accessibility.calls.default.toggleAudio" = "Turn off microphone";
-"accessibility.calls.default.toggleVideo" = "Turn on camera";
-"accessibility.calls.default.pauseCall" = "Pause call";
-"accessibility.calls.default.hangUpCall" = "Hang up";
+"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" = "关闭麦克风";
+"accessibility.calls.default.toggleVideo" = "启动摄像头";
+"accessibility.calls.default.pauseCall" = "暂停通话";
+"accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
 "accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
-"accessibility.calls.default.openConversation" = "Open conversation";
+"accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";
 
-"accessibility.calls.alter.toggleAudio" = "Turn on microphone";
-"accessibility.calls.alter.toggleVideo" = "Turn off camera";
+"accessibility.calls.alter.toggleAudio" = "麦克风静音";
+"accessibility.calls.alter.toggleVideo" = "关闭摄像头";
 "accessibility.calls.alter.pauseCall" = "恢复通话";
-"accessibility.calls.alter.hangUpCall" = "Hang up";
+"accessibility.calls.alter.hangUpCall" = "挂断";
 "accessibility.calls.alter.addParticipant" = "添加参与者";
 "accessibility.calls.alter.switchCamera" = "Switch camera";
 "accessibility.calls.alter.toggleSpeaker" = "Turn off speaker";
@@ -574,10 +595,12 @@
 "accessibility.calls.alter.showDialpad" = "Show dialpad";
 "accessibility.calls.alter.raiseHand" = "放下手";
 "accessibility.conference.minimize" = "最小化";
-"accessibility.conference.maximize" = "Maximize";
-"accessibility.conference.setModerator" = "Set moderator";
-"accessibility.conference.unsetModerator" = "Unset moderator";
+"accessibility.conference.maximize" = "最大化";
+"accessibility.conference.setModerator" = "設定主持人";
+"accessibility.conference.unsetModerator" = "取消設定主持人";
 "accessibility.conference.muteAudio" = "静音";
 "accessibility.conference.unmuteAudio" = "取消静音";
-"accessibility.conference.hangup" = "Hang up";
+"accessibility.conference.hangup" = "挂断";
 "accessibility.conference.lowerHand" = "放下手";
+
+"accessibility.account.tokenQRcode" = "Token QR code";
-- 
GitLab