diff --git a/Ring/Ring/Resources/cmn.lproj/Localizable.strings b/Ring/Ring/Resources/cmn.lproj/Localizable.strings
index f41b7f29b632e6bed3ecd8e85d2603aa1a6f0447..f7724065f2f32b87dcb1877532f7253fe9217767 100644
--- a/Ring/Ring/Resources/cmn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cmn.lproj/Localizable.strings
@@ -183,7 +183,7 @@
 "createAccount.UsernameNotRegisteredTitle" = "网络错误";
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
-"createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
+"createAccount.timeoutMessage" = "用户名正在注册中。请稍候...";
 "createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以便他人在 Jami 上找到并联系您。";
@@ -195,10 +195,10 @@
 "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.importAccount" = "Import account";
+"linkToAccount.importAccount" = "导入帐户";
 "linkToAccount.showQrCode" = "二维码";
 "linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
+"linkToAccount.actionRequired" = "需要如下操作。\n请确认源设备上的帐户。";
 "linkToAccount.allSet" = "Account imported successfully.";
 "linkToAccount.goToAccounts" = "Go to imported account";
 "linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
@@ -208,8 +208,8 @@
 "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.";
+"linkToAccount.alertTile" = "要退出吗?";
+"linkToAccount.alertMessage" = "退出将取消导入账户操作。";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -242,7 +242,7 @@
 "alerts.confirmBlockContact" = "Do you want to block this contact? The conversation history with this contact will also be deleted permanently.";
 "alerts.confirmDeleteConversation" = "Do you want to delete this conversation permanently?";
 "alerts.confirmDeleteConversationFromContact" = "Do you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete conversation";
+"alerts.confirmDeleteConversationTitle" = "删除对话";
 "alerts.noMediaPermissionsTitle" = "未授予媒体权限";
 "alerts.noLibraryPermissionsTitle" = "未授予照片库访问权限";
 "alerts.noLocationPermissionsTitle" = "未授予访问位置权限";
@@ -427,20 +427,20 @@
 "linkDevice.title" = "关联新设备";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
 "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.errorNetwork" = "网络错误。\n请验证您的连接。";
+"linkDevice.errorTimeout" = "操作超时。\n请重试。";
 "linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
 "linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
 "linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
+"linkDevice.connecting" = "连接到新设备...";
 "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.newDeviceIP" = "新设备 IP 地址:%1@";
 "linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.completed" = "账户已成功导入新设备。";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -578,7 +578,7 @@
 "accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
+"accessibility.calls.default.toggleSpeaker" = "打开扬声器";
 "accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";
diff --git a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
index efedfbc75dbe282a93d9cd152d34b58d7791d90a..922f4ba3bc0f8bab2aeccf0f5840a5ad3fb535d5 100644
--- a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
@@ -429,15 +429,15 @@
 "linkDevice.errorWrongPassword" = "Es ist ein Authentifizierungsfehler aufgetreten.\nBitte bestätigen Sie Ihr Passwort.";
 "linkDevice.errorNetwork" = "Es ist ein Netzwerkfehler aufgetreten.\nBitte überprüfen Sie Ihre Verbindung.";
 "linkDevice.errorTimeout" = "Der Vorgang ist abgelaufen.\nBitte versuchen Sie es erneut.";
-"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorCode" = "Beim Generieren des Codes ist ein Fehler aufgetreten.\nBitte versuchen Sie es erneut.";
 "linkDevice.errorWrongData" = "Beim Exportieren des Kontos ist ein Fehler aufgetreten.n\nBitte versuchen Sie es erneut.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.initialInfo" = "Richten Sie auf dem neuen Gerät ein neues Konto ein.\nWählen Sie „Konto hinzufügen“ > „Von einem anderen Gerät verbinden“.";
 "linkDevice.infoQRCode" = "Wenn Sie bereit sind, scannen Sie den QR-Code.";
 "linkDevice.infoCode" = "Wenn Sie bereit sind, geben Sie den Code ein und drücken Sie „Verbinden“.";
 "linkDevice.connecting" = "Verbindung zu Ihrem neuen Gerät wird hergestellt …";
 "linkDevice.authenticationInfo" = "Neues Gerät unter der unten stehenden IP-Adresse gefunden. Sind Sie das?\nUm mit der Übertragung des Kontos fortzufahren, klicken Sie auf „Bestätigen“.";
 "linkDevice.newDeviceIP" = "Neue Geräte-IP-Adresse: %1@";
-"linkDevice.code" = "code";
+"linkDevice.code" = "Code";
 "linkDevice.wrongEntry" = "Der neue Geräte-Identifikator wird nicht erkannt.\nBitte folgen Sie den obigen Anweisungen.";
 "linkDevice.exportInProgress" = "Der Exportvorgang des Kontos auf das neue Gerät ist im Gange.\nBitte bestätigen Sie den Import auf dem neuen Gerät.";
 "linkDevice.completed" = "Konto erfolgreich auf das neue Gerät importiert.";
diff --git a/Ring/Ring/Resources/de.lproj/Localizable.strings b/Ring/Ring/Resources/de.lproj/Localizable.strings
index 3f1abc8b3fd0c0135a9639a40dc723cedd11ae22..954f577575a1fbbd84c99ae270bab103018cb17c 100644
--- a/Ring/Ring/Resources/de.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de.lproj/Localizable.strings
@@ -429,15 +429,15 @@
 "linkDevice.errorWrongPassword" = "Es ist ein Authentifizierungsfehler aufgetreten.\nBitte bestätigen Sie Ihr Passwort.";
 "linkDevice.errorNetwork" = "Es ist ein Netzwerkfehler aufgetreten.\nBitte überprüfen Sie Ihre Verbindung.";
 "linkDevice.errorTimeout" = "Der Vorgang ist abgelaufen.\nBitte versuchen Sie es erneut.";
-"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorCode" = "Beim Generieren des Codes ist ein Fehler aufgetreten.\nBitte versuchen Sie es erneut.";
 "linkDevice.errorWrongData" = "Beim Exportieren des Kontos ist ein Fehler aufgetreten.n\nBitte versuchen Sie es erneut.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.initialInfo" = "Richten Sie auf dem neuen Gerät ein neues Konto ein.\nWählen Sie „Konto hinzufügen“ > „Von einem anderen Gerät verbinden“.";
 "linkDevice.infoQRCode" = "Wenn Sie bereit sind, scannen Sie den QR-Code.";
 "linkDevice.infoCode" = "Wenn Sie bereit sind, geben Sie den Code ein und drücken Sie „Verbinden“.";
 "linkDevice.connecting" = "Verbindung zu Ihrem neuen Gerät wird hergestellt …";
 "linkDevice.authenticationInfo" = "Neues Gerät unter der unten stehenden IP-Adresse gefunden. Sind Sie das?\nUm mit der Übertragung des Kontos fortzufahren, klicken Sie auf „Bestätigen“.";
 "linkDevice.newDeviceIP" = "Neue Geräte-IP-Adresse: %1@";
-"linkDevice.code" = "code";
+"linkDevice.code" = "Code";
 "linkDevice.wrongEntry" = "Der neue Geräte-Identifikator wird nicht erkannt.\nBitte folgen Sie den obigen Anweisungen.";
 "linkDevice.exportInProgress" = "Der Exportvorgang des Kontos auf das neue Gerät ist im Gange.\nBitte bestätigen Sie den Import auf dem neuen Gerät.";
 "linkDevice.completed" = "Konto erfolgreich auf das neue Gerät importiert.";
diff --git a/Ring/Ring/Resources/es.lproj/Localizable.strings b/Ring/Ring/Resources/es.lproj/Localizable.strings
index 98183c58812c1a9cc6811e3bbddfbb6d0dedcf2c..d352a9a7737df87f24c4de5292637e916ae64482 100644
--- a/Ring/Ring/Resources/es.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es.lproj/Localizable.strings
@@ -429,15 +429,15 @@
 "linkDevice.errorWrongPassword" = "Se produjo un error de autenticación.\nPor favor, verifique la contraseña.";
 "linkDevice.errorNetwork" = "Se produjo un error de red.\nVerifique la conexión.";
 "linkDevice.errorTimeout" = "Se agotó el tiempo de espera de la operación.\nPor favor, inténtelo de nuevo.";
-"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorCode" = "Se produjo un error al generar el código.\nPor favor, inténtelo de nuevo.";
 "linkDevice.errorWrongData" = "Se produjo un error al exportar la cuenta.número\nPor favor, inténtelo de nuevo.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.initialInfo" = "En el nuevo dispositivo, inicie una nueva cuenta.\nSeleccione Agregar cuenta > Conectarse desde otro dispositivo.";
 "linkDevice.infoQRCode" = "Cuando esté listo, escanee el código QR.";
 "linkDevice.infoCode" = "Cuando esté listo, ingrese el código y presione ' Conectar`.";
 "linkDevice.connecting" = "Conexión a su nuevo dispositivo...";
 "linkDevice.authenticationInfo" = "Nuevo dispositivo encontrado en la dirección IP. ¿Eres tú?\nPara continuar transfiriendo la cuenta, clic en`Confirmar'.";
 "linkDevice.newDeviceIP" = "Nueva dirección IP del dispositivo: %1@";
-"linkDevice.code" = "code";
+"linkDevice.code" = "código";
 "linkDevice.wrongEntry" = "El nuevo identificador de dispositivo no se reconoce.\nPor favor, siga las instrucciones anteriores.";
 "linkDevice.exportInProgress" = "La operación de exportación de la cuenta al nuevo dispositivo está en curso.\nConfirmar la importación en el nuevo dispositivo.";
 "linkDevice.completed" = "Cuenta importada correctamente en el nuevo dispositivo.";
diff --git a/Ring/Ring/Resources/es_419.lproj/Localizable.strings b/Ring/Ring/Resources/es_419.lproj/Localizable.strings
index 6acafcc8c2ff0cffa9c2a501d4df8308ce24218f..936c69096ea6b6eb96b218c76479181594b196dd 100644
--- a/Ring/Ring/Resources/es_419.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_419.lproj/Localizable.strings
@@ -429,15 +429,15 @@
 "linkDevice.errorWrongPassword" = "Se produjo un error de autenticación.\nPor favor, verifique la contraseña.";
 "linkDevice.errorNetwork" = "Se produjo un error de red.\nVerifique la conexión.";
 "linkDevice.errorTimeout" = "Se agotó el tiempo de espera de la operación.\nPor favor, inténtelo de nuevo.";
-"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorCode" = "Se produjo un error al generar el código.\nPor favor, inténtelo de nuevo.";
 "linkDevice.errorWrongData" = "Se produjo un error al exportar la cuenta.número\nPor favor, inténtelo de nuevo.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.initialInfo" = "En el nuevo dispositivo, inicie una nueva cuenta.\nSeleccione Agregar cuenta > Conectarse desde otro dispositivo.";
 "linkDevice.infoQRCode" = "Cuando esté listo, escanee el código QR.";
 "linkDevice.infoCode" = "Cuando esté listo, ingrese el código y presione ' Conectar`.";
 "linkDevice.connecting" = "Conexión a su nuevo dispositivo...";
 "linkDevice.authenticationInfo" = "Nuevo dispositivo encontrado en la dirección IP. ¿Eres tú?\nPara continuar transfiriendo la cuenta, clic en`Confirmar'.";
 "linkDevice.newDeviceIP" = "Nueva dirección IP del dispositivo: %1@";
-"linkDevice.code" = "code";
+"linkDevice.code" = "código";
 "linkDevice.wrongEntry" = "El nuevo identificador de dispositivo no se reconoce.\nPor favor, siga las instrucciones anteriores.";
 "linkDevice.exportInProgress" = "La operación de exportación de la cuenta al nuevo dispositivo está en curso.\nConfirmar la importación en el nuevo dispositivo.";
 "linkDevice.completed" = "Cuenta importada correctamente en el nuevo dispositivo.";
diff --git a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
index 2bb3a2501fec5b5cd3a849284e459da656a9f115..c56547df86f140fe601ebe39fd123ddbace88a6a 100644
--- a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
@@ -429,15 +429,15 @@
 "linkDevice.errorWrongPassword" = "Se produjo un error de autenticación.\nPor favor, verifique la contraseña.";
 "linkDevice.errorNetwork" = "Se produjo un error de red.\nVerifique la conexión.";
 "linkDevice.errorTimeout" = "Se agotó el tiempo de espera de la operación.\nPor favor, inténtelo de nuevo.";
-"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorCode" = "Se produjo un error al generar el código.\nPor favor, inténtelo de nuevo.";
 "linkDevice.errorWrongData" = "Se produjo un error al exportar la cuenta.número\nPor favor, inténtelo de nuevo.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.initialInfo" = "En el nuevo dispositivo, inicie una nueva cuenta.\nSeleccione Agregar cuenta > Conectarse desde otro dispositivo.";
 "linkDevice.infoQRCode" = "Cuando esté listo, escanee el código QR.";
 "linkDevice.infoCode" = "Cuando esté listo, ingrese el código y presione ' Conectar`.";
 "linkDevice.connecting" = "Conexión a su nuevo dispositivo...";
 "linkDevice.authenticationInfo" = "Nuevo dispositivo encontrado en la dirección IP. ¿Eres tú?\nPara continuar transfiriendo la cuenta, clic en`Confirmar'.";
 "linkDevice.newDeviceIP" = "Nueva dirección IP del dispositivo: %1@";
-"linkDevice.code" = "code";
+"linkDevice.code" = "código";
 "linkDevice.wrongEntry" = "El nuevo identificador de dispositivo no se reconoce.\nPor favor, siga las instrucciones anteriores.";
 "linkDevice.exportInProgress" = "La operación de exportación de la cuenta al nuevo dispositivo está en curso.\nConfirmar la importación en el nuevo dispositivo.";
 "linkDevice.completed" = "Cuenta importada correctamente en el nuevo dispositivo.";
diff --git a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
index aa02c6c4999929dbab3a42871b49472ed1e8aaae..9dc12883a7c4643a90a25da4e2f55e2a5e7bad24 100644
--- a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
@@ -429,15 +429,15 @@
 "linkDevice.errorWrongPassword" = "Se produjo un error de autenticación.\nPor favor, verifique la contraseña.";
 "linkDevice.errorNetwork" = "Se produjo un error de red.\nVerifique la conexión.";
 "linkDevice.errorTimeout" = "Se agotó el tiempo de espera de la operación.\nPor favor, inténtelo de nuevo.";
-"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorCode" = "Se produjo un error al generar el código.\nPor favor, inténtelo de nuevo.";
 "linkDevice.errorWrongData" = "Se produjo un error al exportar la cuenta.número\nPor favor, inténtelo de nuevo.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.initialInfo" = "En el nuevo dispositivo, inicie una nueva cuenta.\nSeleccione Agregar cuenta > Conectarse desde otro dispositivo.";
 "linkDevice.infoQRCode" = "Cuando esté listo, escanee el código QR.";
 "linkDevice.infoCode" = "Cuando esté listo, ingrese el código y presione ' Conectar`.";
 "linkDevice.connecting" = "Conexión a su nuevo dispositivo...";
 "linkDevice.authenticationInfo" = "Nuevo dispositivo encontrado en la dirección IP. ¿Eres tú?\nPara continuar transfiriendo la cuenta, clic en`Confirmar'.";
 "linkDevice.newDeviceIP" = "Nueva dirección IP del dispositivo: %1@";
-"linkDevice.code" = "code";
+"linkDevice.code" = "código";
 "linkDevice.wrongEntry" = "El nuevo identificador de dispositivo no se reconoce.\nPor favor, siga las instrucciones anteriores.";
 "linkDevice.exportInProgress" = "La operación de exportación de la cuenta al nuevo dispositivo está en curso.\nConfirmar la importación en el nuevo dispositivo.";
 "linkDevice.completed" = "Cuenta importada correctamente en el nuevo dispositivo.";
diff --git a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
index 66f96991ce90ff8f3f9d7f4b56aa13a2db4c3235..434e410f858ad19507e8b4f27371bfe814182e17 100644
--- a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
@@ -429,15 +429,15 @@
 "linkDevice.errorWrongPassword" = "Se produjo un error de autenticación.\nPor favor, verifique la contraseña.";
 "linkDevice.errorNetwork" = "Se produjo un error de red.\nVerifique la conexión.";
 "linkDevice.errorTimeout" = "Se agotó el tiempo de espera de la operación.\nPor favor, inténtelo de nuevo.";
-"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorCode" = "Se produjo un error al generar el código.\nPor favor, inténtelo de nuevo.";
 "linkDevice.errorWrongData" = "Se produjo un error al exportar la cuenta.número\nPor favor, inténtelo de nuevo.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.initialInfo" = "En el nuevo dispositivo, inicie una nueva cuenta.\nSeleccione Agregar cuenta > Conectarse desde otro dispositivo.";
 "linkDevice.infoQRCode" = "Cuando esté listo, escanee el código QR.";
 "linkDevice.infoCode" = "Cuando esté listo, ingrese el código y presione ' Conectar`.";
 "linkDevice.connecting" = "Conexión a su nuevo dispositivo...";
 "linkDevice.authenticationInfo" = "Nuevo dispositivo encontrado en la dirección IP. ¿Eres tú?\nPara continuar transfiriendo la cuenta, clic en`Confirmar'.";
 "linkDevice.newDeviceIP" = "Nueva dirección IP del dispositivo: %1@";
-"linkDevice.code" = "code";
+"linkDevice.code" = "código";
 "linkDevice.wrongEntry" = "El nuevo identificador de dispositivo no se reconoce.\nPor favor, siga las instrucciones anteriores.";
 "linkDevice.exportInProgress" = "La operación de exportación de la cuenta al nuevo dispositivo está en curso.\nConfirmar la importación en el nuevo dispositivo.";
 "linkDevice.completed" = "Cuenta importada correctamente en el nuevo dispositivo.";
diff --git a/Ring/Ring/Resources/et.lproj/Localizable.strings b/Ring/Ring/Resources/et.lproj/Localizable.strings
index b6f2d68372a235268c3d59c41f221f3a4bdbf298..94c4d05e84645db922cd3187dea154c762ae5079 100644
--- a/Ring/Ring/Resources/et.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/et.lproj/Localizable.strings
@@ -429,15 +429,15 @@
 "linkDevice.errorWrongPassword" = "Autentimisel tekkis viga.\nPalun kontrolli et salasõna on õige ja proovi uuesti.";
 "linkDevice.errorNetwork" = "Tekkis võrguühenduse viga.\nPalun kontrolli, et võrguühendus toimib.";
 "linkDevice.errorTimeout" = "Tegevus aegus.\nPalun proovi uuesti.";
-"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorCode" = "Koodi loomisel tekkis viga.\nPalun proovi uuesti.";
 "linkDevice.errorWrongData" = "Kasutajakonto eksportimisel tekkis viga.\nPalun proovi uuesti.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.initialInfo" = "Uues seadmes käivita uue kasutajakonto lisamine.\nVali „Lisa kasutajakonto“ -> „Loo ühendus muust seadmest“.";
 "linkDevice.infoQRCode" = "Kui oled valmis, siis skaneeri QR-koodi";
 "linkDevice.infoCode" = "Kui oled valmis, siis sisesta kood ja vajuta „Kinnita“.";
 "linkDevice.connecting" = "Loome ühendust sinu uue seadmega…";
 "linkDevice.authenticationInfo" = "Leidsime uue seadme allpooltoodud aadressil. Kas see oled sina?\nKui klõpsid „Kinnita“, siis jätkame kasutajakonto teisaldamisega.";
 "linkDevice.newDeviceIP" = "Uue seadme ip-aadress: %1@";
-"linkDevice.code" = "code";
+"linkDevice.code" = "kood";
 "linkDevice.wrongEntry" = "Uue seadme tunnus pole tuvastatav.\nPalun järgi eelpooltoodud juhendit.";
 "linkDevice.exportInProgress" = "Kasutajakonto eksportimine uude seadmesse on pooleli.\nJätkamiseks palun kinnita importimine uues seadmes.";
 "linkDevice.completed" = "Kasutajakonto importimine sellesse seadmesse õnnestus. ";
diff --git a/Ring/Ring/Resources/hak.lproj/Localizable.strings b/Ring/Ring/Resources/hak.lproj/Localizable.strings
index f41b7f29b632e6bed3ecd8e85d2603aa1a6f0447..f7724065f2f32b87dcb1877532f7253fe9217767 100644
--- a/Ring/Ring/Resources/hak.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hak.lproj/Localizable.strings
@@ -183,7 +183,7 @@
 "createAccount.UsernameNotRegisteredTitle" = "网络错误";
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
-"createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
+"createAccount.timeoutMessage" = "用户名正在注册中。请稍候...";
 "createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以便他人在 Jami 上找到并联系您。";
@@ -195,10 +195,10 @@
 "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.importAccount" = "Import account";
+"linkToAccount.importAccount" = "导入帐户";
 "linkToAccount.showQrCode" = "二维码";
 "linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
+"linkToAccount.actionRequired" = "需要如下操作。\n请确认源设备上的帐户。";
 "linkToAccount.allSet" = "Account imported successfully.";
 "linkToAccount.goToAccounts" = "Go to imported account";
 "linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
@@ -208,8 +208,8 @@
 "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.";
+"linkToAccount.alertTile" = "要退出吗?";
+"linkToAccount.alertMessage" = "退出将取消导入账户操作。";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -242,7 +242,7 @@
 "alerts.confirmBlockContact" = "Do you want to block this contact? The conversation history with this contact will also be deleted permanently.";
 "alerts.confirmDeleteConversation" = "Do you want to delete this conversation permanently?";
 "alerts.confirmDeleteConversationFromContact" = "Do you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete conversation";
+"alerts.confirmDeleteConversationTitle" = "删除对话";
 "alerts.noMediaPermissionsTitle" = "未授予媒体权限";
 "alerts.noLibraryPermissionsTitle" = "未授予照片库访问权限";
 "alerts.noLocationPermissionsTitle" = "未授予访问位置权限";
@@ -427,20 +427,20 @@
 "linkDevice.title" = "关联新设备";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
 "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.errorNetwork" = "网络错误。\n请验证您的连接。";
+"linkDevice.errorTimeout" = "操作超时。\n请重试。";
 "linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
 "linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
 "linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
+"linkDevice.connecting" = "连接到新设备...";
 "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.newDeviceIP" = "新设备 IP 地址:%1@";
 "linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.completed" = "账户已成功导入新设备。";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -578,7 +578,7 @@
 "accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
+"accessibility.calls.default.toggleSpeaker" = "打开扬声器";
 "accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";
diff --git a/Ring/Ring/Resources/nan.lproj/Localizable.strings b/Ring/Ring/Resources/nan.lproj/Localizable.strings
index 7b49de97e179b8b222455c22619b148b8b0e4d0e..b4f944fa4f55051049a8914e03a751df875ec9e1 100644
--- a/Ring/Ring/Resources/nan.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nan.lproj/Localizable.strings
@@ -183,7 +183,7 @@
 "createAccount.UsernameNotRegisteredTitle" = "Network error";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
-"createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
+"createAccount.timeoutMessage" = "用户名正在注册中。请稍候...";
 "createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以便他人在 Jami 上找到并联系您。";
@@ -195,10 +195,10 @@
 "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.importAccount" = "Import account";
+"linkToAccount.importAccount" = "导入帐户";
 "linkToAccount.showQrCode" = "二维码";
 "linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
+"linkToAccount.actionRequired" = "需要如下操作。\n请确认源设备上的帐户。";
 "linkToAccount.allSet" = "Account imported successfully.";
 "linkToAccount.goToAccounts" = "Go to imported account";
 "linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
@@ -208,8 +208,8 @@
 "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.";
+"linkToAccount.alertTile" = "要退出吗?";
+"linkToAccount.alertMessage" = "退出将取消导入账户操作。";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -242,7 +242,7 @@
 "alerts.confirmBlockContact" = "Do you want to block this contact? The conversation history with this contact will also be deleted permanently.";
 "alerts.confirmDeleteConversation" = "Do you want to delete this conversation permanently?";
 "alerts.confirmDeleteConversationFromContact" = "Do you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete conversation";
+"alerts.confirmDeleteConversationTitle" = "删除对话";
 "alerts.noMediaPermissionsTitle" = "Media permission not granted";
 "alerts.noLibraryPermissionsTitle" = "Access to photo library not granted";
 "alerts.noLocationPermissionsTitle" = "Access to location not granted";
@@ -427,20 +427,20 @@
 "linkDevice.title" = "关联新设备";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
 "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.errorNetwork" = "网络错误。\n请验证您的连接。";
+"linkDevice.errorTimeout" = "操作超时。\n请重试。";
 "linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
 "linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
 "linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
+"linkDevice.connecting" = "连接到新设备...";
 "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.newDeviceIP" = "新设备 IP 地址:%1@";
 "linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.completed" = "账户已成功导入新设备。";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -578,7 +578,7 @@
 "accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
+"accessibility.calls.default.toggleSpeaker" = "打开扬声器";
 "accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";
diff --git a/Ring/Ring/Resources/ro.lproj/Localizable.strings b/Ring/Ring/Resources/ro.lproj/Localizable.strings
index fd96c453be0bca656dd59806752c2e189fc10654..b166c63560b20990bf786f9c24b684b873cd39c4 100644
--- a/Ring/Ring/Resources/ro.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro.lproj/Localizable.strings
@@ -197,19 +197,19 @@
 // Link To Account form
 "linkToAccount.importAccount" = "Importă contul";
 "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.showPinCode" = "Cod de autentificare";
+"linkToAccount.actionRequired" = "Acțiune necesară.\nConfirmă contul pe aparatul sursă.";
+"linkToAccount.allSet" = "Cont importat cu succes.";
+"linkToAccount.goToAccounts" = "La contul importat";
+"linkToAccount.exportInstructions" = "Începe exportarea de la aparatul sursă.";
+"linkToAccount.exportInstructionsPath" = "Reglările contului > Asociază un nou aparat.";
+"linkToAccount.scanQrCode" = "Apoi, scanează codul QR";
+"linkToAccount.enterProvidedCode" = "Apoi, introdu codul de autentificare.";
+"linkToAccount.accountLockedWithPassword" = "Contul este protejat cu o parolă.\nIntrodu parola, pentru a continua.";
 "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.";
+"linkToAccount.shareMessage" = "Codul tău este: %@";
+"linkToAccount.alertTile" = "Vrei să oprești?";
+"linkToAccount.alertMessage" = "Oprirea va anula importarea contului.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importă contul Jami din fișierul arhivei.";
@@ -426,21 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Asociază un nou aparat";
 "linkDevice.networkError" = "A apărut o eroare de rețea în timpul exportării contului.";
-"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.errorCode" = "An error occurred while generating the code.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
-"linkDevice.infoQRCode" = "When ready, scan the QR code.";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.code" = "code";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "A apărut o eroare de autentificare.\nVerifică parola.";
+"linkDevice.errorNetwork" = "A apărut o eroare de rețea.\nVerifică conectarea.";
+"linkDevice.errorTimeout" = "Timpul operațiunii a expirat.\nÎncearcă din nou.";
+"linkDevice.errorCode" = "A apărut o eroare în timpul generării codului.\nÎncearcă din nou.";
+"linkDevice.errorWrongData" = "A apărut o eroare în timpul exportării contului.\nÎncearcă din nou.";
+"linkDevice.initialInfo" = "În noul aparat, creează un cont nou.\nAlege Adaugă un cont > Conectează-te de la alt aparat.";
+"linkDevice.infoQRCode" = "Apoi, scanează codul QR";
+"linkDevice.infoCode" = "Apoi, introdu codul și apasă Conectează.";
+"linkDevice.connecting" = "Se conectează la noul aparat…";
+"linkDevice.authenticationInfo" = "Un nou aparat a fost găsit la adresa IP de mai jos. Tu ești?\nPentru a continua transferul contului, apasă „Confirmă”.";
+"linkDevice.newDeviceIP" = "Adresa IP a noului aparat: %1@";
+"linkDevice.code" = "cod";
+"linkDevice.wrongEntry" = "Noul identificator al aparatului nu este recunoscut.\nUrmează instrucțiunile de mai sus.";
+"linkDevice.exportInProgress" = "Exportarea contului către noul aparat este în curs.\nConfirmă importarea în noul aparat";
+"linkDevice.completed" = "Contul a fost importat cu succes în noul aparat.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Începe un apel vocal";
@@ -551,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ mesaje necitite.";
 "accessibility.conversationRowBlocked" = "Conversație blocată";
 "accessibility.conversationRowSyncing" = "Sincronizare în curs";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Ultimul mesaj la %@";
 "accessibility.userPresenceOnline" = "Conectat";
 "accessibility.userPresenceAvailable" = "Disponibil";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitații primite: %@ invitații în așteptare";
 "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";
@@ -564,14 +564,14 @@
 "accessibility.messageBubbleEdited" = "Modificat";
 "accessibility.messageBubbleRead" = "Citit";
 "accessibility.messageBubbleUnread" = "Necitit";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Mesaj text gol primit pe %@. Este posibil ca acesta să nu fi fost trimis corect..";
 "accessibility.fileTransferNoName" = "Fișier primit pe %@, numele nu este disponibil";
 "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.text.receivedOn" = "%1@, mesaj primit pe %2@";
+"accessibility.text.sentOn" = "%1@, mesaj trimis pe %2@";
+"accessibility.fileTransfer.receivedOn" = "Fișier: %1@ , primit pe %2@";
+"accessibility.fileTransfer.sentOn" = "Fișier: %1@, trimis pe %2@";
+"accessibility.call.lasted" = "Durata %@";
 "accessibility.calls.default.toggleAudio" = "Oprește microfonul";
 "accessibility.calls.default.toggleVideo" = "Pornește camera";
 "accessibility.calls.default.pauseCall" = "Pauză apel";
@@ -602,4 +602,4 @@
 "accessibility.conference.hangup" = "Închide";
 "accessibility.conference.lowerHand" = "Coboară mîna";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Codul QR";
diff --git a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
index 9999befd9fc3313c66e77466b68604fd03b051ac..1cd616ea4874b563b372ab520cd48a8c1f7720be 100644
--- a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
@@ -197,19 +197,19 @@
 // Link To Account form
 "linkToAccount.importAccount" = "Importă contul";
 "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.showPinCode" = "Cod de autentificare";
+"linkToAccount.actionRequired" = "Acțiune necesară.\nConfirmă contul pe aparatul sursă.";
+"linkToAccount.allSet" = "Cont importat cu succes.";
+"linkToAccount.goToAccounts" = "La contul importat";
+"linkToAccount.exportInstructions" = "Începe exportarea de la aparatul sursă.";
+"linkToAccount.exportInstructionsPath" = "Reglările contului > Asociază un nou aparat.";
+"linkToAccount.scanQrCode" = "Apoi, scanează codul QR";
+"linkToAccount.enterProvidedCode" = "Apoi, introdu codul de autentificare.";
+"linkToAccount.accountLockedWithPassword" = "Contul este protejat cu o parolă.\nIntrodu parola, pentru a continua.";
 "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.";
+"linkToAccount.shareMessage" = "Codul tău este: %@";
+"linkToAccount.alertTile" = "Vrei să oprești?";
+"linkToAccount.alertMessage" = "Oprirea va anula importarea contului.";
 
 // Import from Archive
 "importFromArchive.explanation" = "Importă contul Jami din fișierul arhivei.";
@@ -426,21 +426,21 @@
 // Link New Device
 "linkDevice.title" = "Asociază un nou aparat";
 "linkDevice.networkError" = "A apărut o eroare de rețea în timpul exportării contului.";
-"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.errorCode" = "An error occurred while generating the code.\nPlease try again.";
-"linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
-"linkDevice.infoQRCode" = "When ready, scan the QR code.";
-"linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
-"linkDevice.authenticationInfo" = "New device found at IP address below. Is that you?\nTo continue to transfer the account, click `Confirm`.";
-"linkDevice.newDeviceIP" = "New device IP address: %1@";
-"linkDevice.code" = "code";
-"linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
-"linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.errorWrongPassword" = "A apărut o eroare de autentificare.\nVerifică parola.";
+"linkDevice.errorNetwork" = "A apărut o eroare de rețea.\nVerifică conectarea.";
+"linkDevice.errorTimeout" = "Timpul operațiunii a expirat.\nÎncearcă din nou.";
+"linkDevice.errorCode" = "A apărut o eroare în timpul generării codului.\nÎncearcă din nou.";
+"linkDevice.errorWrongData" = "A apărut o eroare în timpul exportării contului.\nÎncearcă din nou.";
+"linkDevice.initialInfo" = "În noul aparat, creează un cont nou.\nAlege Adaugă un cont > Conectează-te de la alt aparat.";
+"linkDevice.infoQRCode" = "Apoi, scanează codul QR";
+"linkDevice.infoCode" = "Apoi, introdu codul și apasă Conectează.";
+"linkDevice.connecting" = "Se conectează la noul aparat…";
+"linkDevice.authenticationInfo" = "Un nou aparat a fost găsit la adresa IP de mai jos. Tu ești?\nPentru a continua transferul contului, apasă „Confirmă”.";
+"linkDevice.newDeviceIP" = "Adresa IP a noului aparat: %1@";
+"linkDevice.code" = "cod";
+"linkDevice.wrongEntry" = "Noul identificator al aparatului nu este recunoscut.\nUrmează instrucțiunile de mai sus.";
+"linkDevice.exportInProgress" = "Exportarea contului către noul aparat este în curs.\nConfirmă importarea în noul aparat";
+"linkDevice.completed" = "Contul a fost importat cu succes în noul aparat.";
 
 // Contact Page
 "contactPage.startAudioCall" = "Începe un apel vocal";
@@ -551,10 +551,10 @@
 "accessibility.conversationRowUnreadCount" = "%@ mesaje necitite.";
 "accessibility.conversationRowBlocked" = "Conversație blocată";
 "accessibility.conversationRowSyncing" = "Sincronizare în curs";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Ultimul mesaj la %@";
 "accessibility.userPresenceOnline" = "Conectat";
 "accessibility.userPresenceAvailable" = "Disponibil";
-"accessibility.pendingRequestsRowPlural" = "Invitations received: %@ pending invitations";
+"accessibility.pendingRequestsRowPlural" = "Invitații primite: %@ invitații în așteptare";
 "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";
@@ -564,14 +564,14 @@
 "accessibility.messageBubbleEdited" = "Modificat";
 "accessibility.messageBubbleRead" = "Citit";
 "accessibility.messageBubbleUnread" = "Necitit";
-"accessibility.textNotAvailable" = "Empty text message received on %@. This might not have been sent correctly.";
+"accessibility.textNotAvailable" = "Mesaj text gol primit pe %@. Este posibil ca acesta să nu fi fost trimis corect..";
 "accessibility.fileTransferNoName" = "Fișier primit pe %@, numele nu este disponibil";
 "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.text.receivedOn" = "%1@, mesaj primit pe %2@";
+"accessibility.text.sentOn" = "%1@, mesaj trimis pe %2@";
+"accessibility.fileTransfer.receivedOn" = "Fișier: %1@ , primit pe %2@";
+"accessibility.fileTransfer.sentOn" = "Fișier: %1@, trimis pe %2@";
+"accessibility.call.lasted" = "Durata %@";
 "accessibility.calls.default.toggleAudio" = "Oprește microfonul";
 "accessibility.calls.default.toggleVideo" = "Pornește camera";
 "accessibility.calls.default.pauseCall" = "Pauză apel";
@@ -602,4 +602,4 @@
 "accessibility.conference.hangup" = "Închide";
 "accessibility.conference.lowerHand" = "Coboară mâna";
 
-"accessibility.account.tokenQRcode" = "Token QR code";
+"accessibility.account.tokenQRcode" = "Codul QR";
diff --git a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
index a457b9e021331ba8765165faad795b107a7382a5..e14f17de94c1fd85df378185d8da814d48df3635 100644
--- a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
@@ -429,15 +429,15 @@
 "linkDevice.errorWrongPassword" = "Произошла ошибка аутентификации.\nПожалуйста, проверьте свой пароль.";
 "linkDevice.errorNetwork" = "Произошла ошибка сети.\nПроверьте подключение.";
 "linkDevice.errorTimeout" = "Время операции истекло.\nПопробуйте еще раз.";
-"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorCode" = "Ошибка при генерации кода.\nПопробуйте еще раз.";
 "linkDevice.errorWrongData" = "Произошла ошибка при экспорте аккаунта.\nПопробуйте снова.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.initialInfo" = "На новом устройстве инициируйте новую учетную запись.\nВыберите Добавить учетную запись > Подключиться с другого устройства.";
 "linkDevice.infoQRCode" = "Когда будете готовы, отсканируйте QR-код.";
 "linkDevice.infoCode" = "Когда будете готовы, введите код и нажмите \"Подключиться\".";
 "linkDevice.connecting" = "Подключение к новому устройству…";
 "linkDevice.authenticationInfo" = "Новое устройство найдено по указанному ниже IP-адресу. Это вы?\nЧтобы продолжить перенос аккаунта, нажмите \"Подтвердить\".";
 "linkDevice.newDeviceIP" = "IP-адрес нового устройства:%1@";
-"linkDevice.code" = "code";
+"linkDevice.code" = "код";
 "linkDevice.wrongEntry" = "Новый идентификатор устройства не распознан.\nСледуйте инструкциям выше.";
 "linkDevice.exportInProgress" = "Выполняется операция экспорта учетной записи на новое устройство.\nПодтвердите импорт на новом устройстве.";
 "linkDevice.completed" = "Учетная запись успешно импортирована на новое устройство.";
diff --git a/Ring/Ring/Resources/ru.lproj/Localizable.strings b/Ring/Ring/Resources/ru.lproj/Localizable.strings
index df0219b60d464965f0c2584703f0b25eb0bba881..8005d15b167888db3cec192773647a747eb37fa6 100644
--- a/Ring/Ring/Resources/ru.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru.lproj/Localizable.strings
@@ -429,15 +429,15 @@
 "linkDevice.errorWrongPassword" = "Произошла ошибка аутентификации.\nПожалуйста, проверьте свой пароль.";
 "linkDevice.errorNetwork" = "Произошла ошибка сети.\nПроверьте подключение.";
 "linkDevice.errorTimeout" = "Время операции истекло.\nПопробуйте еще раз.";
-"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorCode" = "Ошибка при генерации кода.\nПопробуйте еще раз.";
 "linkDevice.errorWrongData" = "Произошла ошибка при экспорте аккаунта.\nПопробуйте снова.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.initialInfo" = "На новом устройстве инициируйте новую учетную запись.\nВыберите Добавить учетную запись > Подключиться с другого устройства.";
 "linkDevice.infoQRCode" = "Когда будете готовы, отсканируйте QR-код.";
 "linkDevice.infoCode" = "Когда будете готовы, введите код и нажмите \"Подключиться\".";
 "linkDevice.connecting" = "Подключение к новому устройству…";
 "linkDevice.authenticationInfo" = "Новое устройство найдено по указанному ниже IP-адресу. Это вы?\nЧтобы продолжить перенос аккаунта, нажмите \"Подтвердить\".";
 "linkDevice.newDeviceIP" = "IP-адрес нового устройства:%1@";
-"linkDevice.code" = "code";
+"linkDevice.code" = "код";
 "linkDevice.wrongEntry" = "Новый идентификатор устройства не распознан.\nСледуйте инструкциям выше.";
 "linkDevice.exportInProgress" = "Выполняется операция экспорта учетной записи на новое устройство.\nПодтвердите импорт на новом устройстве.";
 "linkDevice.completed" = "Учетная запись успешно импортирована на новое устройство.";
diff --git a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
index 72455e68002f306a98a492e77b99852571c4e77e..7cdc6b52aa8f59161bd0fb53f4ed3b68b15cfdbd 100644
--- a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
@@ -429,15 +429,15 @@
 "linkDevice.errorWrongPassword" = "Ndodhi një gabim mirëfilltësimi.\nJu lutemi, verifikoni fjalëkalimin tuaj.";
 "linkDevice.errorNetwork" = "Ndodhi një gabim rrjeti.\nJu lutemi, verifikoni lidhjen tuaj.";
 "linkDevice.errorTimeout" = "Veprimit i mbaroi koha.\nJu lutemi, riprovoni.";
-"linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
+"linkDevice.errorCode" = "Ndodhi një gabim teksa prodhohej kodi.\nJu lutemi, riprovoni.";
 "linkDevice.errorWrongData" = "Ndodhi një gabim teksa eksportohej llogaria.\nJu lutemi, riprovoni.";
-"linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
+"linkDevice.initialInfo" = "Në pajisjen e re, krijoni një llogari të re.\nPërzgjidhni “Shtoni Llogari” -> “Lidhni prej pajisjeje tjetër”.";
 "linkDevice.infoQRCode" = "Kur të jeni gati, skanoni kodin QR.";
 "linkDevice.infoCode" = "Kur të jeni gati, jepni kodin dhe shtypni `Lidhu`.";
 "linkDevice.connecting" = "Po bëhet lidhja te pajisja juaj e re…";
 "linkDevice.authenticationInfo" = "Te adresa IP më poshtë u gjet pajisje e re. A jeni ju?\nQë të vazhdohet shpërngulja e llogarisë, klikoni mbi `Ripohojeni`.";
 "linkDevice.newDeviceIP" = "Adresë IP e pajisjes së re: %1@";
-"linkDevice.code" = "code";
+"linkDevice.code" = "kod";
 "linkDevice.wrongEntry" = "Identifikuesi i pajisjes së re është i papranuar.\nJu lutemi, ndiqni udhëzimin më sipër.";
 "linkDevice.exportInProgress" = "Veprimi i eksportimit të llogarisë te pajisja e re është në kryerje e sipër.\nJu lutemi, ripohoni importimin te pajisja e re.";
 "linkDevice.completed" = "Llogaria u importua me sukses te pajisja e re.";
@@ -551,7 +551,7 @@
 "accessibility.conversationRowUnreadCount" = "%@ mesazhe të palexuar.";
 "accessibility.conversationRowBlocked" = "Biseda u bllokua";
 "accessibility.conversationRowSyncing" = "Njëkohësim në ecuri e sipër";
-"accessibility.conversationRowLastMessage" = "Last message at %@";
+"accessibility.conversationRowLastMessage" = "Mesazhi i fundit më %@";
 "accessibility.userPresenceOnline" = "Në linjë";
 "accessibility.userPresenceAvailable" = "I lirë";
 "accessibility.pendingRequestsRowPlural" = "U morën ftesa: %@ ftesa pezull";
diff --git a/Ring/Ring/Resources/sr.lproj/Localizable.strings b/Ring/Ring/Resources/sr.lproj/Localizable.strings
index ec2493a85843f9bc3723cc77ec57ec585407ceaf..64f17aefb2e96729626f928bc7647158fdca73b0 100644
--- a/Ring/Ring/Resources/sr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr.lproj/Localizable.strings
@@ -88,7 +88,7 @@
 "swarm.blocked" = "Blokiran";
 "swarm.unknown" = "Nepoznat";
 "swarm.inviteMembers" = "Pozovi članove";
-"swarm.confirmLeaveConversation" = "Do you want to leave this conversation?";
+"swarm.confirmLeaveConversation" = "Да ли желите да напустите овај разговор?";
 "swarm.Leave" = "Napusti";
 "swarm.newGroup" = "Kreiraj novu grupu";
 "swarm.namePlaceholder" = "Naziv grupe";
@@ -103,7 +103,7 @@
 "smartlist.results" = "Javni imenik";
 "smartlist.jamsResults" = "Rezultat pretrage";
 "smartlist.conversations" = "Razgovori";
-"smartlist.noConversationsFound" = "No conversations match the search.";
+"smartlist.noConversationsFound" = "Ниједна преписка не одговара претрази.";
 "smartlist.newContact" = "Novi kontakt";
 "smartlist.newGroup" = "Nova grupa";
 "smartlist.accounts" = "Nalozi";
@@ -113,7 +113,7 @@
 "smartlist.searchBarPlaceholder" = "Unesi ime…";
 "smartlist.searchBar" = "Traži";
 "smartlist.noNetworkConnectivity" = "Nema internet konekcije";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.cellularAccess" = "Уверите се да је мобилни приступ одобрен у подешавањима.";
 "smartlist.accountsTitle" = "Nalozi";
 "smartlist.addAccountButton" = "+ Dodaj nalog";
 "smartlist.noNumber" = "Izabrani kontakt nema broj";
@@ -123,25 +123,25 @@
 "smartlist.inviteFriends" = "Pozovi prijatelje";
 "smartlist.accounts" = "Nalozi";
 "smartlist.disableDonation" = "Ne sada";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
+"smartlist.donationExplanation" = "Ако уживате у коришћењу Јами-ја и верујете у нашу мисију, да ли желите да дате донацију?";
 "smartlist.inSynchronization" = "razgovor u sinhronizaciji";
 "smartlist.newMessage" = "Nova poruka";
 
 // Conversation
 "conversation.addToContactsButton" = "Dodaj u kontakte";
 "conversation.addToContactsLabel" = "Dodaj u kontakte?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
+"conversation.notContactLabel" = "%@ није на листи контаката";
 "conversation.messagePlaceholder" = "Pišite";
-"conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
+"conversation.errorSavingImage" = "Дошло је до грешке при чувању слике у галерији.";
 "conversation.receivedRequest" = "Dobili ste pozivnicu za razgovor od %@.";
-"conversation.incomingRequest" = "sent you a conversation invitation.";
-"conversation.requestMessage" = "Hello,\nDo you want to join the conversation?";
+"conversation.incomingRequest" = "послао вам је позивницу за разговор.";
+"conversation.requestMessage" = "Здраво,\nДа ли желите да се придружите разговору?";
 "conversation.sendRequest" = "Pošaljite im pozivnicu da biste mogli razgovarati.";
-"conversation.sendRequestTitle" = "Send conversation invitation";
-"conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
-"conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
+"conversation.sendRequestTitle" = "Пошаљите позивницу за разговор";
+"conversation.synchronizationTitle" = "Прихватили сте позивницу за разговор.";
+"conversation.synchronizationMessage" = "Чека се %@ да се повеже ради синхронизације разговора…";
 "conversation.inReplyTo" = "Odgovor na";
-"conversation.repliedTo" = "%@ replied to %@";
+"conversation.repliedTo" = "%@ одговорио на %@";
 "conversation.yourself" = "Ti";
 "conversation.edited" = "Редактирана";
 "conversation.deletedMessage" = "%@ obrisao poruku";
@@ -150,25 +150,25 @@
 // Invitations
 "invitations.noInvitations" = "Nema pozivnica";
 "invitations.accepted" = "Прихваћен";
-"invitations.declined" = "Declined";
+"invitations.declined" = "Одбијено";
 "invitations.blocked" = "Blokiran";
 "invitations.list" = "Primljene pozivnice";
 
 // Walkthrough
 
 //Welcome Screen
-"welcome.title" = "Share, freely and privately with Jami";
+"welcome.title" = "Делите, слободно и приватно са Јамијем";
 "welcome.text" = "Jami je besplatna i univerzalna komunikaciona platforma koja čuva privatnost i slobode korisnika";
 "welcome.haveAccount" = "Već imam nalog";
 "welcome.linkDevice" = "Uvezite sa drugog uređaja";
 "welcome.linkBackup" = "Uvezi iz rezervne kopije arhive";
 "welcome.createAccount" = "Napravite Jami nalog";
-"welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
+"welcome.connectToJAMS" = "Повежите се са Јами сервером за управљање налогом (JAMS)";
 
 // Creation Profile Screen
 "createProfile.skipCreateProfile" = "Preskoči";
 "createProfile.profileCreated" = "Sledeći";
-"createProfile.title" = "Personalize your profile";
+"createProfile.title" = "Персонализујте свој профил";
 "createProfile.enterNameLabel" = "Unesite ime za prikaz";
 "createProfile.enterNamePlaceholder" = "Unesi ime";
 "createProfile.subtitle" = "Vaš profil će biti deljen sa vašim kontaktima. Možete ga promeniti u bilo kom trenutku.";
@@ -176,15 +176,15 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Pridruži se Jamiju";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.lookingForUsernameAvailability" = "Проверава се доступност корисничког имена…";
+"createAccount.invalidUsername" = "Неважеће корисничко име. Унесите исправно корисничко име.";
 "createAccount.usernameAlreadyTaken" = "Korisničko ime je zauzeto";
-"createAccount.usernameValid" = "The username is available.";
+"createAccount.usernameValid" = "Корисничко име је доступно.";
 "createAccount.UsernameNotRegisteredTitle" = "Greška na mreži";
 "createAccount.UsernameNotRegisteredMessage" = "Nalog je kreiran, ali korisničko ime nije registrovano";
 "createAccount.timeoutTitle" = "Nalog je napravljen";
 "createAccount.timeoutMessage" = "Registracija korisničkog imena je u toku. Molimo sačekajte…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
+"createAccount.sipConfigure" = "Конфигуришите постојећи SIP налог";
 "createAccount.creatingAccount" = "Kreiranje naloga";
 "createAccount.nameExplanation" = "Možete da izaberete korisničko ime da biste pomogli drugima da vas lakše pronađu i dođu do vas na Jami.";
 "createAccount.newAccount" = "Novi nalog";
@@ -195,18 +195,18 @@
 "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.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Увези налог";
 "linkToAccount.showQrCode" = "QR код";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.showPinCode" = "Код за аутентификацију";
+"linkToAccount.actionRequired" = "Потребна радња.\nПотврдите налог на изворном уређају.";
+"linkToAccount.allSet" = "Налог је успешно увезен.";
+"linkToAccount.goToAccounts" = "Идите на увезени налог";
+"linkToAccount.exportInstructions" = "На изворном уређају покрените извоз.";
+"linkToAccount.exportInstructionsPath" = "Изаберите Налог > Подешавања налога > Повежи нови уређај.";
+"linkToAccount.scanQrCode" = "Када будете спремни, скенирајте QR код.";
+"linkToAccount.enterProvidedCode" = "Када будете спремни, унесите код за потврду аутентичности.";
+"linkToAccount.accountLockedWithPassword" = "Налог је заштићен лозинком.\nДа бисте наставили, унесите лозинку налога.";
+"linkToAccount.exit" = "Изађи";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
@@ -214,7 +214,7 @@
 // Import from Archive
 "importFromArchive.explanation" = "Увезив рачуна Џами из локалног архива.";
 "importFromArchive.passwordExplanation" = "Ako je nalog šifrovan lozinkom, popunite sledeće polje.";
-"importFromArchive.title" = "Import from archive";
+"importFromArchive.title" = "Увези из архиве";
 "importFromArchive.buttonTitle" = "Uvoz";
 "importFromArchive.selectArchiveButton" = "Izaberite datoteku arhive";
 
@@ -355,7 +355,7 @@
 "accountPage.manageAccount" = "Upravljajte nalogom";
 "accountPage.encryptAccount" = "Šifrujte nalog lozinkom";
 "accountPage.passwordExplanation" = "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.";
-"accountPage.passwordsDoNotMatch" = "Passwords do not match.";
+"accountPage.passwordsDoNotMatch" = "Лозинке се не поклапају.";
 "accountPage.passwordCreated" = "Lozinka kreirana";
 "accountPage.passwordUpdated" = "Password updated";
 "accountPage.linkedDevices" = "Povezani uređaji";
@@ -432,7 +432,7 @@
 "linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
 "linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
-"linkDevice.infoQRCode" = "When ready, scan the QR code.";
+"linkDevice.infoQRCode" = "Када будете спремни, скенирајте QR код.";
 "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`.";
diff --git a/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings b/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
index e0426279ded523858838f119e923fd9aea22adfd..61c25a632ce1c7cc525bf76b65f8dea730bc3089 100644
--- a/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
@@ -25,12 +25,12 @@
 "global.password" = "Лозинка";
 "global.registerAUsername" = "Региструј корисничко име";
 "global.enterPassword" = "Унеси лозинку";
-"global.enterUsername" = "Unesi korisničko ime";
+"global.enterUsername" = "Унеси корисничко име";
 "global.cancel" = "Откажи";
 "global.blockContact" = "Блокирај контакт";
 "global.removeAccount" = "Уклони налог";
 "global.incomingCall" = "Долазни позив";
-"global.ok" = "U redu";
+"global.ok" = "У реду";
 "global.close" = "Затвори";
 "global.share" = "Подели";
 "global.forward" = "Напред";
@@ -48,17 +48,17 @@
 "global.deleteMessage" = "Избриши поруку";
 "global.deleteFile" = "Избриши датотеку са уређаја";
 "global.editMessage" = "Уреди поруку";
-"global.editing" = "Uređivanje";
+"global.editing" = "Уређивање";
 "global.create" = "Направи";
 "global.edit" = "Редактирање";
-"global.remove" = "Увајање";
+"global.remove" = "Уклони";
 "global.call" = "Позови";
 "global.video" = "Видео";
-"global.time" = "Vreme";
-"global.editPassword" = "Uredi lozinku";
+"global.time" = "Време";
+"global.editPassword" = "Уреди лозинку";
 "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.cameraDisabled" = "Приступ камери је онемогућен. Омогућите га у подешавањима уређаја да бисте користили ову функцију.";
 "global.confirm" = "Потврди";
 "global.connect" = "Повежи се";
 
@@ -66,17 +66,17 @@
 "scan.badQrCode" = "Лош QR код";
 
 // SwarmCreation
-"swarmcreation.searchBar" = "Potražite kontakt…";
-"swarmcreation.addDescription" = "Dodaj opis";
+"swarmcreation.searchBar" = "Потражите контакт…";
+"swarmcreation.addDescription" = "Додајте опис";
 // Swarm
-"swarm.muteConversation" = "Умоли разговор";
+"swarm.muteConversation" = "Утишај разговор";
 "swarm.leaveConversation" = "Оставите разговор";
-"swarm.chooseColor" = "Boja";
-"swarm.typeOfSwarm" = "Vrsta razgovora";
+"swarm.chooseColor" = "Боја";
+"swarm.typeOfSwarm" = "Врста разговора";
 "swarm.identifier" = "Идентификатор";
 "swarm.settings" = "Подешавања";
 "swarm.members" = "Чланови";
-"swarm.addDescription" = "Dodaj opis";
+"swarm.addDescription" = "Додајте опис";
 "swarm.oneToOne" = "Приватно";
 "swarm.adminInvitesOnly" = "Приватна група (ограничени позиви)";
 "swarm.invitesOnly" = "Приватна група";
@@ -85,37 +85,37 @@
 "swarm.member" = "Члан";
 "swarm.invited" = "Позван";
 "swarm.admin" = "Администратор";
-"swarm.blocked" = "Blokiran";
+"swarm.blocked" = "Блокирано";
 "swarm.unknown" = "Непознат";
-"swarm.inviteMembers" = "Pozovite članove";
-"swarm.confirmLeaveConversation" = "Do you want to leave this conversation?";
+"swarm.inviteMembers" = "Позовите чланове";
+"swarm.confirmLeaveConversation" = "Да ли желите да напустите овај разговор?";
 "swarm.Leave" = "Одлази";
-"swarm.newGroup" = "Kreiraj novu grupu";
-"swarm.namePlaceholder" = "Naziv grupe";
-"swarm.explanationText" = "Članovi mogu biti pozvani u bilo koje vreme nakon što je grupa napravljena.";
-"swarm.customizeProfile" = "Prilagodite profil grupe";
-"swarm.changePicture" = "Promeni sliku grupe";
-"swarm.customize" = "Prilagodi grupu";
+"swarm.newGroup" = "Креирајте нову групу";
+"swarm.namePlaceholder" = "Назив групе";
+"swarm.explanationText" = "Чланови могу бити позвани у било које време након што је група направљена.";
+"swarm.customizeProfile" = "Прилагодите профил групе";
+"swarm.changePicture" = "Промените слику групе";
+"swarm.customize" = "Прилагодите групу";
 "swarm.selectContacts" = "Изабери контакте";
 
 // Smartlist
 "smartlist.yesterday" = "Јуче";
 "smartlist.results" = "Јавни именик";
-"smartlist.jamsResults" = "Rezultat pretrage";
+"smartlist.jamsResults" = "Резултат претраге";
 "smartlist.conversations" = "Разговори";
-"smartlist.noConversationsFound" = "No conversations match the search.";
-"smartlist.newContact" = "Novi kontakt";
-"smartlist.newGroup" = "Nova grupa";
+"smartlist.noConversationsFound" = "Ниједна преписка не одговара претрази.";
+"smartlist.newContact" = "Нови контакт";
+"smartlist.newGroup" = "Нова група";
 "smartlist.accounts" = "Налози";
 "smartlist.invitationReceived" = "Позивнице примљене";
 "smartlist.noResults" = "Нема резултата";
 "smartlist.noConversation" = "Нема разговора";
-"smartlist.searchBarPlaceholder" = "Unesite ime…";
+"smartlist.searchBarPlaceholder" = "Унесите име…";
 "smartlist.searchBar" = "Претрага";
-"smartlist.noNetworkConnectivity" = "Nema internet konekcije";
-"smartlist.cellularAccess" = "Ensure cellular access is granted in the settings.";
+"smartlist.noNetworkConnectivity" = "Нема интернет конекције";
+"smartlist.cellularAccess" = "Уверите се да је мобилни приступ одобрен у подешавањима.";
 "smartlist.accountsTitle" = "Налози";
-"smartlist.addAccountButton" = "+ Dodaj nalog";
+"smartlist.addAccountButton" = "+ Додај налог";
 "smartlist.noNumber" = "Избрани контакт нема никакав број";
 "smartlist.selectOneNumber" = "Изаберите један од бројева";
 "smartlist.invitations" = "Позивања";
@@ -123,100 +123,100 @@
 "smartlist.inviteFriends" = "Позови пријатеље";
 "smartlist.accounts" = "Налози";
 "smartlist.disableDonation" = "Не сада";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, do you want to make a donation?";
-"smartlist.inSynchronization" = "razgovor u sinhronizaciji";
-"smartlist.newMessage" = "Nova poruka";
+"smartlist.donationExplanation" = "Ако уживате у коришћењу Јами-ја и верујете у нашу мисију, да ли желите да дате донацију?";
+"smartlist.inSynchronization" = "разговор у синхронизацији";
+"smartlist.newMessage" = "Нова порука";
 
 // Conversation
 "conversation.addToContactsButton" = "Додај у контакте";
 "conversation.addToContactsLabel" = "Додај у контакте?";
-"conversation.notContactLabel" = "%@ is not in the contact list";
-"conversation.messagePlaceholder" = "Pišite";
-"conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
-"conversation.receivedRequest" = "Dobili ste pozivnicu za razgovor od %@.";
-"conversation.incomingRequest" = "sent you a conversation invitation.";
-"conversation.requestMessage" = "Hello,\nDo you want to join the conversation?";
-"conversation.sendRequest" = "Pošaljite im pozivnicu da biste mogli razgovarati.";
-"conversation.sendRequestTitle" = "Send conversation invitation";
-"conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
-"conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
+"conversation.notContactLabel" = "%@ није на листи контаката";
+"conversation.messagePlaceholder" = "Пишите";
+"conversation.errorSavingImage" = "Дошло је до грешке при чувању слике у галерији.";
+"conversation.receivedRequest" = "%@ вам је послао позивницу за разговор.";
+"conversation.incomingRequest" = "послао вам је позивницу за разговор.";
+"conversation.requestMessage" = "Здраво,\nДа ли желите да се придружите разговору?";
+"conversation.sendRequest" = "Пошаљите им позивницу да бисте могли разговарати.";
+"conversation.sendRequestTitle" = "Пошаљите позивницу за разговор";
+"conversation.synchronizationTitle" = "Прихватили сте позивницу за разговор.";
+"conversation.synchronizationMessage" = "Чека се %@ да се повеже ради синхронизације разговора…";
 "conversation.inReplyTo" = "У одговору на";
-"conversation.repliedTo" = "%@ replied to %@";
+"conversation.repliedTo" = "%@ одговорио на %@";
 "conversation.yourself" = "Ти";
-"conversation.edited" = "Редактирана";
+"conversation.edited" = "Измењена";
 "conversation.deletedMessage" = "%@ обрисао поруку";
-"conversation.contactBlocked" = "Kontakt blokiran";
+"conversation.contactBlocked" = "Контакт блокиран";
 
 // Invitations
-"invitations.noInvitations" = "Нема покана";
+"invitations.noInvitations" = "Нема позивница";
 "invitations.accepted" = "Прихваћено";
-"invitations.declined" = "Declined";
-"invitations.blocked" = "Blokiran";
+"invitations.declined" = "Одбијено";
+"invitations.blocked" = "Блокирано";
 "invitations.list" = "Позивнице примљене";
 
 // Walkthrough
 
 //Welcome Screen
-"welcome.title" = "Share, freely and privately with Jami";
-"welcome.text" = "Џами је бесплатна и универзална комуникацијска платформа која чува приватност и слободе корисника";
+"welcome.title" = "Делите, слободно и приватно са Јамијем";
+"welcome.text" = "Јами је бесплатна и универзална комуникациона платформа која чува приватност и слободе корисника";
 "welcome.haveAccount" = "Већ имам налог";
 "welcome.linkDevice" = "Увоз из другог уређаја";
-"welcome.linkBackup" = "Импорт из архивног резервног копија";
-"welcome.createAccount" = "Стварити рачун Jami";
-"welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
+"welcome.linkBackup" = "Увези из резервне копије архиве";
+"welcome.createAccount" = "Направите Јами налог";
+"welcome.connectToJAMS" = "Повежите се са Јами сервером за управљање налогом (JAMS)";
 
 // Creation Profile Screen
 "createProfile.skipCreateProfile" = "Прескочи";
 "createProfile.profileCreated" = "Напред";
-"createProfile.title" = "Personalize your profile";
-"createProfile.enterNameLabel" = "Унесите име приказа";
+"createProfile.title" = "Персонализујте свој профил";
+"createProfile.enterNameLabel" = "Унесите име за приказ";
 "createProfile.enterNamePlaceholder" = "Унесите име";
-"createProfile.subtitle" = "Профил ће бити подељен са својим контактима.";
-"createProfile.createProfilePicture" = "Napravite sliku profila";
+"createProfile.subtitle" = "Ваш профил ће бити дељен са вашим контактима. Можете га променити у било ком тренутку.";
+"createProfile.createProfilePicture" = "Направите слику профила";
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Придружи се Јамију";
-"createAccount.lookingForUsernameAvailability" = "Checking username availability…";
-"createAccount.invalidUsername" = "Invalid username. Please enter the correct username.";
+"createAccount.lookingForUsernameAvailability" = "Проверава се доступност корисничког имена…";
+"createAccount.invalidUsername" = "Неважеће корисничко име. Унесите исправно корисничко име.";
 "createAccount.usernameAlreadyTaken" = "Корисничко име је већ заузето";
-"createAccount.usernameValid" = "The username is available.";
+"createAccount.usernameValid" = "Корисничко име је доступно.";
 "createAccount.UsernameNotRegisteredTitle" = "Мрежна грешка";
 "createAccount.UsernameNotRegisteredMessage" = "Налог је креиран, али корисничко име није регистровано";
 "createAccount.timeoutTitle" = "Налог је направљен";
-"createAccount.timeoutMessage" = "Registracija korisničkog imena je u toku. Molimo sačekajte…";
-"createAccount.sipConfigure" = "Configure existing SIP account";
-"createAccount.creatingAccount" = "Kreiranje naloga";
-"createAccount.nameExplanation" = "Можете изабрати корисничко име да бисте помогли другима да вас лакше пронађу и дођу до вас на Џами.";
-"createAccount.newAccount" = "Novi nalog";
-"createAccount.encryptionEnabled" = "Šifrovanje je omogućeno";
-"createAccount.encrypt" = "Шифровано";
+"createAccount.timeoutMessage" = "Регистрација корисничког имена је у току. Молимо сачекајте…";
+"createAccount.sipConfigure" = "Конфигуришите постојећи SIP налог";
+"createAccount.creatingAccount" = "Креирање налога";
+"createAccount.nameExplanation" = "Можете да изаберете корисничко име да бисте помогли другима да вас лакше пронађу и дођу до вас на Јами.";
+"createAccount.newAccount" = "Нови налог";
+"createAccount.encryptionEnabled" = "Шифровање је омогућено";
+"createAccount.encrypt" = "Шифруј";
 "createAccount.customize" = "Прилагоди";
 "createAccount.encryptTitle" = "Шифрујте налог лозинком";
-"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.";
+"createAccount.encryptExplanation" = "Јами налог се креира и чува локално само на овом уређају као архива која садржи кључеве налога. Приступ архиви се опционо може заштитити лозинком.";
 
 // Link To Account form
-"linkToAccount.importAccount" = "Import account";
+"linkToAccount.importAccount" = "Увези налог";
 "linkToAccount.showQrCode" = "QR код";
-"linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
-"linkToAccount.allSet" = "Account imported successfully.";
-"linkToAccount.goToAccounts" = "Go to imported account";
-"linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
-"linkToAccount.exportInstructionsPath" = "Select Account > Account Settings > Link new device.";
-"linkToAccount.scanQrCode" = "When ready, scan the QR code.";
-"linkToAccount.enterProvidedCode" = "When ready, enter the authentication code.";
-"linkToAccount.accountLockedWithPassword" = "The account is protected with a password.\nTo continue, enter the account password.";
-"linkToAccount.exit" = "Exit";
+"linkToAccount.showPinCode" = "Код за аутентификацију";
+"linkToAccount.actionRequired" = "Потребна радња.\nПотврдите налог на изворном уређају.";
+"linkToAccount.allSet" = "Налог је успешно увезен.";
+"linkToAccount.goToAccounts" = "Идите на увезени налог";
+"linkToAccount.exportInstructions" = "На изворном уређају покрените извоз.";
+"linkToAccount.exportInstructionsPath" = "Изаберите Налог > Подешавања налога > Повежи нови уређај.";
+"linkToAccount.scanQrCode" = "Када будете спремни, скенирајте QR код.";
+"linkToAccount.enterProvidedCode" = "Када будете спремни, унесите код за потврду аутентичности.";
+"linkToAccount.accountLockedWithPassword" = "Налог је заштићен лозинком.\nДа бисте наставили, унесите лозинку налога.";
+"linkToAccount.exit" = "Изађи";
 "linkToAccount.shareMessage" = "Your code is: %@";
 "linkToAccount.alertTile" = "Do you want to exit?";
 "linkToAccount.alertMessage" = "Exiting will cancel the import account operation.";
 
 // Import from Archive
-"importFromArchive.explanation" = "Увезив рачуна Џами из локалног архива.";
-"importFromArchive.passwordExplanation" = "Ако је рачун шифрен лозинком, пожените следеће поље.";
-"importFromArchive.title" = "Import from archive";
+"importFromArchive.explanation" = "Увезите Јами налог из локалне архивске датотеке.";
+"importFromArchive.passwordExplanation" = "Ако је налог шифрован лозинком, попуните следеће поље.";
+"importFromArchive.title" = "Увези из архиве";
 "importFromArchive.buttonTitle" = "Увоз";
-"importFromArchive.selectArchiveButton" = "Izaberite datoteku arhive";
+"importFromArchive.selectArchiveButton" = "Изаберите датотеку архиве";
 
 // Link to Jami Account Management Server (JAMS) form
 "linkToAccountManager.signIn" = "Sign in";
@@ -233,7 +233,7 @@
 "alerts.accountNoNetworkTitle" = "Мрежна грешка";
 "alerts.accountNoNetworkMessage" = "A connectivity error occurred while adding Jami account to the distributed network. Please try again. If the problem persists, contact your system administrator.";
 "alerts.accountDefaultErrorTitle" = "Грешка налога";
-"alerts.accountDefaultErrorMessage" = "Desila se greška prilikom pravljenja naloga.";
+"alerts.accountDefaultErrorMessage" = "Дошло је до грешке при креирању налога.";
 "alerts.profileTakePhoto" = "Снимите фотографију.";
 "alerts.profileUploadPhoto" = "Унесите фотографију";
 "alerts.accountLinkedTitle" = "Повезивање налога";
@@ -266,7 +266,7 @@
 "actions.backAction" = "Назад";
 "actions.doneAction" = "Готово";
 "actions.goToSettings" = "Идите у подешавања";
-"actions.stopLocationSharing" = "Prestani sa deljenjem";
+"actions.stopLocationSharing" = "Престани да делиш";
 
 // Calls
 "calls.ringing" = "Звучи...";
@@ -283,16 +283,16 @@
 
 // Account Page
 "accountPage.devicesListHeader" = "Уреди";
-"accountPage.settingsHeader" = "Podešavanja";
+"accountPage.settingsHeader" = "Подешавања";
 "accountPage.notificationsHeader" = "Уведомљења";
 "accountPage.blockedContacts" = "Блокирани контакти";
 "accountPage.unblockContact" = "Одблокирај";
 "accountPage.proxyAddressAlert" = "Устави прокси адресу";
 "accountPage.noProxyExplanationLabel" = "Unable to receive notifications when proxy is disabled.";
 "accountPage.proxyPaceholder" = "Прокси адреса";
-"accountPage.useProxyList" = "Koristite listu proksija";
+"accountPage.useProxyList" = "Користите листу проксија";
 "accountPage.proxyListURL" = "Proxy list URL";
-"accountPage.proxyExplanation" = "Obaveštenja se rutiraju preko proksija. Možete da koristite podrazumevani proksi, unesete prilagođenu proksi adresu ili navedete URL sa listom proksija.";
+"accountPage.proxyExplanation" = "Обавештења се рутирају преко проксија. Можете да користите подразумевани прокси, унесете прилагођену прокси адресу или наведете URL са листом проксија.";
 "accountPage.proxyHeader" = "Proxy";
 "accountPage.enableNotifications" = "Омогућивање обавештења";
 "accountPage.proxyDisabledAlertTitle" = "Прокси сервер је деактивисан";
@@ -321,7 +321,7 @@
 "accountPage.usernameRegisterAction" = "Registruj se";
 "accountPage.usernameRegistrationFailedTitle" = "Registration failed";
 "accountPage.usernameRegistrationFailed" = "Please check your password.";
-"accountPage.createPassword" = "Криптован рачун";
+"accountPage.createPassword" = "Шифруј налог";
 "accountPage.changePassword" = "Променити лозинку";
 "accountPage.currentPasswordPlaceholder" = "Унесите тренутни лозинки";
 "accountPage.newPasswordPlaceholder" = "Унесите нову лозинку";
@@ -330,7 +330,7 @@
 "accountPage.enableBoothMode" = "Обезбедите режим бута";
 "accountPage.disableBoothMode" = "Деактивирајте режим бута";
 "accountPage.disableBoothModeExplanation" = "Please provide your account password";
-"accountPage.boothModeExplanation" = "У режиму бух, историја разговора није спасана и функционалност Jami ограничена правећи исходяће позиве.";
+"accountPage.boothModeExplanation" = "У режиму кабине историја разговора није сачувана и јами функционалност је ограничена упућивањем одлазних позива. Када омогућите режим кабине, сви ваши разговори ће бити уклоњени.";
 "accountPage.noBoothMode" = "To enable Booth mode encrypt your account first.";
 "accountPage.boothModeAlertMessage" = "Након укључивања режима кабина, сви ваши разговори ће бити уклоњени.";
 "accountPage.peerDiscovery" = "Омогући откривање локалних парњака";
@@ -340,7 +340,7 @@
 "accountPage.turnEnabled" = "Омогућивање ТУРН";
 "accountPage.turnServer" = "Адреса ТУРН";
 "accountPage.turnUsername" = "TURN korisničko ime";
-"accountPage.turnPassword" = "TURN lozinka";
+"accountPage.turnPassword" = "TURN лозинка";
 "accountPage.turnRealm" = "СВЕТИЦА СВЕТ";
 "accountPage.upnpEnabled" = "Користе UPnP";
 "accountPage.security" = "Безбедност";
@@ -349,13 +349,13 @@
 "accountPage.profileHeader" = "Профил";
 "accountPage.profileNameNotSelected" = "Name not selected";
 "accountPage.accountHeader" = "Налог";
-"accountPage.profileName" = "Ime profila";
+"accountPage.profileName" = "Име профила";
 "accountPage.profileNamePlaceholder" = "Enter profile name";
 "accountPage.editProfile" = "Edit Profile";
 "accountPage.manageAccount" = "Управљајте налогом";
 "accountPage.encryptAccount" = "Шифровање рачуна са лозинком";
-"accountPage.passwordExplanation" = "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.";
-"accountPage.passwordsDoNotMatch" = "Passwords do not match.";
+"accountPage.passwordExplanation" = "Јами налог се креира и чува локално само на овом уређају као архива која садржи кључеве налога. Приступ архиви се опционо може заштитити лозинком.";
+"accountPage.passwordsDoNotMatch" = "Лозинке се не поклапају.";
 "accountPage.passwordCreated" = "Lozinka kreirana";
 "accountPage.passwordUpdated" = "Password updated";
 "accountPage.linkedDevices" = "Повезани уређаји";
@@ -432,7 +432,7 @@
 "linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
 "linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
-"linkDevice.infoQRCode" = "When ready, scan the QR code.";
+"linkDevice.infoQRCode" = "Када будете спремни, скенирајте QR код.";
 "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`.";
diff --git a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
index cfc05877f513cf1bc31e7c163545d2bc893f426c..61795e54ce08fb077ed8bd073f680a260886a8d7 100644
--- a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
@@ -183,7 +183,7 @@
 "createAccount.UsernameNotRegisteredTitle" = "网络错误";
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已创建账户";
-"createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
+"createAccount.timeoutMessage" = "用户名正在注册中。请稍候...";
 "createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以便他人在 Jami 上找到并联系您。";
@@ -195,10 +195,10 @@
 "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.importAccount" = "Import account";
+"linkToAccount.importAccount" = "导入帐户";
 "linkToAccount.showQrCode" = "二维码";
 "linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
+"linkToAccount.actionRequired" = "需要如下操作。\n请确认源设备上的帐户。";
 "linkToAccount.allSet" = "Account imported successfully.";
 "linkToAccount.goToAccounts" = "Go to imported account";
 "linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
@@ -208,8 +208,8 @@
 "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.";
+"linkToAccount.alertTile" = "要退出吗?";
+"linkToAccount.alertMessage" = "退出将取消导入账户操作。";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -242,7 +242,7 @@
 "alerts.confirmBlockContact" = "Do you want to block this contact? The conversation history with this contact will also be deleted permanently.";
 "alerts.confirmDeleteConversation" = "Do you want to delete this conversation permanently?";
 "alerts.confirmDeleteConversationFromContact" = "Do you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete conversation";
+"alerts.confirmDeleteConversationTitle" = "删除对话";
 "alerts.noMediaPermissionsTitle" = "未授予媒体权限";
 "alerts.noLibraryPermissionsTitle" = "未授予照片库访问权限";
 "alerts.noLocationPermissionsTitle" = "未授予访问位置权限";
@@ -427,20 +427,20 @@
 "linkDevice.title" = "关联新设备";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
 "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.errorNetwork" = "网络错误。\n请验证您的连接。";
+"linkDevice.errorTimeout" = "操作超时。\n请重试。";
 "linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
 "linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
 "linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
+"linkDevice.connecting" = "连接到新设备...";
 "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.newDeviceIP" = "新设备 IP 地址:%1@";
 "linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.completed" = "账户已成功导入新设备。";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -578,7 +578,7 @@
 "accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
+"accessibility.calls.default.toggleSpeaker" = "打开扬声器";
 "accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";
diff --git a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
index 37c4e6ef35125f544aa16e8c532c1cc0b3b8e3e1..03c2840fc0dadd6c10d8afb8c50259a118f33625 100644
--- a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
@@ -183,7 +183,7 @@
 "createAccount.UsernameNotRegisteredTitle" = "網路錯誤";
 "createAccount.UsernameNotRegisteredMessage" = "帳號已建立,但未註冊使用者名稱";
 "createAccount.timeoutTitle" = "已建立帳號";
-"createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
+"createAccount.timeoutMessage" = "用户名正在注册中。请稍候...";
 "createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以帮助其他人更容易地找到和联系您在Jami.";
@@ -195,10 +195,10 @@
 "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.importAccount" = "Import account";
+"linkToAccount.importAccount" = "导入帐户";
 "linkToAccount.showQrCode" = "QR code";
 "linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
+"linkToAccount.actionRequired" = "需要如下操作。\n请确认源设备上的帐户。";
 "linkToAccount.allSet" = "Account imported successfully.";
 "linkToAccount.goToAccounts" = "Go to imported account";
 "linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
@@ -208,8 +208,8 @@
 "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.";
+"linkToAccount.alertTile" = "要退出吗?";
+"linkToAccount.alertMessage" = "退出将取消导入账户操作。";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -242,7 +242,7 @@
 "alerts.confirmBlockContact" = "Do you want to block this contact? The conversation history with this contact will also be deleted permanently.";
 "alerts.confirmDeleteConversation" = "Do you want to delete this conversation permanently?";
 "alerts.confirmDeleteConversationFromContact" = "Do you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete conversation";
+"alerts.confirmDeleteConversationTitle" = "删除对话";
 "alerts.noMediaPermissionsTitle" = "未給予媒體權限";
 "alerts.noLibraryPermissionsTitle" = "無法存取相簿";
 "alerts.noLocationPermissionsTitle" = "不允許存取位置";
@@ -427,20 +427,20 @@
 "linkDevice.title" = "連結新裝置";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
 "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.errorNetwork" = "网络错误。\n请验证您的连接。";
+"linkDevice.errorTimeout" = "操作超时。\n请重试。";
 "linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
 "linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
 "linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
+"linkDevice.connecting" = "连接到新设备...";
 "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.newDeviceIP" = "新设备 IP 地址:%1@";
 "linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.completed" = "账户已成功导入新设备。";
 
 // Contact Page
 "contactPage.startAudioCall" = "開始音訊通話";
@@ -578,7 +578,7 @@
 "accessibility.calls.default.hangUpCall" = "掛斷";
 "accessibility.calls.default.addParticipant" = "新增參與者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
+"accessibility.calls.default.toggleSpeaker" = "打开扬声器";
 "accessibility.calls.default.openConversation" = "開啟對話";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "舉手";
diff --git a/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
index 7b49de97e179b8b222455c22619b148b8b0e4d0e..b4f944fa4f55051049a8914e03a751df875ec9e1 100644
--- a/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
@@ -183,7 +183,7 @@
 "createAccount.UsernameNotRegisteredTitle" = "Network error";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
-"createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
+"createAccount.timeoutMessage" = "用户名正在注册中。请稍候...";
 "createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以便他人在 Jami 上找到并联系您。";
@@ -195,10 +195,10 @@
 "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.importAccount" = "Import account";
+"linkToAccount.importAccount" = "导入帐户";
 "linkToAccount.showQrCode" = "二维码";
 "linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
+"linkToAccount.actionRequired" = "需要如下操作。\n请确认源设备上的帐户。";
 "linkToAccount.allSet" = "Account imported successfully.";
 "linkToAccount.goToAccounts" = "Go to imported account";
 "linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
@@ -208,8 +208,8 @@
 "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.";
+"linkToAccount.alertTile" = "要退出吗?";
+"linkToAccount.alertMessage" = "退出将取消导入账户操作。";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -242,7 +242,7 @@
 "alerts.confirmBlockContact" = "Do you want to block this contact? The conversation history with this contact will also be deleted permanently.";
 "alerts.confirmDeleteConversation" = "Do you want to delete this conversation permanently?";
 "alerts.confirmDeleteConversationFromContact" = "Do you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete conversation";
+"alerts.confirmDeleteConversationTitle" = "删除对话";
 "alerts.noMediaPermissionsTitle" = "Media permission not granted";
 "alerts.noLibraryPermissionsTitle" = "Access to photo library not granted";
 "alerts.noLocationPermissionsTitle" = "Access to location not granted";
@@ -427,20 +427,20 @@
 "linkDevice.title" = "关联新设备";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
 "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.errorNetwork" = "网络错误。\n请验证您的连接。";
+"linkDevice.errorTimeout" = "操作超时。\n请重试。";
 "linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
 "linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
 "linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
+"linkDevice.connecting" = "连接到新设备...";
 "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.newDeviceIP" = "新设备 IP 地址:%1@";
 "linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.completed" = "账户已成功导入新设备。";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -578,7 +578,7 @@
 "accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
+"accessibility.calls.default.toggleSpeaker" = "打开扬声器";
 "accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";
diff --git a/Ring/Ring/Resources/zh.lproj/Localizable.strings b/Ring/Ring/Resources/zh.lproj/Localizable.strings
index 66780d2773639453923743bc3c1e903d0e7a7470..ad98be50f3f4511a9e009e900b566f668af28d09 100644
--- a/Ring/Ring/Resources/zh.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh.lproj/Localizable.strings
@@ -183,7 +183,7 @@
 "createAccount.UsernameNotRegisteredTitle" = "网络错误";
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
-"createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
+"createAccount.timeoutMessage" = "用户名正在注册中。请稍候...";
 "createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以帮助其他人更容易地找到和联系您在Jami.";
@@ -195,10 +195,10 @@
 "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.importAccount" = "Import account";
+"linkToAccount.importAccount" = "导入帐户";
 "linkToAccount.showQrCode" = "二维码";
 "linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
+"linkToAccount.actionRequired" = "需要如下操作。\n请确认源设备上的帐户。";
 "linkToAccount.allSet" = "Account imported successfully.";
 "linkToAccount.goToAccounts" = "Go to imported account";
 "linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
@@ -208,8 +208,8 @@
 "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.";
+"linkToAccount.alertTile" = "要退出吗?";
+"linkToAccount.alertMessage" = "退出将取消导入账户操作。";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -242,7 +242,7 @@
 "alerts.confirmBlockContact" = "Do you want to block this contact? The conversation history with this contact will also be deleted permanently.";
 "alerts.confirmDeleteConversation" = "Do you want to delete this conversation permanently?";
 "alerts.confirmDeleteConversationFromContact" = "Do you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete conversation";
+"alerts.confirmDeleteConversationTitle" = "删除对话";
 "alerts.noMediaPermissionsTitle" = "未授予媒体权限";
 "alerts.noLibraryPermissionsTitle" = "未授予照片库访问权限";
 "alerts.noLocationPermissionsTitle" = "未授予访问位置权限";
@@ -427,20 +427,20 @@
 "linkDevice.title" = "关联新设备";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
 "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.errorNetwork" = "网络错误。\n请验证您的连接。";
+"linkDevice.errorTimeout" = "操作超时。\n请重试。";
 "linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
 "linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
 "linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
+"linkDevice.connecting" = "连接到新设备...";
 "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.newDeviceIP" = "新设备 IP 地址:%1@";
 "linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.completed" = "账户已成功导入新设备。";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -578,7 +578,7 @@
 "accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
+"accessibility.calls.default.toggleSpeaker" = "打开扬声器";
 "accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";
diff --git a/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings b/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
index 1691b4eb26e2c414b6c1152cd23aa3933b7b6aa5..04ac3071c248c501d2bac594f96f7de17bcd079c 100644
--- a/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
@@ -183,7 +183,7 @@
 "createAccount.UsernameNotRegisteredTitle" = "网络错误";
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
-"createAccount.timeoutMessage" = "Username registration is in progress. Please wait…";
+"createAccount.timeoutMessage" = "用户名正在注册中。请稍候...";
 "createAccount.sipConfigure" = "配置现有 SIP 帐户";
 "createAccount.creatingAccount" = "Creating account";
 "createAccount.nameExplanation" = "您可以选择一个用户名,以帮助其他人更容易地找到和联系您在Jami.";
@@ -195,10 +195,10 @@
 "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.importAccount" = "Import account";
+"linkToAccount.importAccount" = "导入帐户";
 "linkToAccount.showQrCode" = "二维码";
 "linkToAccount.showPinCode" = "Authentication code";
-"linkToAccount.actionRequired" = "Action required.\nPlease confirm account on the source device.";
+"linkToAccount.actionRequired" = "需要如下操作。\n请确认源设备上的帐户。";
 "linkToAccount.allSet" = "Account imported successfully.";
 "linkToAccount.goToAccounts" = "Go to imported account";
 "linkToAccount.exportInstructions" = "On the source device, initiate the exportation.";
@@ -208,8 +208,8 @@
 "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.";
+"linkToAccount.alertTile" = "要退出吗?";
+"linkToAccount.alertMessage" = "退出将取消导入账户操作。";
 
 // Import from Archive
 "importFromArchive.explanation" = "从本地档案文件导入Jami账户。";
@@ -242,7 +242,7 @@
 "alerts.confirmBlockContact" = "Do you want to block this contact? The conversation history with this contact will also be deleted permanently.";
 "alerts.confirmDeleteConversation" = "Do you want to delete this conversation permanently?";
 "alerts.confirmDeleteConversationFromContact" = "Do you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete conversation";
+"alerts.confirmDeleteConversationTitle" = "删除对话";
 "alerts.noMediaPermissionsTitle" = "未授予媒体权限";
 "alerts.noLibraryPermissionsTitle" = "未授予照片库访问权限";
 "alerts.noLocationPermissionsTitle" = "未授予访问位置权限";
@@ -427,20 +427,20 @@
 "linkDevice.title" = "关联新设备";
 "linkDevice.networkError" = "A network error occurred while exporting the account.";
 "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.errorNetwork" = "网络错误。\n请验证您的连接。";
+"linkDevice.errorTimeout" = "操作超时。\n请重试。";
 "linkDevice.errorCode" = "An error occurred while generating the code.\nPlease try again.";
 "linkDevice.errorWrongData" = "An error occurred while exporting the account.n\nPlease try again.";
 "linkDevice.initialInfo" = "On the new device, initiate a new account.\nSelect Add Account > Connect from another device.";
 "linkDevice.infoQRCode" = "When ready, scan the QR code.";
 "linkDevice.infoCode" = "When ready, enter the code and press `Connect`.";
-"linkDevice.connecting" = "Connecting to your new device…";
+"linkDevice.connecting" = "连接到新设备...";
 "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.newDeviceIP" = "新设备 IP 地址:%1@";
 "linkDevice.code" = "code";
 "linkDevice.wrongEntry" = "New device identifier is unrecognized.\nPlease follow above instruction.";
 "linkDevice.exportInProgress" = "The export account operation to the new device is in progress.\nPlease confirm import on the new device.";
-"linkDevice.completed" = "Account imported successfully on the new device.";
+"linkDevice.completed" = "账户已成功导入新设备。";
 
 // Contact Page
 "contactPage.startAudioCall" = "发起语音通话";
@@ -578,7 +578,7 @@
 "accessibility.calls.default.hangUpCall" = "挂断";
 "accessibility.calls.default.addParticipant" = "添加参与者";
 "accessibility.calls.default.switchCamera" = "Switch camera";
-"accessibility.calls.default.toggleSpeaker" = "Turn on speaker";
+"accessibility.calls.default.toggleSpeaker" = "打开扬声器";
 "accessibility.calls.default.openConversation" = "打开会话";
 "accessibility.calls.default.showDialpad" = "Show dialpad";
 "accessibility.calls.default.raiseHand" = "举手";