diff --git a/ui/bg.lproj/MainMenu.strings b/ui/bg.lproj/MainMenu.strings
index a0651ebfd678c6eec0f2e07be8b58051ec7dcc30..0e2c93ca42a61d567d875964ddcdaafdaa4d93f6 100644
--- a/ui/bg.lproj/MainMenu.strings
+++ b/ui/bg.lproj/MainMenu.strings
@@ -21,7 +21,7 @@
 "57.title" = "Jami";
 
 /* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
-"58.title" = "About Jami";
+"58.title" = "Относно Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Настройки…";
diff --git a/ui/es.lproj/AccAdvancedRing.strings b/ui/es.lproj/AccAdvancedRing.strings
index 7611d29c755438d190b09708dfe8cbf33a63a90e..4fdf3b789dfbae38d4a9c836d7866f3f78e76bff 100644
--- a/ui/es.lproj/AccAdvancedRing.strings
+++ b/ui/es.lproj/AccAdvancedRing.strings
@@ -12,7 +12,7 @@
 "7eU-EP-4br.title" = "Caja";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "8mv-Ia-GM4"; */
-"8mv-Ia-GM4.title" = "TURN address";
+"8mv-Ia-GM4.title" = "Dirección TURN";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "BIS-Ft-yJn"; */
 "BIS-Ft-yJn.title" = "Ajustes de llamada";
@@ -39,16 +39,16 @@
 "Qxp-I4-A7W.title" = "Seguridad";
 
 /* Class = "NSButtonCell"; title = "Enable proxy"; ObjectID = "VyP-8T-aNA"; */
-"VyP-8T-aNA.title" = "Enable proxy";
+"VyP-8T-aNA.title" = "Habilitar proxy";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
 "Wrh-zD-uh5.title" = "Códecs de video ";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "XU0-bl-lDD"; */
-"XU0-bl-lDD.title" = "TURN realm";
+"XU0-bl-lDD.title" = "Dominio TURN";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "YE4-ry-u07"; */
-"YE4-ry-u07.title" = "STUN address";
+"YE4-ry-u07.title" = "Dirección STUN";
 
 /* Class = "NSTextFieldCell"; title = "Bootstrap"; ObjectID = "YJM-iQ-0lE"; */
 "YJM-iQ-0lE.title" = "Cargador de inicio";
diff --git a/ui/es.lproj/AccAdvancedSip.strings b/ui/es.lproj/AccAdvancedSip.strings
index 39be59bc26f2cc70a8b3116044e8c4e59a2f229a..3bbc54f9eaec41962ea2d0681b491a7a8bbd641a 100644
--- a/ui/es.lproj/AccAdvancedSip.strings
+++ b/ui/es.lproj/AccAdvancedSip.strings
@@ -21,7 +21,7 @@
 "3vs-TI-tkg.title" = "Respuesta automática de llamadas";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "6eH-la-JbF"; */
-"6eH-la-JbF.title" = "TURN realm";
+"6eH-la-JbF.title" = "Dominio TURN";
 
 /* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "72p-GY-gu6"; */
 "72p-GY-gu6.title" = "Contraseña de clave privada";
@@ -30,7 +30,7 @@
 "8JD-11-wHZ.title" = "Nombre del servidor TLS saliente";
 
 /* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "8bw-iH-XGl"; */
-"8bw-iH-XGl.title" = "Item 1";
+"8bw-iH-XGl.title" = "Elemento 1";
 
 /* Class = "NSTextFieldCell"; title = "Port"; ObjectID = "9p9-GR-XKU"; */
 "9p9-GR-XKU.title" = "Puerto";
@@ -48,7 +48,7 @@
 "HRM-FR-1sH.title" = "Utilizar STUN";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "HYt-sW-yd0"; */
-"HYt-sW-yd0.title" = "STUN address";
+"HYt-sW-yd0.title" = "Dirección STUN";
 
 /* Class = "NSButtonCell"; title = "Require a certificate for incoming TLS connections"; ObjectID = "JV8-cY-6vR"; */
 "JV8-cY-6vR.title" = "Exigir un certificado para las conexiones TLS entrantes";
@@ -60,13 +60,13 @@
 "MBR-AC-HFq.title" = "Caja";
 
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Mho-w1-ZPJ"; */
-"Mho-w1-ZPJ.title" = "Item 3";
+"Mho-w1-ZPJ.title" = "Elemento 3";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "Nqr-gj-dOH"; */
 "Nqr-gj-dOH.title" = "Tono de llamada personalizado";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
-"OEo-C7-vEh.title" = "Item 2";
+"OEo-C7-vEh.title" = "Elemento 2";
 
 /* Class = "NSTextFieldCell"; title = "Audio RTP port Range"; ObjectID = "Ogj-NW-fZ9"; */
 "Ogj-NW-fZ9.title" = "Rango de puertos RTP";
@@ -99,13 +99,13 @@
 "Zuz-jy-rLn.title" = "Caja";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "aYs-wh-Hpr"; */
-"aYs-wh-Hpr.title" = "TURN address";
+"aYs-wh-Hpr.title" = "Dirección TURN";
 
 /* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "b2y-85-ZHK"; */
 "b2y-85-ZHK.title" = "Certificado CA";
 
 /* Class = "NSTextFieldCell"; title = "Only used during SDP negotiation in case ICE is not supported"; ObjectID = "cN3-lC-dNM"; */
-"cN3-lC-dNM.title" = "Only used during SDP negotiation in case ICE is not supported";
+"cN3-lC-dNM.title" = "Solo se utiliza durante la negociación de SDP en caso de que no se admita ICE.";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "cwV-lc-jju"; */
 "cwV-lc-jju.title" = "Caja";
@@ -120,7 +120,7 @@
 "fjH-ej-gEr.title" = "Interfaz de red";
 
 /* Class = "NSButtonCell"; title = "Verify incoming sertificates (server side)"; ObjectID = "fyT-bU-m54"; */
-"fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
+"fyT-bU-m54.title" = "Verificar certificados entrantes (lado del servidor)";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "gJs-aX-7Ox"; */
 "gJs-aX-7Ox.title" = "Códecs de video ";
@@ -144,7 +144,7 @@
 "rMN-Wf-tmp.title" = "Nombre de usuario en TURN";
 
 /* Class = "NSButtonCell"; title = "Encrypt media streams(SRTP)"; ObjectID = "vCS-s8-mZI"; */
-"vCS-s8-mZI.title" = "Encrypt media streams(SRTP)";
+"vCS-s8-mZI.title" = "Cifrar transmisiones multimedia (SRTP)";
 
 /* Class = "NSButtonCell"; title = "Encrypt negotiation (TLS)"; ObjectID = "vZH-42-mUi"; */
 "vZH-42-mUi.title" = "Encriptar Negociación (TLS)";
diff --git a/ui/es.lproj/AccRingGeneral.strings b/ui/es.lproj/AccRingGeneral.strings
index c1143110e35dbbdbf2222f8657b36be1d2135eb8..b975471e2591308715e105d59efcc88a7721d14f 100644
--- a/ui/es.lproj/AccRingGeneral.strings
+++ b/ui/es.lproj/AccRingGeneral.strings
@@ -18,7 +18,7 @@
 "WEo-a0-wVL.ibShadowedToolTip" = "Editar nombre";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "Yf6-8d-SNh"; */
-"Yf6-8d-SNh.title" = "Remove Account";
+"Yf6-8d-SNh.title" = "Eliminar cuenta";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
 "aQL-hX-CfA.title" = "SMS a Teléfono Celular";
@@ -45,10 +45,10 @@
 "oVO-wj-fwQ.title" = "Caja";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
-"oga-WC-4gb.title" = "Linked devices";
+"oga-WC-4gb.title" = "Dispositivos vinculados";
 
 /* Class = "NSTextFieldCell"; title = "Identifier:"; ObjectID = "qx7-i1-3Na"; */
-"qx7-i1-3Na.title" = "Identifier:";
+"qx7-i1-3Na.title" = "Identificador: ";
 
 /* Class = "NSButtonCell"; title = "Link another device"; ObjectID = "tWk-Od-BEQ"; */
 "tWk-Od-BEQ.title" = "Vincular otro dispositivo";
diff --git a/ui/es.lproj/AccSipGeneral.strings b/ui/es.lproj/AccSipGeneral.strings
index e3ed4176ae7c03a4806381daafe8d08f5ea22134..f7d148b968cee3a9dce4305b186220b4db29a0bc 100644
--- a/ui/es.lproj/AccSipGeneral.strings
+++ b/ui/es.lproj/AccSipGeneral.strings
@@ -3,7 +3,7 @@
 "688-Sx-Gvr.title" = "Proxy";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Fj6-Q3-Gz3"; */
-"Fj6-Q3-Gz3.title" = "User Name";
+"Fj6-Q3-Gz3.title" = "Nombre de usuario";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "NlM-R9-ola"; */
 "NlM-R9-ola.title" = "Caja";
@@ -18,7 +18,7 @@
 "Yof-e7-IBF.title" = "Contraseña";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ZKc-70-TFH"; */
-"ZKc-70-TFH.title" = "SIP Server";
+"ZKc-70-TFH.title" = "Servidor SIP";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "eQt-bc-Eev"; */
 "eQt-bc-Eev.title" = "Cuenta";
@@ -30,10 +30,10 @@
 "jdU-uZ-Rfy.title" = "Editar cuenta";
 
 /* Class = "NSButtonCell"; title = "enable"; ObjectID = "nW8-pd-fNj"; */
-"nW8-pd-fNj.title" = "enable";
+"nW8-pd-fNj.title" = "Habilitar";
 
 /* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "oE8-tN-SfC"; */
 "oE8-tN-SfC.title" = "Perfil";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "uFM-Am-0kz"; */
-"uFM-Am-0kz.title" = "Remove Account";
+"uFM-Am-0kz.title" = "Eliminar cuenta";
diff --git a/ui/es.lproj/AddSIPAccountVC.strings b/ui/es.lproj/AddSIPAccountVC.strings
index 9a88657fb9dfae91fba786492fe4fa6fdcbbd41c..6f795392b232657c524298381ab9b3e3617c04c4 100644
--- a/ui/es.lproj/AddSIPAccountVC.strings
+++ b/ui/es.lproj/AddSIPAccountVC.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter SIP address"; ObjectID = "0UI-j5-0at"; */
-"0UI-j5-0at.placeholderString" = "Enter SIP address";
+"0UI-j5-0at.placeholderString" = "Introducir dirección SIP";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "Aem-zQ-Ya3"; */
 "Aem-zQ-Ya3.title" = "Contraseña";
@@ -18,7 +18,7 @@
 "Rej-Yd-PDb.placeholderString" = "Introducir nombre de usuario";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Srm-hv-9WR"; */
-"Srm-hv-9WR.title" = "User Name";
+"Srm-hv-9WR.title" = "Nombre de usuario";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YeS-R8-ZLT"; */
 "YeS-R8-ZLT.placeholderString" = "Introducir nombre";
@@ -27,7 +27,7 @@
 "fgN-nq-QdO.title" = "Perfil";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ubR-HD-O15"; */
-"ubR-HD-O15.title" = "SIP Server";
+"ubR-HD-O15.title" = "Servidor SIP";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "zAN-HT-1oE"; */
 "zAN-HT-1oE.title" = "Cuenta";
diff --git a/ui/es.lproj/LeaveMessageVC.strings b/ui/es.lproj/LeaveMessageVC.strings
index 22b7e94512c17631ca0eb994e93cb95e9687b097..16c306341fee1a8566924d0ac5b27cb0e8832f0a 100644
--- a/ui/es.lproj/LeaveMessageVC.strings
+++ b/ui/es.lproj/LeaveMessageVC.strings
@@ -12,7 +12,7 @@
 "Zlv-nH-Y9y.title" = "Caja";
 
 /* Class = "NSTextFieldCell"; title = "Contact appears to be busy. Leave a message?"; ObjectID = "hnr-x5-xnb"; */
-"hnr-x5-xnb.title" = "Contact appears to be busy. Leave a message?";
+"hnr-x5-xnb.title" = "El contacto parece estar ocupado. ¿Dejar un mensaje?";
 
 /* Class = "NSTextFieldCell"; title = "Recording"; ObjectID = "kIq-PG-Ymw"; */
 "kIq-PG-Ymw.title" = "Grabaciones";
diff --git a/ui/es.lproj/Localizable.strings b/ui/es.lproj/Localizable.strings
index 506b784f0824b83b9520361221136365b9e13e74..da1c9ae7eeef876609feb4d38483070dc251444f 100644
--- a/ui/es.lproj/Localizable.strings
+++ b/ui/es.lproj/Localizable.strings
@@ -2,16 +2,16 @@
 "A network error occured during the export" = "Ocurrió un error durante la exportación";
 
 /* No password on this account text field placeholder */
-"Account has no password" = "Account has no password";
+"Account has no password" = "La cuenta no tiene contraseña";
 
 /* Contextual menu action */
 "Add to contacts" = "Añadir a contactos";
 
 /* Contextual menu action */
-"Place video call" = "Place video call";
+"Place video call" = "Realizar videollamada";
 
 /* Contextual menu action */
-"Place audio call" = "Place audio call";
+"Place audio call" = "Realizar llamada de audio";
 
 /* Contextual menu action */
 "Clear conversation" = "Limpiar conversación";
@@ -56,7 +56,7 @@
 "Choose file" = "Elegir archivo";
 
 /* Contextual menu entry */
-"Share screen" = "Share screen";
+"Share screen" = "Compartir pantalla";
 
 /* No comment provided by engineer. */
 "Copy" = "Copiar";
@@ -86,7 +86,7 @@
 "Incoming call from %@" = "Llamada entrante de %@";
 
 /* Incoming message from {Name} */
-"Incoming message from %@" = "Incoming message from %@";
+"Incoming message from %@" = "Mensaje entrante de %@";
 
 /* Message from {Name} */
 "Message from %@" = "Mensaje de %@";
@@ -95,10 +95,10 @@
 "New SIP account" = "Nueva cuenta SIP";
 
 /* Displayed as RingID when no accounts are available for selection */
-"No account available" = "No account available";
+"No account available" = "No hay ninguna cuenta disponible";
 
 /* Allert message when no accounts are available */
-"Navigate to preferences to create a new account" = "Navigate to preferences to create a new account";
+"Navigate to preferences to create a new account" = "Ir a preferencias para crear una nueva cuenta";
 
 /* Text show to the user when password didn't match */
 "Password and confirmation mismatch." = "La contraseña y la confirmación no coinciden";
@@ -153,16 +153,16 @@
 "The entered username is not available" = "El nombre de usuario tecleado no está disponible";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Jami account format:" = "The following account needs to be migrated to the new Jami account format:";
+"The following account needs to be migrated to the new Jami account format:" = "Esta cuenta debe migrarse al nuevo formato de cuenta de Jami:";
 
 /* Error shown to the user */
 "The password you entered does not unlock this account" = "La contraseña ingresada no puede desbloquear esta cuenta";
 
 /* Title shown to user to concat with Pin */
-"To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+"To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "Para completar el proces, abre Jami en el nuevo dispositivo y elige la opción \"Enlazar este dispositivo con una cuenta\". El pin es válido durante 10 minutos.";
 
 /* Text shown to the user */
-"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later.";
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later." = "Para proceder con la migración, escoge una contraseña para tu cuenta. Esta contraseña se utilizará para cifrar tu clave maestra y será necesaria para añadir dispositivos a tu cuenta Jami. Si no estás listo para escoger una contraseña, cierra Jami y continúa con la migración más adelante.";
 
 /* Name used when user leave field empty */
 "Unknown" = "Desconocido";
@@ -171,27 +171,27 @@
 "You have to migrate your account before exporting" = "Debes migrar tu cuenta antes de exportar";
 
 /* Remove account alert title */
-"Remove account" = "Remove account";
+"Remove account" = "Eliminar cuenta";
 
 /* Remove account alert message */
-"By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost." = "By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost." = "Al hacer clic en \"OK\", esta cuenta se eliminará de este dispositivo. Esta acción es irreversible. Es posible que se pierda el nombre registrado.";
 
 /* export account button title */
-"Select archive" = "Select archive";
+"Select archive" = "Seleccionar archivo";
 
 /* link account title */
-"Link to an account" = "Link to an account";
+"Link to an account" = "Enlace a una cuenta";
 
 /* Welcome title */
 "Welcome to Ring" = "Bienvenido a Jami";
 "Create a new account" = "Crear una cuenta";
-"Add a SIP account" = "Add a SIP account";
+"Add a SIP account" = "Añadir una cuenta SIP";
 
 /* Notification message */
-"Send you a contact request" = "Send you a contact request";
+"Send you a contact request" = "Enviarte una solicitud de contacto";
 
 /* Explanation label when user have Jami username */
-"This is your Jami username. \nCopy and share it with your friends!" = "This is your Jami username. \nCopy and share it with your friends!";
+"This is your Jami username. \nCopy and share it with your friends!" = "Este es tu nombre de usuario en Jami.\n¡Cópialo y compártelo con tus amigos!";
 
 /* Explanation label when user have just ID */
-"This is your ID. \nCopy and share it with your friends!" = "This is your ID. \nCopy and share it with your friends!";
+"This is your ID. \nCopy and share it with your friends!" = "Este es tu ID.\n¡Cópialo y compártelo con tus amigos!";
diff --git a/ui/es.lproj/PasswordChange.strings b/ui/es.lproj/PasswordChange.strings
index 230d6438dfd5af213c262febc074d4676fbc67b5..e54d82018534a67bd00e78fa9e80cf07698d0f2c 100644
--- a/ui/es.lproj/PasswordChange.strings
+++ b/ui/es.lproj/PasswordChange.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
-"8KO-IO-ykP.title" = "Repeat";
+"8KO-IO-ykP.title" = "Repetir";
 
 /* Class = "NSButtonCell"; title = "Accept"; ObjectID = "Ggu-EQ-cqC"; */
 "Ggu-EQ-cqC.title" = "Aceptar";
@@ -9,10 +9,10 @@
 "MZw-ep-8aW.title" = "Cancelar";
 
 /* Class = "NSTextFieldCell"; title = "Password is incorrect"; ObjectID = "WyU-Dx-U1u"; */
-"WyU-Dx-U1u.title" = "Password is incorrect";
+"WyU-Dx-U1u.title" = "Contraseña incorrecta";
 
 /* Class = "NSTextFieldCell"; title = "Old password"; ObjectID = "gPw-Jf-0M7"; */
-"gPw-Jf-0M7.title" = "Old password";
+"gPw-Jf-0M7.title" = "Antigua contraseña";
 
 /* Class = "NSTextFieldCell"; title = "New password"; ObjectID = "pZe-DO-jWp"; */
 "pZe-DO-jWp.title" = "Contraseña nueva";
diff --git a/ui/es.lproj/RingWizardLinkAccount.strings b/ui/es.lproj/RingWizardLinkAccount.strings
index 6c0d55c02314cd04866f872eda787bc8f55711bc..340b0f6cd1d49ca81119cafaf8fd2ed975b89d8e 100644
--- a/ui/es.lproj/RingWizardLinkAccount.strings
+++ b/ui/es.lproj/RingWizardLinkAccount.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSTextFieldCell"; title = "To link this device to another account, you have two possibilities:"; ObjectID = "06g-zM-5Qz"; */
-"06g-zM-5Qz.title" = "To link this device to another account, you have two possibilities:";
+"06g-zM-5Qz.title" = "Tiene dos opciones para vincular este dispositivo con otra cuenta:";
 
 /* Class = "NSTextFieldCell"; title = "OR"; ObjectID = "1NY-Yu-wH1"; */
 "1NY-Yu-wH1.title" = "OR";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes."; ObjectID = "2uK-1s-tk7"; */
-"2uK-1s-tk7.title" = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes.";
+"2uK-1s-tk7.title" = "\tPuedes importar la cuenta del otro dispositivo device, pero primero necesitas obtener un código PIN.\n\tPara generar el código PIN, accede a las opciones de administración de cuenta de un dispositivo previo, escoje la cuenta Jami que deseas utilizar y selecciona \"Vincular otro dispositivo a esta cuenta\". Recibirás el PIN necesario para completar este formulario. Este PIN solo es válido durante 10 minutos.";
 
 /* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
 "3ik-rY-Gig.title" = "Introduce el PIN";
@@ -36,13 +36,13 @@
 "WlR-QM-tK4.ibShadowedNotApplicablePlaceholder" = "Contraseña...";
 
 /* Class = "NSButtonCell"; title = "Select file"; ObjectID = "XJE-cy-nfQ"; */
-"XJE-cy-nfQ.title" = "Select file";
+"XJE-cy-nfQ.title" = "Seleccionar archivo";
 
 /* Class = "NSTextFieldCell"; title = "Import archive file"; ObjectID = "kXa-FL-Enf"; */
-"kXa-FL-Enf.title" = "Import archive file";
+"kXa-FL-Enf.title" = "Importar archivo de almacenamiento";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can directly import your account from an archive file on your device."; ObjectID = "kfe-m7-MTT"; */
-"kfe-m7-MTT.title" = "\tYou can directly import your account from an archive file on your device.";
+"kfe-m7-MTT.title" = "\tPuedes importar tu cuenta directamente de un archivo de almacenamiento en tu dispositivo.";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "OK";
@@ -60,4 +60,4 @@
 "vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "PIN";
 
 /* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
-"zWn-4H-ODH.title" = "Linking...";
+"zWn-4H-ODH.title" = "Enlazando...";
diff --git a/ui/fr.lproj/AccAdvancedRing.strings b/ui/fr.lproj/AccAdvancedRing.strings
index c764c9e0a7e8f2db77a38157d82ce3edee621dc2..d41d1e039687062d3994461197fe1c71dd84943d 100644
--- a/ui/fr.lproj/AccAdvancedRing.strings
+++ b/ui/fr.lproj/AccAdvancedRing.strings
@@ -12,7 +12,7 @@
 "7eU-EP-4br.title" = "Boîte";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "8mv-Ia-GM4"; */
-"8mv-Ia-GM4.title" = "TURN address";
+"8mv-Ia-GM4.title" = "Adresse du serveur TURN";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "BIS-Ft-yJn"; */
 "BIS-Ft-yJn.title" = "Paramètres d'appel";
@@ -39,7 +39,7 @@
 "Qxp-I4-A7W.title" = "Sécurité";
 
 /* Class = "NSButtonCell"; title = "Enable proxy"; ObjectID = "VyP-8T-aNA"; */
-"VyP-8T-aNA.title" = "Enable proxy";
+"VyP-8T-aNA.title" = "Utiliser un nœud délégataire ";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
 "Wrh-zD-uh5.title" = "Codecs vidéo";
@@ -48,7 +48,7 @@
 "XU0-bl-lDD.title" = "Domaine TURN";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "YE4-ry-u07"; */
-"YE4-ry-u07.title" = "STUN address";
+"YE4-ry-u07.title" = "Adresse du serveur STUN";
 
 /* Class = "NSTextFieldCell"; title = "Bootstrap"; ObjectID = "YJM-iQ-0lE"; */
 "YJM-iQ-0lE.title" = "Adresse du nœud d'amorçage";
diff --git a/ui/fr.lproj/AccAdvancedSip.strings b/ui/fr.lproj/AccAdvancedSip.strings
index 3bc79b602dacca51fd1c805e484ccbf5a62f6a62..21610e60c126fb3fb4294d0e8b6f6fa08fa71673 100644
--- a/ui/fr.lproj/AccAdvancedSip.strings
+++ b/ui/fr.lproj/AccAdvancedSip.strings
@@ -48,7 +48,7 @@
 "HRM-FR-1sH.title" = "Utiliser STUN";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "HYt-sW-yd0"; */
-"HYt-sW-yd0.title" = "STUN address";
+"HYt-sW-yd0.title" = "Adresse du serveur STUN";
 
 /* Class = "NSButtonCell"; title = "Require a certificate for incoming TLS connections"; ObjectID = "JV8-cY-6vR"; */
 "JV8-cY-6vR.title" = "Exiger un certificat pour les connexions TLS entrantes";
@@ -99,13 +99,13 @@
 "Zuz-jy-rLn.title" = "Boîte";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "aYs-wh-Hpr"; */
-"aYs-wh-Hpr.title" = "TURN address";
+"aYs-wh-Hpr.title" = "Adresse du serveur TURN";
 
 /* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "b2y-85-ZHK"; */
 "b2y-85-ZHK.title" = "Certificat de la CA";
 
 /* Class = "NSTextFieldCell"; title = "Only used during SDP negotiation in case ICE is not supported"; ObjectID = "cN3-lC-dNM"; */
-"cN3-lC-dNM.title" = "Only used during SDP negotiation in case ICE is not supported";
+"cN3-lC-dNM.title" = "Ces paramètres sont uniquement utilisés durant la négociation de la session SDP au cas où ICE ne serait pas supporté.";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "cwV-lc-jju"; */
 "cwV-lc-jju.title" = "Boîte";
@@ -120,7 +120,7 @@
 "fjH-ej-gEr.title" = "Interface réseau";
 
 /* Class = "NSButtonCell"; title = "Verify incoming sertificates (server side)"; ObjectID = "fyT-bU-m54"; */
-"fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
+"fyT-bU-m54.title" = "Vérifier les certificats entrants (coté serveur)";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "gJs-aX-7Ox"; */
 "gJs-aX-7Ox.title" = "Codecs vidéo";
@@ -144,7 +144,7 @@
 "rMN-Wf-tmp.title" = "Utilisateur TURN";
 
 /* Class = "NSButtonCell"; title = "Encrypt media streams(SRTP)"; ObjectID = "vCS-s8-mZI"; */
-"vCS-s8-mZI.title" = "Encrypt media streams(SRTP)";
+"vCS-s8-mZI.title" = "Chiffrer les flux média (SRTP)";
 
 /* Class = "NSButtonCell"; title = "Encrypt negotiation (TLS)"; ObjectID = "vZH-42-mUi"; */
 "vZH-42-mUi.title" = "Chiffrer les négociations (TLS)";
diff --git a/ui/fr.lproj/AccRingGeneral.strings b/ui/fr.lproj/AccRingGeneral.strings
index a79c00890531216d41be2edef571fb7908d7c0cc..7475aab21d4d0ee634a733dfc3d0b45adc0106b6 100644
--- a/ui/fr.lproj/AccRingGeneral.strings
+++ b/ui/fr.lproj/AccRingGeneral.strings
@@ -18,7 +18,7 @@
 "WEo-a0-wVL.ibShadowedToolTip" = "Modifier le nom";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "Yf6-8d-SNh"; */
-"Yf6-8d-SNh.title" = "Remove Account";
+"Yf6-8d-SNh.title" = "Supprimer le compte";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
 "aQL-hX-CfA.title" = "Cellule de texte";
@@ -45,10 +45,10 @@
 "oVO-wj-fwQ.title" = "Boîte";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
-"oga-WC-4gb.title" = "Linked devices";
+"oga-WC-4gb.title" = "Appareils associés";
 
 /* Class = "NSTextFieldCell"; title = "Identifier:"; ObjectID = "qx7-i1-3Na"; */
-"qx7-i1-3Na.title" = "Identifier:";
+"qx7-i1-3Na.title" = "Identifiant :";
 
 /* Class = "NSButtonCell"; title = "Link another device"; ObjectID = "tWk-Od-BEQ"; */
 "tWk-Od-BEQ.title" = "Associer un nouvel appareil";
diff --git a/ui/fr.lproj/AccSipGeneral.strings b/ui/fr.lproj/AccSipGeneral.strings
index 16fbb7851cf4ef3265e060752b51558437315524..91130f97ee69f7ee381f3af5123a71d64a0ac5af 100644
--- a/ui/fr.lproj/AccSipGeneral.strings
+++ b/ui/fr.lproj/AccSipGeneral.strings
@@ -3,7 +3,7 @@
 "688-Sx-Gvr.title" = "Serveur mandataire";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Fj6-Q3-Gz3"; */
-"Fj6-Q3-Gz3.title" = "User Name";
+"Fj6-Q3-Gz3.title" = "Nom d'utilisateur";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "NlM-R9-ola"; */
 "NlM-R9-ola.title" = "Boîte";
@@ -18,7 +18,7 @@
 "Yof-e7-IBF.title" = "Mot de passe";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ZKc-70-TFH"; */
-"ZKc-70-TFH.title" = "SIP Server";
+"ZKc-70-TFH.title" = "Adresse du serveur SIP";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "eQt-bc-Eev"; */
 "eQt-bc-Eev.title" = "Compte";
@@ -30,10 +30,10 @@
 "jdU-uZ-Rfy.title" = "Éditer le compte";
 
 /* Class = "NSButtonCell"; title = "enable"; ObjectID = "nW8-pd-fNj"; */
-"nW8-pd-fNj.title" = "enable";
+"nW8-pd-fNj.title" = "Activer";
 
 /* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "oE8-tN-SfC"; */
 "oE8-tN-SfC.title" = "Profil";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "uFM-Am-0kz"; */
-"uFM-Am-0kz.title" = "Remove Account";
+"uFM-Am-0kz.title" = "Supprimer le compte";
diff --git a/ui/fr.lproj/AddSIPAccountVC.strings b/ui/fr.lproj/AddSIPAccountVC.strings
index d444fadb818afaa8450b3bc0c947838b7ccc565e..8c1d00aa6cffb86075c7b0344560f6e3e2da1c55 100644
--- a/ui/fr.lproj/AddSIPAccountVC.strings
+++ b/ui/fr.lproj/AddSIPAccountVC.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter SIP address"; ObjectID = "0UI-j5-0at"; */
-"0UI-j5-0at.placeholderString" = "Enter SIP address";
+"0UI-j5-0at.placeholderString" = "Entrer une adresse SIP";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "Aem-zQ-Ya3"; */
 "Aem-zQ-Ya3.title" = "Mot de passe";
@@ -18,7 +18,7 @@
 "Rej-Yd-PDb.placeholderString" = "Entrez le nom d'utilisateur";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Srm-hv-9WR"; */
-"Srm-hv-9WR.title" = "User Name";
+"Srm-hv-9WR.title" = "Nom d'utilisateur";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YeS-R8-ZLT"; */
 "YeS-R8-ZLT.placeholderString" = "Entrer un nom";
@@ -27,7 +27,7 @@
 "fgN-nq-QdO.title" = "Profil";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ubR-HD-O15"; */
-"ubR-HD-O15.title" = "SIP Server";
+"ubR-HD-O15.title" = "Adresse du serveur SIP";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "zAN-HT-1oE"; */
 "zAN-HT-1oE.title" = "Compte";
diff --git a/ui/fr.lproj/LeaveMessageVC.strings b/ui/fr.lproj/LeaveMessageVC.strings
index a33e25e01919bc2c573c9853c41fc8c997500246..5362c65f9659ee929814952cbcef8349287f1709 100644
--- a/ui/fr.lproj/LeaveMessageVC.strings
+++ b/ui/fr.lproj/LeaveMessageVC.strings
@@ -12,7 +12,7 @@
 "Zlv-nH-Y9y.title" = "Boîte";
 
 /* Class = "NSTextFieldCell"; title = "Contact appears to be busy. Leave a message?"; ObjectID = "hnr-x5-xnb"; */
-"hnr-x5-xnb.title" = "Contact appears to be busy. Leave a message?";
+"hnr-x5-xnb.title" = "Votre interlocuteur semble occupé. Souhaitez-vous lui laisser une message ?";
 
 /* Class = "NSTextFieldCell"; title = "Recording"; ObjectID = "kIq-PG-Ymw"; */
 "kIq-PG-Ymw.title" = "Enregistrement";
diff --git a/ui/fr.lproj/Localizable.strings b/ui/fr.lproj/Localizable.strings
index 66be9dfc31d494de41e1656432ffdd0a96bb3529..482fc9c70182a8e570fc02e20db6bec4d9f3ab8d 100644
--- a/ui/fr.lproj/Localizable.strings
+++ b/ui/fr.lproj/Localizable.strings
@@ -86,7 +86,7 @@
 "Incoming call from %@" = "Appel entrant de %@";
 
 /* Incoming message from {Name} */
-"Incoming message from %@" = "Incoming message from %@";
+"Incoming message from %@" = "Message entrant de %@";
 
 /* Message from {Name} */
 "Message from %@" = "Message de %@";
@@ -153,16 +153,16 @@
 "The entered username is not available" = "Le nom choisi n'est pas disponible";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Jami account format:" = "The following account needs to be migrated to the new Jami account format:";
+"The following account needs to be migrated to the new Jami account format:" = "Le compte suivant doit être migré vers le nouveau format Jami";
 
 /* Error shown to the user */
 "The password you entered does not unlock this account" = "Le mot de passe fourni ne déverouille pas ce compte";
 
 /* Title shown to user to concat with Pin */
-"To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+"To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "Pour compléter le processus, ouvrer Ring sur le nouvel appareil, et choisir l'option \"Lier cet appareil à un compte\". Le NIP est valide pendant 10 minutes.";
 
 /* Text shown to the user */
-"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later.";
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later." = "Pour continuer, choisissez un mot de passe pour ce compte. Ce mot de passe sera utilisé pour encrypter votre compte. Il sera requis pour lier de nouveaux appareils à ce compte Jami.\nSi vous n'êtes pas prêt à choisir un mot de passe, vous pouvez fermer Jami et reprendre la migration plus tard.";
 
 /* Name used when user leave field empty */
 "Unknown" = "Inconnu";
@@ -180,18 +180,18 @@
 "Select archive" = "Sélectionner un fichier archive";
 
 /* link account title */
-"Link to an account" = "Link to an account";
+"Link to an account" = "Lier à un compte existant";
 
 /* Welcome title */
 "Welcome to Ring" = "Bienvenu sur Jami";
 "Create a new account" = "Créer un nouveau compte";
-"Add a SIP account" = "Add a SIP account";
+"Add a SIP account" = "Ajouter un compte SIP";
 
 /* Notification message */
-"Send you a contact request" = "Send you a contact request";
+"Send you a contact request" = "Nouvelle demande de contact  ";
 
 /* Explanation label when user have Jami username */
-"This is your Jami username. \nCopy and share it with your friends!" = "This is your Jami username. \nCopy and share it with your friends!";
+"This is your Jami username. \nCopy and share it with your friends!" = "Ceci est votre nom d'utilisateur Jami. Conservez et partagez-le avec vos amis !";
 
 /* Explanation label when user have just ID */
-"This is your ID. \nCopy and share it with your friends!" = "This is your ID. \nCopy and share it with your friends!";
+"This is your ID. \nCopy and share it with your friends!" = "Ceci est votre identifiant Jami. Conservez et partagez-le avec vos amis !";
diff --git a/ui/fr.lproj/PasswordChange.strings b/ui/fr.lproj/PasswordChange.strings
index 8fb738a0c1c2cec6fd5bf793032cb09c6b09cb19..0c8862a54e035c6023069aafdd8ca3c9b9de5648 100644
--- a/ui/fr.lproj/PasswordChange.strings
+++ b/ui/fr.lproj/PasswordChange.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
-"8KO-IO-ykP.title" = "Repeat";
+"8KO-IO-ykP.title" = "Répéter";
 
 /* Class = "NSButtonCell"; title = "Accept"; ObjectID = "Ggu-EQ-cqC"; */
 "Ggu-EQ-cqC.title" = "Accepter";
@@ -9,10 +9,10 @@
 "MZw-ep-8aW.title" = "Annuler";
 
 /* Class = "NSTextFieldCell"; title = "Password is incorrect"; ObjectID = "WyU-Dx-U1u"; */
-"WyU-Dx-U1u.title" = "Password is incorrect";
+"WyU-Dx-U1u.title" = "Mot de passe incorrect ";
 
 /* Class = "NSTextFieldCell"; title = "Old password"; ObjectID = "gPw-Jf-0M7"; */
-"gPw-Jf-0M7.title" = "Old password";
+"gPw-Jf-0M7.title" = "Ancien mot de passe";
 
 /* Class = "NSTextFieldCell"; title = "New password"; ObjectID = "pZe-DO-jWp"; */
 "pZe-DO-jWp.title" = "Nouveau mot de passe";
diff --git a/ui/fr.lproj/RingWizardLinkAccount.strings b/ui/fr.lproj/RingWizardLinkAccount.strings
index 57c6e8a66f284d0e38ce8999f3503115a0b4c9a1..98d59ebccb1aeae25267f15e68815b5999dd6807 100644
--- a/ui/fr.lproj/RingWizardLinkAccount.strings
+++ b/ui/fr.lproj/RingWizardLinkAccount.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSTextFieldCell"; title = "To link this device to another account, you have two possibilities:"; ObjectID = "06g-zM-5Qz"; */
-"06g-zM-5Qz.title" = "To link this device to another account, you have two possibilities:";
+"06g-zM-5Qz.title" = "Pour associer cet appareil à un compte, vous avez deux possibilités:";
 
 /* Class = "NSTextFieldCell"; title = "OR"; ObjectID = "1NY-Yu-wH1"; */
-"1NY-Yu-wH1.title" = "OR";
+"1NY-Yu-wH1.title" = "ou";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes."; ObjectID = "2uK-1s-tk7"; */
-"2uK-1s-tk7.title" = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes.";
+"2uK-1s-tk7.title" = "Pour lier cet appareil à un compte, vous devez obtenir votre NIP.\nPour générer ce NIP, allez dans les paramètres du compte Jami à utiliser sur un appareil déjà lié et sélectionner \"Lier un autre appareil avec ce compte\".\nVous obtiendrez un NIP nécessaire.\nLe NIP est valide pendant 10 minutes.";
 
 /* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
 "3ik-rY-Gig.title" = "Entrer votre NIP";
@@ -36,13 +36,13 @@
 "WlR-QM-tK4.ibShadowedNotApplicablePlaceholder" = "Mot de passe ...";
 
 /* Class = "NSButtonCell"; title = "Select file"; ObjectID = "XJE-cy-nfQ"; */
-"XJE-cy-nfQ.title" = "Select file";
+"XJE-cy-nfQ.title" = "Sélectionner un fichier";
 
 /* Class = "NSTextFieldCell"; title = "Import archive file"; ObjectID = "kXa-FL-Enf"; */
-"kXa-FL-Enf.title" = "Import archive file";
+"kXa-FL-Enf.title" = "Importer un fichier archive : ";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can directly import your account from an archive file on your device."; ObjectID = "kfe-m7-MTT"; */
-"kfe-m7-MTT.title" = "\tYou can directly import your account from an archive file on your device.";
+"kfe-m7-MTT.title" = "\tYVous pouvez importez directement votre compte à partir d'un fichier archive.";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "OK";
@@ -60,4 +60,4 @@
 "vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "NIP";
 
 /* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
-"zWn-4H-ODH.title" = "Linking...";
+"zWn-4H-ODH.title" = "Association en cours ...";
diff --git a/ui/fr_CA.lproj/Localizable.strings b/ui/fr_CA.lproj/Localizable.strings
index 5ddbad8abac24ab52d37107f4b0390681a92c204..727d8926597ac94510adebb73bdf0d8f8f8d9279 100644
--- a/ui/fr_CA.lproj/Localizable.strings
+++ b/ui/fr_CA.lproj/Localizable.strings
@@ -156,7 +156,7 @@
 "The following account needs to be migrated to the new Jami account format:" = "The following account needs to be migrated to the new Jami account format:";
 
 /* Error shown to the user */
-"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+"The password you entered does not unlock this account" = "Le mot-de-passe entré ne déverrouille pas ce compte.";
 
 /* Title shown to user to concat with Pin */
 "To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
diff --git a/ui/hr.lproj/AccAdvancedRing.strings b/ui/hr.lproj/AccAdvancedRing.strings
index e988f6afe092d7b17b26c9ea2490af083106bf73..b79e1d1d6e047311e27b620f858e2e32636246f1 100644
--- a/ui/hr.lproj/AccAdvancedRing.strings
+++ b/ui/hr.lproj/AccAdvancedRing.strings
@@ -15,7 +15,7 @@
 "8mv-Ia-GM4.title" = "TURN address";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "BIS-Ft-yJn"; */
-"BIS-Ft-yJn.title" = "Call settings";
+"BIS-Ft-yJn.title" = "Postavke zvanja";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "DSe-Cs-oD6"; */
 "DSe-Cs-oD6.title" = "Auto answer calls";
@@ -39,7 +39,7 @@
 "Qxp-I4-A7W.title" = "Sigurnost";
 
 /* Class = "NSButtonCell"; title = "Enable proxy"; ObjectID = "VyP-8T-aNA"; */
-"VyP-8T-aNA.title" = "Enable proxy";
+"VyP-8T-aNA.title" = "Omogući proxy";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
 "Wrh-zD-uh5.title" = "Video kodeci";
@@ -84,10 +84,10 @@
 "nqX-Vu-UuA.title" = "Koristi STUN";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "qFq-Yh-2JL"; */
-"qFq-Yh-2JL.title" = "Custom ringtone";
+"qFq-Yh-2JL.title" = "Prilagođena melodija zvona";
 
 /* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "sVe-iG-OCw"; */
-"sVe-iG-OCw.title" = "Connectivity";
+"sVe-iG-OCw.title" = "Spojivost";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "soR-nF-ybe"; */
 "soR-nF-ybe.title" = "Privatni ključ";
@@ -99,7 +99,7 @@
 "vYi-gW-MrY.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "OpenDHT configuration"; ObjectID = "xJT-ij-69q"; */
-"xJT-ij-69q.title" = "OpenDHT configuration";
+"xJT-ij-69q.title" = "OpenDHT konfiguracija";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "zPJ-cO-neQ"; */
 "zPJ-cO-neQ.title" = "Koristi TURN";
diff --git a/ui/hr.lproj/AccAdvancedSip.strings b/ui/hr.lproj/AccAdvancedSip.strings
index 88f4ee6a1f32d5c76bdd74cd2de2a32ce3a9f141..57654bb6906a9ca9a9302d82a3042d543a000bae 100644
--- a/ui/hr.lproj/AccAdvancedSip.strings
+++ b/ui/hr.lproj/AccAdvancedSip.strings
@@ -12,7 +12,7 @@
 "2rB-Bv-c9U.title" = "Registration expire timeout (seconds)";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "3Uq-Nb-J1A"; */
-"3Uq-Nb-J1A.title" = "Call settings";
+"3Uq-Nb-J1A.title" = "Postavke zvanja";
 
 /* Class = "NSButtonCell"; title = "Fallback on RTP on encryption failure"; ObjectID = "3rM-KT-bNf"; */
 "3rM-KT-bNf.title" = "Fallback on RTP on encryption failure";
@@ -30,7 +30,7 @@
 "8JD-11-wHZ.title" = "Ime odlaznoga TSL poslužitelja";
 
 /* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "8bw-iH-XGl"; */
-"8bw-iH-XGl.title" = "Item 1";
+"8bw-iH-XGl.title" = "Stavka 1";
 
 /* Class = "NSTextFieldCell"; title = "Port"; ObjectID = "9p9-GR-XKU"; */
 "9p9-GR-XKU.title" = "Port";
@@ -39,7 +39,7 @@
 "A31-3Y-z4R.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Published address"; ObjectID = "ELr-A7-mGE"; */
-"ELr-A7-mGE.title" = "Published address";
+"ELr-A7-mGE.title" = "Objavljena adresa";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "Gwi-Mp-NpZ"; */
 "Gwi-Mp-NpZ.title" = "Koristi TURN";
@@ -60,13 +60,13 @@
 "MBR-AC-HFq.title" = "Box";
 
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Mho-w1-ZPJ"; */
-"Mho-w1-ZPJ.title" = "Item 3";
+"Mho-w1-ZPJ.title" = "Stavka 3";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "Nqr-gj-dOH"; */
-"Nqr-gj-dOH.title" = "Custom ringtone";
+"Nqr-gj-dOH.title" = "Prilagođena melodija zvona";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
-"OEo-C7-vEh.title" = "Item 2";
+"OEo-C7-vEh.title" = "Stavka 2";
 
 /* Class = "NSTextFieldCell"; title = "Audio RTP port Range"; ObjectID = "Ogj-NW-fZ9"; */
 "Ogj-NW-fZ9.title" = "Audio RTP port Range";
@@ -117,7 +117,7 @@
 "ekM-Cg-DEo.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Network interface"; ObjectID = "fjH-ej-gEr"; */
-"fjH-ej-gEr.title" = "Network interface";
+"fjH-ej-gEr.title" = "Mrežno sučelje";
 
 /* Class = "NSButtonCell"; title = "Verify incoming sertificates (server side)"; ObjectID = "fyT-bU-m54"; */
 "fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
@@ -138,7 +138,7 @@
 "nq0-Js-9Cr.title" = "Minimalno";
 
 /* Class = "NSButtonCell"; title = "Use custom address and port"; ObjectID = "nuq-Wl-sfd"; */
-"nuq-Wl-sfd.title" = "Use custom address and port";
+"nuq-Wl-sfd.title" = "Koristi prilagođenu adresu i port";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "rMN-Wf-tmp"; */
 "rMN-Wf-tmp.title" = "TURN korisničko ime";
@@ -150,7 +150,7 @@
 "vZH-42-mUi.title" = "Encrypt negotiation (TLS)";
 
 /* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "vpo-fl-9TS"; */
-"vpo-fl-9TS.title" = "Connectivity";
+"vpo-fl-9TS.title" = "Spojivost";
 
 /* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "wq6-KV-8X3"; */
 "wq6-KV-8X3.title" = "Maksimalno";
diff --git a/ui/hu.lproj/AccAdvancedRing.strings b/ui/hu.lproj/AccAdvancedRing.strings
index 1d0859575c293008372d271127268d0731e4c8fd..a712e3806b261b1d1839d5b2d96c5cc6f105aec0 100644
--- a/ui/hu.lproj/AccAdvancedRing.strings
+++ b/ui/hu.lproj/AccAdvancedRing.strings
@@ -12,7 +12,7 @@
 "7eU-EP-4br.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "8mv-Ia-GM4"; */
-"8mv-Ia-GM4.title" = "TURN address";
+"8mv-Ia-GM4.title" = "TURN cím";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "BIS-Ft-yJn"; */
 "BIS-Ft-yJn.title" = "Hívás beállítások";
@@ -39,16 +39,16 @@
 "Qxp-I4-A7W.title" = "Biztonság";
 
 /* Class = "NSButtonCell"; title = "Enable proxy"; ObjectID = "VyP-8T-aNA"; */
-"VyP-8T-aNA.title" = "Enable proxy";
+"VyP-8T-aNA.title" = "Meghatalmazott engedélyezése";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
 "Wrh-zD-uh5.title" = "Videócodekek";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "XU0-bl-lDD"; */
-"XU0-bl-lDD.title" = "TURN realm";
+"XU0-bl-lDD.title" = "TURN tartomány";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "YE4-ry-u07"; */
-"YE4-ry-u07.title" = "STUN address";
+"YE4-ry-u07.title" = "STUN cím";
 
 /* Class = "NSTextFieldCell"; title = "Bootstrap"; ObjectID = "YJM-iQ-0lE"; */
 "YJM-iQ-0lE.title" = "Betöltés";
diff --git a/ui/hu.lproj/AccAdvancedSip.strings b/ui/hu.lproj/AccAdvancedSip.strings
index b4cff6690c0e6b8df4e9b301c874c72498d02a25..076ea2f0393b2b8cdc94414a13d8dc39ea318d30 100644
--- a/ui/hu.lproj/AccAdvancedSip.strings
+++ b/ui/hu.lproj/AccAdvancedSip.strings
@@ -21,7 +21,7 @@
 "3vs-TI-tkg.title" = "Hívások önműködő fogadása";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "6eH-la-JbF"; */
-"6eH-la-JbF.title" = "TURN realm";
+"6eH-la-JbF.title" = "TURN tartomány";
 
 /* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "72p-GY-gu6"; */
 "72p-GY-gu6.title" = "Személyes kulcs jelszó";
@@ -48,7 +48,7 @@
 "HRM-FR-1sH.title" = "STUN használata";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "HYt-sW-yd0"; */
-"HYt-sW-yd0.title" = "STUN address";
+"HYt-sW-yd0.title" = "STUN cím";
 
 /* Class = "NSButtonCell"; title = "Require a certificate for incoming TLS connections"; ObjectID = "JV8-cY-6vR"; */
 "JV8-cY-6vR.title" = "Tanúsítvány megkövetelése a bejövő TLS kapcsolatokhoz";
@@ -99,13 +99,13 @@
 "Zuz-jy-rLn.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "aYs-wh-Hpr"; */
-"aYs-wh-Hpr.title" = "TURN address";
+"aYs-wh-Hpr.title" = "TURN cím";
 
 /* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "b2y-85-ZHK"; */
 "b2y-85-ZHK.title" = "CA tanúsítvány";
 
 /* Class = "NSTextFieldCell"; title = "Only used during SDP negotiation in case ICE is not supported"; ObjectID = "cN3-lC-dNM"; */
-"cN3-lC-dNM.title" = "Only used during SDP negotiation in case ICE is not supported";
+"cN3-lC-dNM.title" = "Csak az SDP-tárgyalások során használatos ha az ICE nem támogatott";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "cwV-lc-jju"; */
 "cwV-lc-jju.title" = "Box";
@@ -120,7 +120,7 @@
 "fjH-ej-gEr.title" = "Hálózati felület";
 
 /* Class = "NSButtonCell"; title = "Verify incoming sertificates (server side)"; ObjectID = "fyT-bU-m54"; */
-"fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
+"fyT-bU-m54.title" = "A bejövő tanúsítványok ellenőrzése (kiszolgálóoldali)";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "gJs-aX-7Ox"; */
 "gJs-aX-7Ox.title" = "Videócodekek";
@@ -144,7 +144,7 @@
 "rMN-Wf-tmp.title" = "TURN felhasználónév";
 
 /* Class = "NSButtonCell"; title = "Encrypt media streams(SRTP)"; ObjectID = "vCS-s8-mZI"; */
-"vCS-s8-mZI.title" = "Encrypt media streams(SRTP)";
+"vCS-s8-mZI.title" = "Média-adatfolyamok titkosítása (SRTP)";
 
 /* Class = "NSButtonCell"; title = "Encrypt negotiation (TLS)"; ObjectID = "vZH-42-mUi"; */
 "vZH-42-mUi.title" = "Titkosítási tárgyalás (TLS)";
diff --git a/ui/hu.lproj/AccRingGeneral.strings b/ui/hu.lproj/AccRingGeneral.strings
index e20bcbe866b33108bd47c3337eb7dfff4fa15fee..e3be361b87bbc499a0c0a453c91de22df4535b1e 100644
--- a/ui/hu.lproj/AccRingGeneral.strings
+++ b/ui/hu.lproj/AccRingGeneral.strings
@@ -18,7 +18,7 @@
 "WEo-a0-wVL.ibShadowedToolTip" = "Név szerkesztése";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "Yf6-8d-SNh"; */
-"Yf6-8d-SNh.title" = "Remove Account";
+"Yf6-8d-SNh.title" = "Fiók eltávolítása";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
 "aQL-hX-CfA.title" = "Szöveges cella";
@@ -27,7 +27,7 @@
 "bOY-mY-1Yo.ibShadowedToolTip" = "Letiltás feloldása";
 
 /* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "fPK-Zv-Uom"; */
-"fPK-Zv-Uom.title" = "Username:";
+"fPK-Zv-Uom.title" = "Felhasználónév:";
 
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "gLp-qz-XYs"; */
 "gLp-qz-XYs.title" = "Bejegyez";
@@ -45,10 +45,10 @@
 "oVO-wj-fwQ.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
-"oga-WC-4gb.title" = "Linked devices";
+"oga-WC-4gb.title" = "Összekapcsolt eszközök";
 
 /* Class = "NSTextFieldCell"; title = "Identifier:"; ObjectID = "qx7-i1-3Na"; */
-"qx7-i1-3Na.title" = "Identifier:";
+"qx7-i1-3Na.title" = "Azonosító:";
 
 /* Class = "NSButtonCell"; title = "Link another device"; ObjectID = "tWk-Od-BEQ"; */
 "tWk-Od-BEQ.title" = "Csatlakoztasson másik eszközt";
diff --git a/ui/hu.lproj/AccSipGeneral.strings b/ui/hu.lproj/AccSipGeneral.strings
index 1d844def4f05611e57a05b0a20b345887b7be248..1953c6f03a8634f518416739c83bbfd4aface112 100644
--- a/ui/hu.lproj/AccSipGeneral.strings
+++ b/ui/hu.lproj/AccSipGeneral.strings
@@ -3,7 +3,7 @@
 "688-Sx-Gvr.title" = "Meghatalmazott";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Fj6-Q3-Gz3"; */
-"Fj6-Q3-Gz3.title" = "User Name";
+"Fj6-Q3-Gz3.title" = "Felhasználónév";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "NlM-R9-ola"; */
 "NlM-R9-ola.title" = "Box";
@@ -18,7 +18,7 @@
 "Yof-e7-IBF.title" = "Jelszó";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ZKc-70-TFH"; */
-"ZKc-70-TFH.title" = "SIP Server";
+"ZKc-70-TFH.title" = "SIP-kiszolgáló";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "eQt-bc-Eev"; */
 "eQt-bc-Eev.title" = "Fiók";
@@ -30,10 +30,10 @@
 "jdU-uZ-Rfy.title" = "Fiók szerkesztése";
 
 /* Class = "NSButtonCell"; title = "enable"; ObjectID = "nW8-pd-fNj"; */
-"nW8-pd-fNj.title" = "enable";
+"nW8-pd-fNj.title" = "engedélyezés";
 
 /* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "oE8-tN-SfC"; */
 "oE8-tN-SfC.title" = "Profil";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "uFM-Am-0kz"; */
-"uFM-Am-0kz.title" = "Remove Account";
+"uFM-Am-0kz.title" = "Fiók eltávolítása";
diff --git a/ui/hu.lproj/AddSIPAccountVC.strings b/ui/hu.lproj/AddSIPAccountVC.strings
index 3081568500870d7af91a2909641c18e8c3645032..0f13bb9cb84ecd5bdb0d01b6c3c7f03886488843 100644
--- a/ui/hu.lproj/AddSIPAccountVC.strings
+++ b/ui/hu.lproj/AddSIPAccountVC.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter SIP address"; ObjectID = "0UI-j5-0at"; */
-"0UI-j5-0at.placeholderString" = "Enter SIP address";
+"0UI-j5-0at.placeholderString" = "Adja meg a SIP-címet";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "Aem-zQ-Ya3"; */
 "Aem-zQ-Ya3.title" = "Jelszó";
@@ -18,7 +18,7 @@
 "Rej-Yd-PDb.placeholderString" = "Felhasználónév megadása";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Srm-hv-9WR"; */
-"Srm-hv-9WR.title" = "User Name";
+"Srm-hv-9WR.title" = "Felhasználónév";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YeS-R8-ZLT"; */
 "YeS-R8-ZLT.placeholderString" = "Név megadása";
@@ -27,7 +27,7 @@
 "fgN-nq-QdO.title" = "Profil";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ubR-HD-O15"; */
-"ubR-HD-O15.title" = "SIP Server";
+"ubR-HD-O15.title" = "SIP-kiszolgáló";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "zAN-HT-1oE"; */
 "zAN-HT-1oE.title" = "Fiók";
diff --git a/ui/hu.lproj/LeaveMessageVC.strings b/ui/hu.lproj/LeaveMessageVC.strings
index cf78e7f73906886424563fc906322040ec53b0cc..36a99a3710ccdff5126ef8adc9292da32dc4d4e9 100644
--- a/ui/hu.lproj/LeaveMessageVC.strings
+++ b/ui/hu.lproj/LeaveMessageVC.strings
@@ -12,7 +12,7 @@
 "Zlv-nH-Y9y.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Contact appears to be busy. Leave a message?"; ObjectID = "hnr-x5-xnb"; */
-"hnr-x5-xnb.title" = "Contact appears to be busy. Leave a message?";
+"hnr-x5-xnb.title" = "A kapcsolat valószínűleg elfoglalt. Üzenet hagyása?";
 
 /* Class = "NSTextFieldCell"; title = "Recording"; ObjectID = "kIq-PG-Ymw"; */
 "kIq-PG-Ymw.title" = "Felvétel";
diff --git a/ui/hu.lproj/PasswordChange.strings b/ui/hu.lproj/PasswordChange.strings
index f0f99bacf75d91e336d40cd33fa9cef05eb5048b..8e21054ea35f0b5a18579b01f7a667b158af189f 100644
--- a/ui/hu.lproj/PasswordChange.strings
+++ b/ui/hu.lproj/PasswordChange.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
-"8KO-IO-ykP.title" = "Repeat";
+"8KO-IO-ykP.title" = "Jelszó megerősítése";
 
 /* Class = "NSButtonCell"; title = "Accept"; ObjectID = "Ggu-EQ-cqC"; */
 "Ggu-EQ-cqC.title" = "Elfogadás";
@@ -9,10 +9,10 @@
 "MZw-ep-8aW.title" = "Mégse";
 
 /* Class = "NSTextFieldCell"; title = "Password is incorrect"; ObjectID = "WyU-Dx-U1u"; */
-"WyU-Dx-U1u.title" = "Password is incorrect";
+"WyU-Dx-U1u.title" = "Hibás jelszót";
 
 /* Class = "NSTextFieldCell"; title = "Old password"; ObjectID = "gPw-Jf-0M7"; */
-"gPw-Jf-0M7.title" = "Old password";
+"gPw-Jf-0M7.title" = "Régi jelszó";
 
 /* Class = "NSTextFieldCell"; title = "New password"; ObjectID = "pZe-DO-jWp"; */
 "pZe-DO-jWp.title" = "Új jelszó";
diff --git a/ui/hu.lproj/RingWizardLinkAccount.strings b/ui/hu.lproj/RingWizardLinkAccount.strings
index 4d9d4e3ec78356930342fd900e9aa75242854780..d4d23d1e14454e5530f926bd30e1bcce3d396608 100644
--- a/ui/hu.lproj/RingWizardLinkAccount.strings
+++ b/ui/hu.lproj/RingWizardLinkAccount.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSTextFieldCell"; title = "To link this device to another account, you have two possibilities:"; ObjectID = "06g-zM-5Qz"; */
-"06g-zM-5Qz.title" = "To link this device to another account, you have two possibilities:";
+"06g-zM-5Qz.title" = "Az eszköz másik fiókhoz való kapcsolásához két lehetősége van:";
 
 /* Class = "NSTextFieldCell"; title = "OR"; ObjectID = "1NY-Yu-wH1"; */
-"1NY-Yu-wH1.title" = "OR";
+"1NY-Yu-wH1.title" = "VAGY";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes."; ObjectID = "2uK-1s-tk7"; */
-"2uK-1s-tk7.title" = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes.";
+"2uK-1s-tk7.title" = "Az eszköz másik fiókhoz kapcsolásához, először is a PIN-kód megszerzésére van szükség. A PIN-kód előállításához menjen egy korábbi eszköz fiókkezelési beállításába, válassza ki a használandó Jami-fiókot, és válassza a „Másik eszköz hozzákapcsolása ehhez a fiókhoz” lehetőséget. Meg fogja kapni az űrlap kitöltéséhez szükséges PIN-kódot. A PIN-kód csak 10 percig érvényes.";
 
 /* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
 "3ik-rY-Gig.title" = "Adja meg a PIN-kódot";
@@ -36,13 +36,13 @@
 "WlR-QM-tK4.ibShadowedNotApplicablePlaceholder" = "Jelszó…";
 
 /* Class = "NSButtonCell"; title = "Select file"; ObjectID = "XJE-cy-nfQ"; */
-"XJE-cy-nfQ.title" = "Select file";
+"XJE-cy-nfQ.title" = "Válasszon ki egy fájlt";
 
 /* Class = "NSTextFieldCell"; title = "Import archive file"; ObjectID = "kXa-FL-Enf"; */
-"kXa-FL-Enf.title" = "Import archive file";
+"kXa-FL-Enf.title" = "Archív fájl importálása";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can directly import your account from an archive file on your device."; ObjectID = "kfe-m7-MTT"; */
-"kfe-m7-MTT.title" = "\tYou can directly import your account from an archive file on your device.";
+"kfe-m7-MTT.title" = "Közvetlenül importálhatja fiókját egy eszköz archív fájljából.";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "OK";
@@ -60,4 +60,4 @@
 "vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "PIN-kód";
 
 /* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
-"zWn-4H-ODH.title" = "Linking...";
+"zWn-4H-ODH.title" = "Összekapcsolása…";
diff --git a/ui/it.lproj/Localizable.strings b/ui/it.lproj/Localizable.strings
index 42f77769cd5958366bfc2c1b33b1baee05cca360..3fd9fbb5e2bb20ead01d3084c8060c3cd0a6bae8 100644
--- a/ui/it.lproj/Localizable.strings
+++ b/ui/it.lproj/Localizable.strings
@@ -17,7 +17,7 @@
 "Clear conversation" = "Clear conversation";
 
 /* Contextual menu action */
-"Block contact" = "Block contact";
+"Block contact" = "Blocca contatto";
 
 /* Text shown to the user */
 "Alias : " = "Alias : ";
diff --git a/ui/it.lproj/MainMenu.strings b/ui/it.lproj/MainMenu.strings
index 18f5b6b79be2c989f16e8fec29e14b61dfd2f217..93f97b5270fa1d7c8d2916090d6c495db40cc3d7 100644
--- a/ui/it.lproj/MainMenu.strings
+++ b/ui/it.lproj/MainMenu.strings
@@ -21,7 +21,7 @@
 "57.title" = "Jami";
 
 /* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
-"58.title" = "About Jami";
+"58.title" = "Informazioni su Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferenze";
diff --git a/ui/it.lproj/RingWizardChoose.strings b/ui/it.lproj/RingWizardChoose.strings
index b4e3d234c0254d570ffa9bc3b8e617126d24cb32..9f7adc16d02721e471cf0a4e34b7d1335099b0b2 100644
--- a/ui/it.lproj/RingWizardChoose.strings
+++ b/ui/it.lproj/RingWizardChoose.strings
@@ -6,4 +6,4 @@
 "Z9K-mD-ucr.title" = "Collega questo dispositivo a un account";
 
 /* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Jami account";
+"k1T-a7-yZD.title" = "Crea un account Jami";
diff --git a/ui/ru.lproj/AccAdvancedRing.strings b/ui/ru.lproj/AccAdvancedRing.strings
index 21936ca855285cd5a649162ca68d79a28f3c76e2..0b3a2395e43892bfb53d10777532b1da730819ef 100644
--- a/ui/ru.lproj/AccAdvancedRing.strings
+++ b/ui/ru.lproj/AccAdvancedRing.strings
@@ -12,7 +12,7 @@
 "7eU-EP-4br.title" = "Окно";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "8mv-Ia-GM4"; */
-"8mv-Ia-GM4.title" = "TURN address";
+"8mv-Ia-GM4.title" = "Адрес TURN";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "BIS-Ft-yJn"; */
 "BIS-Ft-yJn.title" = "Настройки вызовов";
@@ -33,22 +33,22 @@
 "LWs-a2-E7f.title" = "Сертификат пользователя";
 
 /* Class = "NSTextFieldCell"; title = "Audio codecs"; ObjectID = "Q4t-zo-brK"; */
-"Q4t-zo-brK.title" = "Аудио кодеки";
+"Q4t-zo-brK.title" = "Аудиокодеки";
 
 /* Class = "NSTextFieldCell"; title = "Security"; ObjectID = "Qxp-I4-A7W"; */
 "Qxp-I4-A7W.title" = "Безопасность";
 
 /* Class = "NSButtonCell"; title = "Enable proxy"; ObjectID = "VyP-8T-aNA"; */
-"VyP-8T-aNA.title" = "Enable proxy";
+"VyP-8T-aNA.title" = "Включить прокси";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
-"Wrh-zD-uh5.title" = "Видео кодеки";
+"Wrh-zD-uh5.title" = "Видеокодеки";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "XU0-bl-lDD"; */
-"XU0-bl-lDD.title" = "TURN realm";
+"XU0-bl-lDD.title" = "Домен TURN";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "YE4-ry-u07"; */
-"YE4-ry-u07.title" = "STUN address";
+"YE4-ry-u07.title" = "Адрес STUN";
 
 /* Class = "NSTextFieldCell"; title = "Bootstrap"; ObjectID = "YJM-iQ-0lE"; */
 "YJM-iQ-0lE.title" = "Инициализация";
diff --git a/ui/ru.lproj/AccAdvancedSip.strings b/ui/ru.lproj/AccAdvancedSip.strings
index b09430d66ea3fc082f2c39fbbe98fa6f828dd1b6..0952099d65281bb256dad0e12c4b093ae012f17c 100644
--- a/ui/ru.lproj/AccAdvancedSip.strings
+++ b/ui/ru.lproj/AccAdvancedSip.strings
@@ -21,7 +21,7 @@
 "3vs-TI-tkg.title" = "Автоматически принимать входящие вызовы";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "6eH-la-JbF"; */
-"6eH-la-JbF.title" = "TURN realm";
+"6eH-la-JbF.title" = "Домен TURN";
 
 /* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "72p-GY-gu6"; */
 "72p-GY-gu6.title" = "Пароль закрытого ключа";
@@ -30,7 +30,7 @@
 "8JD-11-wHZ.title" = "Имя исходящего сервера TLS";
 
 /* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "8bw-iH-XGl"; */
-"8bw-iH-XGl.title" = "Item 1";
+"8bw-iH-XGl.title" = "Пункт 1";
 
 /* Class = "NSTextFieldCell"; title = "Port"; ObjectID = "9p9-GR-XKU"; */
 "9p9-GR-XKU.title" = "Порт";
@@ -48,7 +48,7 @@
 "HRM-FR-1sH.title" = "Использовать STUN";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "HYt-sW-yd0"; */
-"HYt-sW-yd0.title" = "STUN address";
+"HYt-sW-yd0.title" = "Адрес STUN";
 
 /* Class = "NSButtonCell"; title = "Require a certificate for incoming TLS connections"; ObjectID = "JV8-cY-6vR"; */
 "JV8-cY-6vR.title" = "Требовать сертификат для входящих TLS соединений";
@@ -60,13 +60,13 @@
 "MBR-AC-HFq.title" = "Окно";
 
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Mho-w1-ZPJ"; */
-"Mho-w1-ZPJ.title" = "Item 3";
+"Mho-w1-ZPJ.title" = "Пункт 3";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "Nqr-gj-dOH"; */
 "Nqr-gj-dOH.title" = "Мелодия звонка";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
-"OEo-C7-vEh.title" = "Item 2";
+"OEo-C7-vEh.title" = "Пункт 2";
 
 /* Class = "NSTextFieldCell"; title = "Audio RTP port Range"; ObjectID = "Ogj-NW-fZ9"; */
 "Ogj-NW-fZ9.title" = "Диапазон портов RTP для звука";
@@ -99,13 +99,13 @@
 "Zuz-jy-rLn.title" = "Окно";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "aYs-wh-Hpr"; */
-"aYs-wh-Hpr.title" = "TURN address";
+"aYs-wh-Hpr.title" = "Адрес TURN";
 
 /* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "b2y-85-ZHK"; */
 "b2y-85-ZHK.title" = "Сертификат удостоверяющего центра";
 
 /* Class = "NSTextFieldCell"; title = "Only used during SDP negotiation in case ICE is not supported"; ObjectID = "cN3-lC-dNM"; */
-"cN3-lC-dNM.title" = "Only used during SDP negotiation in case ICE is not supported";
+"cN3-lC-dNM.title" = "Используется только при согласовании SDP в случае, если ICE не поддерживается";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "cwV-lc-jju"; */
 "cwV-lc-jju.title" = "Окно";
@@ -120,7 +120,7 @@
 "fjH-ej-gEr.title" = "Сетевой интерфейс";
 
 /* Class = "NSButtonCell"; title = "Verify incoming sertificates (server side)"; ObjectID = "fyT-bU-m54"; */
-"fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
+"fyT-bU-m54.title" = "Проверять входящие серверные сертификаты";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "gJs-aX-7Ox"; */
 "gJs-aX-7Ox.title" = "Видео кодеки";
@@ -144,7 +144,7 @@
 "rMN-Wf-tmp.title" = "Имя пользователя TURN";
 
 /* Class = "NSButtonCell"; title = "Encrypt media streams(SRTP)"; ObjectID = "vCS-s8-mZI"; */
-"vCS-s8-mZI.title" = "Encrypt media streams(SRTP)";
+"vCS-s8-mZI.title" = "Шифровать медиапотоки (SRTP)";
 
 /* Class = "NSButtonCell"; title = "Encrypt negotiation (TLS)"; ObjectID = "vZH-42-mUi"; */
 "vZH-42-mUi.title" = "Шифровать разговор (TLS)";
diff --git a/ui/ru.lproj/AccRingGeneral.strings b/ui/ru.lproj/AccRingGeneral.strings
index c3fc671c8e3bbc735d0d615351528b9bf3742361..00a89b164419816cea2554caa65db9b0139720db 100644
--- a/ui/ru.lproj/AccRingGeneral.strings
+++ b/ui/ru.lproj/AccRingGeneral.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Export Account"; ObjectID = "1aj-MG-mHp"; */
-"1aj-MG-mHp.title" = "Export Account";
+"1aj-MG-mHp.title" = "Экспортировать учетную запись";
 
 /* Class = "NSTextFieldCell"; title = "Banned Contacts"; ObjectID = "6fI-98-VvQ"; */
 "6fI-98-VvQ.title" = "Заблокированные контакты";
@@ -9,7 +9,7 @@
 "Hbq-nL-BhK.title" = "Дополнительно";
 
 /* Class = "NSButtonCell"; title = "Enable"; ObjectID = "Op4-XO-WsE"; */
-"Op4-XO-WsE.title" = "Enable";
+"Op4-XO-WsE.title" = "Задействовать";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "TYk-QK-iaT"; */
 "TYk-QK-iaT.title" = "Пароль:";
@@ -18,7 +18,7 @@
 "WEo-a0-wVL.ibShadowedToolTip" = "Редактировать имя";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "Yf6-8d-SNh"; */
-"Yf6-8d-SNh.title" = "Remove Account";
+"Yf6-8d-SNh.title" = " Удаление учетной записи";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
 "aQL-hX-CfA.title" = "Текстовая Ячейка";
@@ -39,16 +39,16 @@
 "kt0-P6-fdQ.placeholderString" = "Введите имя";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Revoke"; ObjectID = "lrB-j5-Mvy"; */
-"lrB-j5-Mvy.ibShadowedToolTip" = "Revoke";
+"lrB-j5-Mvy.ibShadowedToolTip" = "Отвязать";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "oVO-wj-fwQ"; */
 "oVO-wj-fwQ.title" = "Окно";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
-"oga-WC-4gb.title" = "Linked devices";
+"oga-WC-4gb.title" = "Привязанные устройства";
 
 /* Class = "NSTextFieldCell"; title = "Identifier:"; ObjectID = "qx7-i1-3Na"; */
-"qx7-i1-3Na.title" = "Identifier:";
+"qx7-i1-3Na.title" = "Идентификатор:";
 
 /* Class = "NSButtonCell"; title = "Link another device"; ObjectID = "tWk-Od-BEQ"; */
 "tWk-Od-BEQ.title" = "Привязать другое устройство";
diff --git a/ui/ru.lproj/AccSipGeneral.strings b/ui/ru.lproj/AccSipGeneral.strings
index d7ae89addb2cc2aca7c8910fecfb689b30e6aa42..58576973a64cfbb7e19439b2b7c9bd7ff388fa8d 100644
--- a/ui/ru.lproj/AccSipGeneral.strings
+++ b/ui/ru.lproj/AccSipGeneral.strings
@@ -3,7 +3,7 @@
 "688-Sx-Gvr.title" = "Прокси";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Fj6-Q3-Gz3"; */
-"Fj6-Q3-Gz3.title" = "User Name";
+"Fj6-Q3-Gz3.title" = "Имя";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "NlM-R9-ola"; */
 "NlM-R9-ola.title" = "Окно";
@@ -18,7 +18,7 @@
 "Yof-e7-IBF.title" = "Пароль";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ZKc-70-TFH"; */
-"ZKc-70-TFH.title" = "SIP Server";
+"ZKc-70-TFH.title" = "Сервер SIP";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "eQt-bc-Eev"; */
 "eQt-bc-Eev.title" = "Аккаунт";
@@ -30,10 +30,10 @@
 "jdU-uZ-Rfy.title" = "Изменить аккаунт";
 
 /* Class = "NSButtonCell"; title = "enable"; ObjectID = "nW8-pd-fNj"; */
-"nW8-pd-fNj.title" = "enable";
+"nW8-pd-fNj.title" = "Задействовать";
 
 /* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "oE8-tN-SfC"; */
 "oE8-tN-SfC.title" = "Профиль";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "uFM-Am-0kz"; */
-"uFM-Am-0kz.title" = "Remove Account";
+"uFM-Am-0kz.title" = " Удаление учетной записи";
diff --git a/ui/ru.lproj/AddSIPAccountVC.strings b/ui/ru.lproj/AddSIPAccountVC.strings
index b8f0ba2a9fa8214bf5f2a016fdcbcbf15678f425..e09129e8be20b7959d632fee76fd60f8aeb82ed3 100644
--- a/ui/ru.lproj/AddSIPAccountVC.strings
+++ b/ui/ru.lproj/AddSIPAccountVC.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter SIP address"; ObjectID = "0UI-j5-0at"; */
-"0UI-j5-0at.placeholderString" = "Enter SIP address";
+"0UI-j5-0at.placeholderString" = "Введите адрес SIP";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "Aem-zQ-Ya3"; */
 "Aem-zQ-Ya3.title" = "Пароль";
@@ -18,7 +18,7 @@
 "Rej-Yd-PDb.placeholderString" = "Введите имя пользователя";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Srm-hv-9WR"; */
-"Srm-hv-9WR.title" = "User Name";
+"Srm-hv-9WR.title" = "Имя";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YeS-R8-ZLT"; */
 "YeS-R8-ZLT.placeholderString" = "Введите имя";
@@ -27,7 +27,7 @@
 "fgN-nq-QdO.title" = "Профиль";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ubR-HD-O15"; */
-"ubR-HD-O15.title" = "SIP Server";
+"ubR-HD-O15.title" = "Сервер SIP";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "zAN-HT-1oE"; */
 "zAN-HT-1oE.title" = "Аккаунт";
diff --git a/ui/ru.lproj/LeaveMessageVC.strings b/ui/ru.lproj/LeaveMessageVC.strings
index 0beb518ac6cf022128488b8e209cb50fda862c83..ca1d2e4009de04c98ffe307b8de61120c5191748 100644
--- a/ui/ru.lproj/LeaveMessageVC.strings
+++ b/ui/ru.lproj/LeaveMessageVC.strings
@@ -12,7 +12,7 @@
 "Zlv-nH-Y9y.title" = "Окно";
 
 /* Class = "NSTextFieldCell"; title = "Contact appears to be busy. Leave a message?"; ObjectID = "hnr-x5-xnb"; */
-"hnr-x5-xnb.title" = "Contact appears to be busy. Leave a message?";
+"hnr-x5-xnb.title" = "Похоже, собеседник занят. Оставить сообщение?";
 
 /* Class = "NSTextFieldCell"; title = "Recording"; ObjectID = "kIq-PG-Ymw"; */
 "kIq-PG-Ymw.title" = "Запись";
diff --git a/ui/ru.lproj/Localizable.strings b/ui/ru.lproj/Localizable.strings
index a8ee348ff21d207e09e27891778c1fbe3e574bea..0020ba6bc15cee23336484a962761ab5d7b138a4 100644
--- a/ui/ru.lproj/Localizable.strings
+++ b/ui/ru.lproj/Localizable.strings
@@ -8,10 +8,10 @@
 "Add to contacts" = "Добавить в контакты";
 
 /* Contextual menu action */
-"Place video call" = "Place video call";
+"Place video call" = "Сделать видеозвонок";
 
 /* Contextual menu action */
-"Place audio call" = "Place audio call";
+"Place audio call" = "Сделать аудиозвонок";
 
 /* Contextual menu action */
 "Clear conversation" = "Очистить разговор";
@@ -56,7 +56,7 @@
 "Choose file" = "Выбрать файл";
 
 /* Contextual menu entry */
-"Share screen" = "Share screen";
+"Share screen" = "Транслировать экран";
 
 /* No comment provided by engineer. */
 "Copy" = "Копировать";
@@ -86,7 +86,7 @@
 "Incoming call from %@" = "Входящий вызов от %@";
 
 /* Incoming message from {Name} */
-"Incoming message from %@" = "Incoming message from %@";
+"Incoming message from %@" = "Входящее сообщение от %@";
 
 /* Message from {Name} */
 "Message from %@" = "Сообщение от %@";
@@ -95,10 +95,10 @@
 "New SIP account" = "Новый SIP аккаунт";
 
 /* Displayed as RingID when no accounts are available for selection */
-"No account available" = "No account available";
+"No account available" = "Нет аккаунтов";
 
 /* Allert message when no accounts are available */
-"Navigate to preferences to create a new account" = "Navigate to preferences to create a new account";
+"Navigate to preferences to create a new account" = "Зайдите в настройки, чтобы создать аккаунт";
 
 /* Text show to the user when password didn't match */
 "Password and confirmation mismatch." = "Пароль и подтверждение не совпадают.";
@@ -153,16 +153,16 @@
 "The entered username is not available" = "Указанное имя пользователя недоступно";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Jami account format:" = "The following account needs to be migrated to the new Jami account format:";
+"The following account needs to be migrated to the new Jami account format:" = "Следующий аккаунт требуется преобразовать в новый формат аккаунта Jami:";
 
 /* Error shown to the user */
 "The password you entered does not unlock this account" = "Введенный пароль не подходит к этому аккаунту";
 
 /* Title shown to user to concat with Pin */
-"To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+"To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "Для завершения процесса вам нужно открыть Jami на новом устройстве и выбрать \"Привязать это устройство к аккаунту\". Ваш PIN действителен в течение 10 минут.";
 
 /* Text shown to the user */
-"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later.";
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later." = "Чтобы продолжить перенос, вам нужно выбрать пароль для вашего аккаунта. Этот пароль будет использован для шифрования вашего основного ключа. Он потребуется для добавления новых устройств к вашему аккаунту Jami. Если вы не готовы выбрать пароль, можете закрыть Jami и продолжить перенос позднее.";
 
 /* Name used when user leave field empty */
 "Unknown" = "Неизвестно";
@@ -171,27 +171,27 @@
 "You have to migrate your account before exporting" = "Вам нужно перенести аккаунт перед экспортом";
 
 /* Remove account alert title */
-"Remove account" = "Remove account";
+"Remove account" = "Удаление учетной записи";
 
 /* Remove account alert message */
-"By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost." = "By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost." = "Нажатие \"ОК\" удалит данный аккаунт на данном устройстве! Это действие невозможно отменить. Также вы можете потерять зарегистрированное имя!";
 
 /* export account button title */
-"Select archive" = "Select archive";
+"Select archive" = "Выберите архив";
 
 /* link account title */
-"Link to an account" = "Link to an account";
+"Link to an account" = "Привязать к аккаунту";
 
 /* Welcome title */
 "Welcome to Ring" = "Добро пожаловать в Jami";
 "Create a new account" = "Создать новый аккаунт";
-"Add a SIP account" = "Add a SIP account";
+"Add a SIP account" = "Добавить аккаунт SIP";
 
 /* Notification message */
-"Send you a contact request" = "Send you a contact request";
+"Send you a contact request" = "Отправил Вам запрос на добавление в контакты";
 
 /* Explanation label when user have Jami username */
-"This is your Jami username. \nCopy and share it with your friends!" = "This is your Jami username. \nCopy and share it with your friends!";
+"This is your Jami username. \nCopy and share it with your friends!" = "Это ваше имя пользователя Jami.\nСкопируйте и поделитесь им со своими друзьями!";
 
 /* Explanation label when user have just ID */
-"This is your ID. \nCopy and share it with your friends!" = "This is your ID. \nCopy and share it with your friends!";
+"This is your ID. \nCopy and share it with your friends!" = "Это ваш ID.\nСкопируйте и поделитесь им с Вашими друзьями!";
diff --git a/ui/ru.lproj/PasswordChange.strings b/ui/ru.lproj/PasswordChange.strings
index 22035318f16e78ed693fdc44eaa1f3af4a01d863..46ce6189d4ca5d98c3b0bad72be53e70d0c0c246 100644
--- a/ui/ru.lproj/PasswordChange.strings
+++ b/ui/ru.lproj/PasswordChange.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
-"8KO-IO-ykP.title" = "Repeat";
+"8KO-IO-ykP.title" = "Повторите пароль";
 
 /* Class = "NSButtonCell"; title = "Accept"; ObjectID = "Ggu-EQ-cqC"; */
 "Ggu-EQ-cqC.title" = "Принять";
@@ -9,10 +9,10 @@
 "MZw-ep-8aW.title" = "Отмена";
 
 /* Class = "NSTextFieldCell"; title = "Password is incorrect"; ObjectID = "WyU-Dx-U1u"; */
-"WyU-Dx-U1u.title" = "Password is incorrect";
+"WyU-Dx-U1u.title" = "Неправильный пароль";
 
 /* Class = "NSTextFieldCell"; title = "Old password"; ObjectID = "gPw-Jf-0M7"; */
-"gPw-Jf-0M7.title" = "Old password";
+"gPw-Jf-0M7.title" = "Старый пароль";
 
 /* Class = "NSTextFieldCell"; title = "New password"; ObjectID = "pZe-DO-jWp"; */
 "pZe-DO-jWp.title" = "Новый пароль";
diff --git a/ui/ru.lproj/RingWizardLinkAccount.strings b/ui/ru.lproj/RingWizardLinkAccount.strings
index aaa4a83ba29d1e20058977a2055122abb3c216e7..b59521cb40ff6c1e17bf07c8ce6430c81d627709 100644
--- a/ui/ru.lproj/RingWizardLinkAccount.strings
+++ b/ui/ru.lproj/RingWizardLinkAccount.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSTextFieldCell"; title = "To link this device to another account, you have two possibilities:"; ObjectID = "06g-zM-5Qz"; */
-"06g-zM-5Qz.title" = "To link this device to another account, you have two possibilities:";
+"06g-zM-5Qz.title" = "Есть два способа привязать это устройство к аккаунту:";
 
 /* Class = "NSTextFieldCell"; title = "OR"; ObjectID = "1NY-Yu-wH1"; */
-"1NY-Yu-wH1.title" = "OR";
+"1NY-Yu-wH1.title" = "ИЛИ";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes."; ObjectID = "2uK-1s-tk7"; */
-"2uK-1s-tk7.title" = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes.";
+"2uK-1s-tk7.title" = "\tИмпортировать аккаунт с другого устройства (понадобится PIN-код). \n\tЧтобы сгенерировать PIN-код, задйтие в управление аккаунтами на старом устройстве, откройте аккаунт Jami и выберите \"Привязать другое устройство к этому аккаунту\". Вы получите PIN-код для привязки. PIN-код действителен в течении 10 минут.";
 
 /* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
 "3ik-rY-Gig.title" = "Введите PIN";
@@ -36,13 +36,13 @@
 "WlR-QM-tK4.ibShadowedNotApplicablePlaceholder" = "Пароль...";
 
 /* Class = "NSButtonCell"; title = "Select file"; ObjectID = "XJE-cy-nfQ"; */
-"XJE-cy-nfQ.title" = "Select file";
+"XJE-cy-nfQ.title" = "Выберите файл";
 
 /* Class = "NSTextFieldCell"; title = "Import archive file"; ObjectID = "kXa-FL-Enf"; */
-"kXa-FL-Enf.title" = "Import archive file";
+"kXa-FL-Enf.title" = "Импоритровать из файла архива";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can directly import your account from an archive file on your device."; ObjectID = "kfe-m7-MTT"; */
-"kfe-m7-MTT.title" = "\tYou can directly import your account from an archive file on your device.";
+"kfe-m7-MTT.title" = "\tВы можете напрямую импортировать аккаунт из файла архива (бэкапа).";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "ОК";
@@ -60,4 +60,4 @@
 "vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "PIN";
 
 /* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
-"zWn-4H-ODH.title" = "Linking...";
+"zWn-4H-ODH.title" = "Привязка...";
diff --git a/ui/sv.lproj/RingWizardLinkAccount.strings b/ui/sv.lproj/RingWizardLinkAccount.strings
index 905f841bbad45d74aaf32e49a787e236667bbc1a..6a35361ee15d909be63a8012e3893b684991b122 100644
--- a/ui/sv.lproj/RingWizardLinkAccount.strings
+++ b/ui/sv.lproj/RingWizardLinkAccount.strings
@@ -6,7 +6,7 @@
 "1NY-Yu-wH1.title" = "ELLER";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes."; ObjectID = "2uK-1s-tk7"; */
-"2uK-1s-tk7.title" = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes.";
+"2uK-1s-tk7.title" = "\tDu kan importera ditt konto från en annan enhet, men först måste du skaffa en PIN-kod. \n\tFör att generera PIN-koden, går du till kontohanteringen i föregående enhet och väljer det Jami-konto du vill använda, där väljer du \"Koppla en annan enhet till detta konto\". Du får då den nödvändiga PIN-koden för att slutföra detta formulär. Pin-koden är bara giltig i 10 minuter.";
 
 /* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
 "3ik-rY-Gig.title" = "Ange din PIN-kod";
@@ -36,13 +36,13 @@
 "WlR-QM-tK4.ibShadowedNotApplicablePlaceholder" = "Lösenord...";
 
 /* Class = "NSButtonCell"; title = "Select file"; ObjectID = "XJE-cy-nfQ"; */
-"XJE-cy-nfQ.title" = "Select file";
+"XJE-cy-nfQ.title" = "Välj fil";
 
 /* Class = "NSTextFieldCell"; title = "Import archive file"; ObjectID = "kXa-FL-Enf"; */
-"kXa-FL-Enf.title" = "Import archive file";
+"kXa-FL-Enf.title" = "Importera arkivfil";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can directly import your account from an archive file on your device."; ObjectID = "kfe-m7-MTT"; */
-"kfe-m7-MTT.title" = "\tYou can directly import your account from an archive file on your device.";
+"kfe-m7-MTT.title" = "\tDu kan direktimportera ditt konto från en arkivfil på enheten.";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "OK";
@@ -60,4 +60,4 @@
 "vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "PIN-kod";
 
 /* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
-"zWn-4H-ODH.title" = "Linking...";
+"zWn-4H-ODH.title" = "Kopplar...";
diff --git a/ui/tr.lproj/AccAdvancedRing.strings b/ui/tr.lproj/AccAdvancedRing.strings
index 1e705ac771d55258db0344b3f969b06dcc1c32b5..9df58b35b991e62a957532ab50a444e513472dbc 100644
--- a/ui/tr.lproj/AccAdvancedRing.strings
+++ b/ui/tr.lproj/AccAdvancedRing.strings
@@ -15,7 +15,7 @@
 "8mv-Ia-GM4.title" = "TURN address";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "BIS-Ft-yJn"; */
-"BIS-Ft-yJn.title" = "Call settings";
+"BIS-Ft-yJn.title" = "Arama ayarları";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "DSe-Cs-oD6"; */
 "DSe-Cs-oD6.title" = "Auto answer calls";
@@ -84,10 +84,10 @@
 "nqX-Vu-UuA.title" = "STUN kullan";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "qFq-Yh-2JL"; */
-"qFq-Yh-2JL.title" = "Custom ringtone";
+"qFq-Yh-2JL.title" = "Özel zil sesi ";
 
 /* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "sVe-iG-OCw"; */
-"sVe-iG-OCw.title" = "Connectivity";
+"sVe-iG-OCw.title" = "Bağlanabilirlik";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "soR-nF-ybe"; */
 "soR-nF-ybe.title" = "Özel anahtar";
@@ -99,7 +99,7 @@
 "vYi-gW-MrY.title" = "Kutu";
 
 /* Class = "NSTextFieldCell"; title = "OpenDHT configuration"; ObjectID = "xJT-ij-69q"; */
-"xJT-ij-69q.title" = "OpenDHT configuration";
+"xJT-ij-69q.title" = "OpenDHT yapılandırma";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "zPJ-cO-neQ"; */
 "zPJ-cO-neQ.title" = "TURN kullan";
diff --git a/ui/tr.lproj/AccAdvancedSip.strings b/ui/tr.lproj/AccAdvancedSip.strings
index 8f871e558a774828dc62b01e808b5c1ba75d31cf..48e6d9fb6e211939e60da53c7cb22f3aa9e1253d 100644
--- a/ui/tr.lproj/AccAdvancedSip.strings
+++ b/ui/tr.lproj/AccAdvancedSip.strings
@@ -9,10 +9,10 @@
 "24s-we-pkD.title" = "Güvenlik";
 
 /* Class = "NSTextFieldCell"; title = "Registration expire timeout (seconds)"; ObjectID = "2rB-Bv-c9U"; */
-"2rB-Bv-c9U.title" = "Registration expire timeout (seconds)";
+"2rB-Bv-c9U.title" = "Kayıt işlemi zaman aşımına uğradı (saniye):";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "3Uq-Nb-J1A"; */
-"3Uq-Nb-J1A.title" = "Call settings";
+"3Uq-Nb-J1A.title" = "Arama ayarları";
 
 /* Class = "NSButtonCell"; title = "Fallback on RTP on encryption failure"; ObjectID = "3rM-KT-bNf"; */
 "3rM-KT-bNf.title" = "Şifreleme hatasından dolayı RTP geri düştü.";
@@ -39,7 +39,7 @@
 "A31-3Y-z4R.title" = "Kutu";
 
 /* Class = "NSTextFieldCell"; title = "Published address"; ObjectID = "ELr-A7-mGE"; */
-"ELr-A7-mGE.title" = "Published address";
+"ELr-A7-mGE.title" = "Yayınlanan Adres";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "Gwi-Mp-NpZ"; */
 "Gwi-Mp-NpZ.title" = "TURN kullan";
@@ -63,7 +63,7 @@
 "Mho-w1-ZPJ.title" = "Item 3";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "Nqr-gj-dOH"; */
-"Nqr-gj-dOH.title" = "Custom ringtone";
+"Nqr-gj-dOH.title" = "Özel zil sesi ";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
 "OEo-C7-vEh.title" = "Item 2";
@@ -117,7 +117,7 @@
 "ekM-Cg-DEo.title" = "Kutu";
 
 /* Class = "NSTextFieldCell"; title = "Network interface"; ObjectID = "fjH-ej-gEr"; */
-"fjH-ej-gEr.title" = "Network interface";
+"fjH-ej-gEr.title" = "Ağ arayüzü";
 
 /* Class = "NSButtonCell"; title = "Verify incoming sertificates (server side)"; ObjectID = "fyT-bU-m54"; */
 "fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
@@ -138,7 +138,7 @@
 "nq0-Js-9Cr.title" = "Asgari";
 
 /* Class = "NSButtonCell"; title = "Use custom address and port"; ObjectID = "nuq-Wl-sfd"; */
-"nuq-Wl-sfd.title" = "Use custom address and port";
+"nuq-Wl-sfd.title" = "Özel adres ve kapı kullan";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "rMN-Wf-tmp"; */
 "rMN-Wf-tmp.title" = "TURN kullanıcı adı";
@@ -150,7 +150,7 @@
 "vZH-42-mUi.title" = "Görüşmeyi şifrele (TLS)";
 
 /* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "vpo-fl-9TS"; */
-"vpo-fl-9TS.title" = "Connectivity";
+"vpo-fl-9TS.title" = "Bağlanabilirlik";
 
 /* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "wq6-KV-8X3"; */
 "wq6-KV-8X3.title" = "Azami";
diff --git a/ui/tr.lproj/AccRingGeneral.strings b/ui/tr.lproj/AccRingGeneral.strings
index d99b98dc7583ee3dfe5a23987e899fc7b1612729..c1fc8e964db46f6a80c6b138cb5b0aae1103ae04 100644
--- a/ui/tr.lproj/AccRingGeneral.strings
+++ b/ui/tr.lproj/AccRingGeneral.strings
@@ -51,7 +51,7 @@
 "qx7-i1-3Na.title" = "Identifier:";
 
 /* Class = "NSButtonCell"; title = "Link another device"; ObjectID = "tWk-Od-BEQ"; */
-"tWk-Od-BEQ.title" = "Link another device";
+"tWk-Od-BEQ.title" = "Diğer aygıtı bağla";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "uLQ-MS-pZ7"; */
 "uLQ-MS-pZ7.title" = "Hesap";
diff --git a/ui/tr.lproj/AccSipGeneral.strings b/ui/tr.lproj/AccSipGeneral.strings
index 130afe9d54f68ac1177c4a0e1f279e9bcbb01cf7..3f1be3557f07303059ab943a83289e2ee4e4c2c1 100644
--- a/ui/tr.lproj/AccSipGeneral.strings
+++ b/ui/tr.lproj/AccSipGeneral.strings
@@ -9,7 +9,7 @@
 "NlM-R9-ola.title" = "Kutu";
 
 /* Class = "NSTextFieldCell"; title = "Voicemail"; ObjectID = "R7s-DE-PiP"; */
-"R7s-DE-PiP.title" = "Voicemail";
+"R7s-DE-PiP.title" = "Sesli ileti";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YAG-qB-4wH"; */
 "YAG-qB-4wH.placeholderString" = "Enter name";
diff --git a/ui/tr.lproj/BackupAccountWindow.strings b/ui/tr.lproj/BackupAccountWindow.strings
index 592d437484d2421a09a597e564ac73790964ca6b..56b2499cd54bc3c80653496a81f396e68685d57a 100644
--- a/ui/tr.lproj/BackupAccountWindow.strings
+++ b/ui/tr.lproj/BackupAccountWindow.strings
@@ -18,7 +18,7 @@
 "9h8-GU-av4.title" = "Nereye";
 
 /* Class = "NSTextFieldCell"; title = "Choose where to backup your account."; ObjectID = "KYZ-TW-44Y"; */
-"KYZ-TW-44Y.title" = "Choose where to backup your account.";
+"KYZ-TW-44Y.title" = "Hesabınızın nereye yedekleneceğini seçin.";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Pencere";
diff --git a/ui/tr.lproj/ExportPasswordWindow.strings b/ui/tr.lproj/ExportPasswordWindow.strings
index 69924bd55cda3c2d010979574425833b8d365a4d..16586b13f6164fa2de8ad5365c8fec4d23e9fa85 100644
--- a/ui/tr.lproj/ExportPasswordWindow.strings
+++ b/ui/tr.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Parola...";
 
 /* Class = "NSTextFieldCell"; title = "Please provide your password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Please provide your password to start";
+"859-10-HEb.title" = "Başlamak için lütfen bir parola edinin";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Pencere";
diff --git a/ui/tr.lproj/GeneralPrefs.strings b/ui/tr.lproj/GeneralPrefs.strings
index 694ac0bc18137d28b0847dc1dd84850f70988911..c69697e957bc38106e995a2666b11b7260ed1e97 100644
--- a/ui/tr.lproj/GeneralPrefs.strings
+++ b/ui/tr.lproj/GeneralPrefs.strings
@@ -45,7 +45,7 @@
 "r4u-t3-gBc.title" = "Güncelle";
 
 /* Class = "NSButtonCell"; title = "Enable notifications for incoming calls"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable notifications for incoming calls";
+"uCL-ye-tsv.title" = "Gelen çağrılar için bildirimleri etkinleştir.";
 
 /* Class = "NSButtonCell"; title = "Bring Jami to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
 "uYI-hA-JHk.title" = "Bring Jami to foreground on incoming calls";
diff --git a/ui/tr.lproj/Localizable.strings b/ui/tr.lproj/Localizable.strings
index fae08ed8833c2665e18e84a8637125fdb3dba47c..d69c9bf391c6c6921c138013125201f590ff9b29 100644
--- a/ui/tr.lproj/Localizable.strings
+++ b/ui/tr.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Numarayı kopyala";
 
 /* Contextual menu entry */
-"Create Jami Account" = "Create Jami Account";
+"Create Jami Account" = "Jami hesabı oluştur";
 
 /* Contextual menu entry */
 "Create SIP Account" = "SİP Hesabı Oluştur";
@@ -183,7 +183,7 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Welcome to Jami";
+"Welcome to Ring" = "Jami'ye Hoşgeldiniz";
 "Create a new account" = "Yeni bir hesap oluştur";
 "Add a SIP account" = "Add a SIP account";
 
diff --git a/ui/tr.lproj/MainMenu.strings b/ui/tr.lproj/MainMenu.strings
index a919eaa7e884f40a3b3f20a6dcd3ed9143425d9b..d656995d949df535032bfaa16a62f7149673f9b9 100644
--- a/ui/tr.lproj/MainMenu.strings
+++ b/ui/tr.lproj/MainMenu.strings
@@ -21,7 +21,7 @@
 "57.title" = "Jami";
 
 /* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
-"58.title" = "About Jami";
+"58.title" = "Jami Hakkında";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Seçenekler...";
diff --git a/ui/tr.lproj/RegisterNameWindow.strings b/ui/tr.lproj/RegisterNameWindow.strings
index 99eae8f074b4fe6e4d6ac5528e6781093a844ae1..3eb6cd4e9b2e0f3b66fb7a3ed7aa6cd35097f49e 100644
--- a/ui/tr.lproj/RegisterNameWindow.strings
+++ b/ui/tr.lproj/RegisterNameWindow.strings
@@ -3,7 +3,7 @@
 "1TO-Ov-S8j.placeholderString" = "Zorunlu*";
 
 /* Class = "NSTextFieldCell"; title = "Other users can use it instead of your ID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Other users can use it instead of your ID";
+"9gi-0u-67t.title" = "Diğer kullanıcılar kimliğiniz yerine bunu kullanabilir";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
 "Aeh-tK-RjX.title" = "Kullanıcı adınız kaydedilirken bir hata oluştu";
@@ -33,4 +33,4 @@
 "lT3-Bh-MnL.title" = "Kaydol";
 
 /* Class = "NSTextFieldCell"; title = "Register a public username"; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register a public username";
+"tje-EZ-ZPI.title" = "Halka açık kullanıcı adı kaydet";
diff --git a/ui/tr.lproj/RingWindow.strings b/ui/tr.lproj/RingWindow.strings
index ea035c9905b57dd6dbde79e965e7b0f59744d8aa..bdce7d8b6f3256316fb3932b474c73bc68b3ce05 100644
--- a/ui/tr.lproj/RingWindow.strings
+++ b/ui/tr.lproj/RingWindow.strings
@@ -45,7 +45,7 @@
 "d5o-nL-fRP.placeholderString" = "kategori";
 
 /* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
+"eln-Vm-t0d.title" = "Jami, kullanıcılarının özgürlüklerine ve gizliliğine önem veren, evrensel iletişim için özgür yazılımdır.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "kategori";
diff --git a/ui/tr.lproj/RingWizard.strings b/ui/tr.lproj/RingWizard.strings
index 6ce2f357181f182d5de6b62cb6d0dcf5885f009e..04d8e822a3cae5ed339c5d88376f3a64de0a37c6 100644
--- a/ui/tr.lproj/RingWizard.strings
+++ b/ui/tr.lproj/RingWizard.strings
@@ -1,3 +1,3 @@
 
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
-"2mM-yx-BfM.title" = "Ring'e Hoşgeldiniz";
+/* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Jami'ye Hoşgeldiniz";
diff --git a/ui/tr.lproj/RingWizardChoose.strings b/ui/tr.lproj/RingWizardChoose.strings
index 2919d80766f41cb5671b8e0a0b45ce0189d60121..12848290220ecc33830b2430aad28f1c174c48be 100644
--- a/ui/tr.lproj/RingWizardChoose.strings
+++ b/ui/tr.lproj/RingWizardChoose.strings
@@ -6,4 +6,4 @@
 "Z9K-mD-ucr.title" = "Bu aygıtı bir hesaba bağla";
 
 /* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Jami account";
+"k1T-a7-yZD.title" = "Bir Jami hesabı oluştur";
diff --git a/ui/tr.lproj/RingWizardLinkAccount.strings b/ui/tr.lproj/RingWizardLinkAccount.strings
index f1bbc82a8d3006c247845ef2bd3c481c77604f1b..d47cc1da1e3b6584b4a70ab4b2c071c929ed652c 100644
--- a/ui/tr.lproj/RingWizardLinkAccount.strings
+++ b/ui/tr.lproj/RingWizardLinkAccount.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "To link this device to another account, you have two possibilities:"; ObjectID = "06g-zM-5Qz"; */
-"06g-zM-5Qz.title" = "To link this device to another account, you have two possibilities:";
+"06g-zM-5Qz.title" = "Bu aygıtı başka bir hesaba bağlamak için iki seçeneğiniz var:";
 
 /* Class = "NSTextFieldCell"; title = "OR"; ObjectID = "1NY-Yu-wH1"; */
 "1NY-Yu-wH1.title" = "OR";
@@ -12,7 +12,7 @@
 "3ik-rY-Gig.title" = "PIN'inizi girin";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Bağla";
+"8b8-bt-eAj.title" = "Bağlantı";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "Bir hata oluştu, lütfen parolanızı ve pin'inizi denetleyin.";
@@ -36,10 +36,10 @@
 "WlR-QM-tK4.ibShadowedNotApplicablePlaceholder" = "Parola...";
 
 /* Class = "NSButtonCell"; title = "Select file"; ObjectID = "XJE-cy-nfQ"; */
-"XJE-cy-nfQ.title" = "Select file";
+"XJE-cy-nfQ.title" = "Dosya seç";
 
 /* Class = "NSTextFieldCell"; title = "Import archive file"; ObjectID = "kXa-FL-Enf"; */
-"kXa-FL-Enf.title" = "Import archive file";
+"kXa-FL-Enf.title" = "Arşiv dosyasını içe aktar";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can directly import your account from an archive file on your device."; ObjectID = "kfe-m7-MTT"; */
 "kfe-m7-MTT.title" = "\tYou can directly import your account from an archive file on your device.";
@@ -60,4 +60,4 @@
 "vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "PIN";
 
 /* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
-"zWn-4H-ODH.title" = "Linking...";
+"zWn-4H-ODH.title" = "Bağlıyor...";
diff --git a/ui/uk.lproj/ExportPasswordWindow.strings b/ui/uk.lproj/ExportPasswordWindow.strings
index 673319b8de3b2f554b27aaba07237a8331397866..b01ab654b38713797d726ff4b49323ee157be92e 100644
--- a/ui/uk.lproj/ExportPasswordWindow.strings
+++ b/ui/uk.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Пароль...";
 
 /* Class = "NSTextFieldCell"; title = "Please provide your password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Please provide your password to start";
+"859-10-HEb.title" = "Будь ласка, введіть пароль, щоб розпочати";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Вікно";
@@ -27,7 +27,7 @@
 "dfD-AK-f3R.title" = "OK";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "назва помилки";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
 "rW5-Il-5YD.title" = "OK";
diff --git a/ui/uk.lproj/PreferencesWindow.strings b/ui/uk.lproj/PreferencesWindow.strings
index edf2d28754457066cb1566f20791948a2ed9c1cf..fe11abb36ba45ca684081b8c6def300c6e4bfe6c 100644
--- a/ui/uk.lproj/PreferencesWindow.strings
+++ b/ui/uk.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSWindow"; title = "Jami Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Jami Preferences";
+"C1T-wE-wxb.title" = "Jami Налаштування";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "Головні";
diff --git a/ui/zh_TW.lproj/AccAdvancedRing.strings b/ui/zh_TW.lproj/AccAdvancedRing.strings
index 846bcfcfdd0440812262d89ffb15c7f51cc25249..1cc6a44124e323421ba9453796385e4373bb1d55 100644
--- a/ui/zh_TW.lproj/AccAdvancedRing.strings
+++ b/ui/zh_TW.lproj/AccAdvancedRing.strings
@@ -12,7 +12,7 @@
 "7eU-EP-4br.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "8mv-Ia-GM4"; */
-"8mv-Ia-GM4.title" = "TURN address";
+"8mv-Ia-GM4.title" = "TURN 地址";
 
 /* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "BIS-Ft-yJn"; */
 "BIS-Ft-yJn.title" = "通話設定";
@@ -39,16 +39,16 @@
 "Qxp-I4-A7W.title" = "安全性";
 
 /* Class = "NSButtonCell"; title = "Enable proxy"; ObjectID = "VyP-8T-aNA"; */
-"VyP-8T-aNA.title" = "Enable proxy";
+"VyP-8T-aNA.title" = "啟用代理伺服器";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
 "Wrh-zD-uh5.title" = "視訊編解碼器";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "XU0-bl-lDD"; */
-"XU0-bl-lDD.title" = "TURN realm";
+"XU0-bl-lDD.title" = "TURN 範圍";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "YE4-ry-u07"; */
-"YE4-ry-u07.title" = "STUN address";
+"YE4-ry-u07.title" = "STUN 地址";
 
 /* Class = "NSTextFieldCell"; title = "Bootstrap"; ObjectID = "YJM-iQ-0lE"; */
 "YJM-iQ-0lE.title" = "Bootstrap";
diff --git a/ui/zh_TW.lproj/AccAdvancedSip.strings b/ui/zh_TW.lproj/AccAdvancedSip.strings
index d6512443781299d18e3451c67184c4119d06a093..67be6cd496ee83624cbb09361dd4c418e35ee2cd 100644
--- a/ui/zh_TW.lproj/AccAdvancedSip.strings
+++ b/ui/zh_TW.lproj/AccAdvancedSip.strings
@@ -21,7 +21,7 @@
 "3vs-TI-tkg.title" = "自動回覆通話";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "6eH-la-JbF"; */
-"6eH-la-JbF.title" = "TURN realm";
+"6eH-la-JbF.title" = "TURN 範圍";
 
 /* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "72p-GY-gu6"; */
 "72p-GY-gu6.title" = "私密金鑰密碼";
@@ -30,7 +30,7 @@
 "8JD-11-wHZ.title" = "外連 TLS 伺服器名稱";
 
 /* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "8bw-iH-XGl"; */
-"8bw-iH-XGl.title" = "Item 1";
+"8bw-iH-XGl.title" = "項目 1";
 
 /* Class = "NSTextFieldCell"; title = "Port"; ObjectID = "9p9-GR-XKU"; */
 "9p9-GR-XKU.title" = "連接埠";
@@ -48,7 +48,7 @@
 "HRM-FR-1sH.title" = "使用 STUN";
 
 /* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "HYt-sW-yd0"; */
-"HYt-sW-yd0.title" = "STUN address";
+"HYt-sW-yd0.title" = "STUN 地址";
 
 /* Class = "NSButtonCell"; title = "Require a certificate for incoming TLS connections"; ObjectID = "JV8-cY-6vR"; */
 "JV8-cY-6vR.title" = "連入的 TLS 連線需要證書";
@@ -60,13 +60,13 @@
 "MBR-AC-HFq.title" = "Box";
 
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Mho-w1-ZPJ"; */
-"Mho-w1-ZPJ.title" = "Item 3";
+"Mho-w1-ZPJ.title" = "項目 3";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "Nqr-gj-dOH"; */
 "Nqr-gj-dOH.title" = "自訂鈴聲";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
-"OEo-C7-vEh.title" = "Item 2";
+"OEo-C7-vEh.title" = "項目 2";
 
 /* Class = "NSTextFieldCell"; title = "Audio RTP port Range"; ObjectID = "Ogj-NW-fZ9"; */
 "Ogj-NW-fZ9.title" = "音訊 RTP 連接埠範圍";
@@ -99,13 +99,13 @@
 "Zuz-jy-rLn.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "aYs-wh-Hpr"; */
-"aYs-wh-Hpr.title" = "TURN address";
+"aYs-wh-Hpr.title" = "TURN 地址";
 
 /* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "b2y-85-ZHK"; */
 "b2y-85-ZHK.title" = "CA 證書";
 
 /* Class = "NSTextFieldCell"; title = "Only used during SDP negotiation in case ICE is not supported"; ObjectID = "cN3-lC-dNM"; */
-"cN3-lC-dNM.title" = "Only used during SDP negotiation in case ICE is not supported";
+"cN3-lC-dNM.title" = "僅在 SDP 協商期間使用,以防不支援 ICE";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "cwV-lc-jju"; */
 "cwV-lc-jju.title" = "Box";
@@ -120,7 +120,7 @@
 "fjH-ej-gEr.title" = "網路介面";
 
 /* Class = "NSButtonCell"; title = "Verify incoming sertificates (server side)"; ObjectID = "fyT-bU-m54"; */
-"fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
+"fyT-bU-m54.title" = "驗證連入的證書(伺服器端)";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "gJs-aX-7Ox"; */
 "gJs-aX-7Ox.title" = "視訊編解碼器";
@@ -144,7 +144,7 @@
 "rMN-Wf-tmp.title" = "TURN 使用者名稱";
 
 /* Class = "NSButtonCell"; title = "Encrypt media streams(SRTP)"; ObjectID = "vCS-s8-mZI"; */
-"vCS-s8-mZI.title" = "Encrypt media streams(SRTP)";
+"vCS-s8-mZI.title" = "加密媒體串流 (SRTP)";
 
 /* Class = "NSButtonCell"; title = "Encrypt negotiation (TLS)"; ObjectID = "vZH-42-mUi"; */
 "vZH-42-mUi.title" = "加密協商 (TLS)";
diff --git a/ui/zh_TW.lproj/AccRingGeneral.strings b/ui/zh_TW.lproj/AccRingGeneral.strings
index e3bfe4b03e749759c0942e15130496419c064153..301c723ff4379edca6f95cb2b3549fc3d495f00e 100644
--- a/ui/zh_TW.lproj/AccRingGeneral.strings
+++ b/ui/zh_TW.lproj/AccRingGeneral.strings
@@ -18,7 +18,7 @@
 "WEo-a0-wVL.ibShadowedToolTip" = "編輯名稱";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "Yf6-8d-SNh"; */
-"Yf6-8d-SNh.title" = "Remove Account";
+"Yf6-8d-SNh.title" = "移除帳號";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
 "aQL-hX-CfA.title" = "文字單元";
@@ -27,7 +27,7 @@
 "bOY-mY-1Yo.ibShadowedToolTip" = "取消封鎖";
 
 /* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "fPK-Zv-Uom"; */
-"fPK-Zv-Uom.title" = "Username:";
+"fPK-Zv-Uom.title" = "使用者名稱:";
 
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "gLp-qz-XYs"; */
 "gLp-qz-XYs.title" = "註冊";
@@ -45,10 +45,10 @@
 "oVO-wj-fwQ.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
-"oga-WC-4gb.title" = "Linked devices";
+"oga-WC-4gb.title" = "已連結的裝置";
 
 /* Class = "NSTextFieldCell"; title = "Identifier:"; ObjectID = "qx7-i1-3Na"; */
-"qx7-i1-3Na.title" = "Identifier:";
+"qx7-i1-3Na.title" = "識別碼:";
 
 /* Class = "NSButtonCell"; title = "Link another device"; ObjectID = "tWk-Od-BEQ"; */
 "tWk-Od-BEQ.title" = "連結其他裝置";
diff --git a/ui/zh_TW.lproj/AccSipGeneral.strings b/ui/zh_TW.lproj/AccSipGeneral.strings
index 4a8565a1e4e8930e339a658a80027fa74aabf139..680eec06055b7a0b2e98bafad072f3a49bdefe72 100644
--- a/ui/zh_TW.lproj/AccSipGeneral.strings
+++ b/ui/zh_TW.lproj/AccSipGeneral.strings
@@ -3,7 +3,7 @@
 "688-Sx-Gvr.title" = "代理服務器";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Fj6-Q3-Gz3"; */
-"Fj6-Q3-Gz3.title" = "User Name";
+"Fj6-Q3-Gz3.title" = "使用者名稱";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "NlM-R9-ola"; */
 "NlM-R9-ola.title" = "Box";
@@ -18,7 +18,7 @@
 "Yof-e7-IBF.title" = "密碼";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ZKc-70-TFH"; */
-"ZKc-70-TFH.title" = "SIP Server";
+"ZKc-70-TFH.title" = "SIP 伺服器";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "eQt-bc-Eev"; */
 "eQt-bc-Eev.title" = "帳號";
@@ -30,10 +30,10 @@
 "jdU-uZ-Rfy.title" = "編輯帳號";
 
 /* Class = "NSButtonCell"; title = "enable"; ObjectID = "nW8-pd-fNj"; */
-"nW8-pd-fNj.title" = "enable";
+"nW8-pd-fNj.title" = "啟用";
 
 /* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "oE8-tN-SfC"; */
 "oE8-tN-SfC.title" = "介紹";
 
 /* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "uFM-Am-0kz"; */
-"uFM-Am-0kz.title" = "Remove Account";
+"uFM-Am-0kz.title" = "移除帳號";
diff --git a/ui/zh_TW.lproj/AddSIPAccountVC.strings b/ui/zh_TW.lproj/AddSIPAccountVC.strings
index d6361bf5f34c87e81daf96449cf968e1d291f06f..55e2c5fc018fdc2f1b2e55d113e184528f6102b9 100644
--- a/ui/zh_TW.lproj/AddSIPAccountVC.strings
+++ b/ui/zh_TW.lproj/AddSIPAccountVC.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter SIP address"; ObjectID = "0UI-j5-0at"; */
-"0UI-j5-0at.placeholderString" = "Enter SIP address";
+"0UI-j5-0at.placeholderString" = "輸入 SIP 地址";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "Aem-zQ-Ya3"; */
 "Aem-zQ-Ya3.title" = "密碼";
@@ -18,7 +18,7 @@
 "Rej-Yd-PDb.placeholderString" = "輸入使用者名稱";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Srm-hv-9WR"; */
-"Srm-hv-9WR.title" = "User Name";
+"Srm-hv-9WR.title" = "使用者名稱";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YeS-R8-ZLT"; */
 "YeS-R8-ZLT.placeholderString" = "輸入名稱";
@@ -27,7 +27,7 @@
 "fgN-nq-QdO.title" = "介紹";
 
 /* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ubR-HD-O15"; */
-"ubR-HD-O15.title" = "SIP Server";
+"ubR-HD-O15.title" = "SIP 伺服器";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "zAN-HT-1oE"; */
 "zAN-HT-1oE.title" = "帳號";
diff --git a/ui/zh_TW.lproj/LeaveMessageVC.strings b/ui/zh_TW.lproj/LeaveMessageVC.strings
index 1115a56a8eb5d0a82733868a35a062de74e0616d..54ee3e2c23cf68a5a32aceaf36ce474bb3a8b7c3 100644
--- a/ui/zh_TW.lproj/LeaveMessageVC.strings
+++ b/ui/zh_TW.lproj/LeaveMessageVC.strings
@@ -12,7 +12,7 @@
 "Zlv-nH-Y9y.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Contact appears to be busy. Leave a message?"; ObjectID = "hnr-x5-xnb"; */
-"hnr-x5-xnb.title" = "Contact appears to be busy. Leave a message?";
+"hnr-x5-xnb.title" = "聯絡人似乎忙碌中。留下訊息?";
 
 /* Class = "NSTextFieldCell"; title = "Recording"; ObjectID = "kIq-PG-Ymw"; */
 "kIq-PG-Ymw.title" = "記錄";
diff --git a/ui/zh_TW.lproj/MessageCells.strings b/ui/zh_TW.lproj/MessageCells.strings
index b5d88627e569a5db0928998d5b71f2726a5080a5..96c7537383456e7c6bb0d7744c3512fbc068b9f4 100644
--- a/ui/zh_TW.lproj/MessageCells.strings
+++ b/ui/zh_TW.lproj/MessageCells.strings
@@ -3,16 +3,16 @@
 "1c6-BK-hfV.title" = "取消";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "3i8-bi-EQN"; */
-"3i8-bi-EQN.title" = "Round Rect";
+"3i8-bi-EQN.title" = "圓形矩形";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "8CE-a4-Ayu"; */
-"8CE-a4-Ayu.title" = "Round Rect";
+"8CE-a4-Ayu.title" = "圓形矩形";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "9Oq-TB-quZ"; */
 "9Oq-TB-quZ.title" = "取消";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "DmW-13-1QZ"; */
-"DmW-13-1QZ.title" = "Round Rect";
+"DmW-13-1QZ.title" = "圓形矩形";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "EAm-7Z-ubs"; */
 "EAm-7Z-ubs.title" = "Box";
@@ -21,7 +21,7 @@
 "Ko5-2g-foK.title" = "Box";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "Oo1-gq-aPY"; */
-"Oo1-gq-aPY.title" = "Round Rect";
+"Oo1-gq-aPY.title" = "圓形矩形";
 
 /* Class = "NSButtonCell"; title = "Refuse"; ObjectID = "QGs-MO-mVi"; */
 "QGs-MO-mVi.title" = "拒絕";
@@ -33,7 +33,7 @@
 "e0e-TK-qch.title" = "Box";
 
 /* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "fu2-X7-GW8"; */
-"fu2-X7-GW8.title" = "Round Rect";
+"fu2-X7-GW8.title" = "圓形矩形";
 
 /* Class = "NSButtonCell"; title = "Accept"; ObjectID = "tBq-Qe-bEm"; */
 "tBq-Qe-bEm.title" = "接聽";
diff --git a/ui/zh_TW.lproj/PasswordChange.strings b/ui/zh_TW.lproj/PasswordChange.strings
index e747b24ec1b28d8a3931e8fff18db41c0514db6b..d9cedac022e5cc7da165e6f0df7a8658b63c867d 100644
--- a/ui/zh_TW.lproj/PasswordChange.strings
+++ b/ui/zh_TW.lproj/PasswordChange.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
-"8KO-IO-ykP.title" = "Repeat";
+"8KO-IO-ykP.title" = "重覆";
 
 /* Class = "NSButtonCell"; title = "Accept"; ObjectID = "Ggu-EQ-cqC"; */
 "Ggu-EQ-cqC.title" = "接聽";
@@ -9,10 +9,10 @@
 "MZw-ep-8aW.title" = "取消";
 
 /* Class = "NSTextFieldCell"; title = "Password is incorrect"; ObjectID = "WyU-Dx-U1u"; */
-"WyU-Dx-U1u.title" = "Password is incorrect";
+"WyU-Dx-U1u.title" = "密碼不正確";
 
 /* Class = "NSTextFieldCell"; title = "Old password"; ObjectID = "gPw-Jf-0M7"; */
-"gPw-Jf-0M7.title" = "Old password";
+"gPw-Jf-0M7.title" = "舊的密碼";
 
 /* Class = "NSTextFieldCell"; title = "New password"; ObjectID = "pZe-DO-jWp"; */
 "pZe-DO-jWp.title" = "新密碼";
diff --git a/ui/zh_TW.lproj/RingWizardLinkAccount.strings b/ui/zh_TW.lproj/RingWizardLinkAccount.strings
index 996d1f986d3ee858a7b7ab15575f4aea24bf90ab..e9324212d213d0d54ed36dbf44d53adce6192d4c 100644
--- a/ui/zh_TW.lproj/RingWizardLinkAccount.strings
+++ b/ui/zh_TW.lproj/RingWizardLinkAccount.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSTextFieldCell"; title = "To link this device to another account, you have two possibilities:"; ObjectID = "06g-zM-5Qz"; */
-"06g-zM-5Qz.title" = "To link this device to another account, you have two possibilities:";
+"06g-zM-5Qz.title" = "連將此裝置連結到另一個帳號,您有兩種選擇:";
 
 /* Class = "NSTextFieldCell"; title = "OR"; ObjectID = "1NY-Yu-wH1"; */
-"1NY-Yu-wH1.title" = "OR";
+"1NY-Yu-wH1.title" = "或";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes."; ObjectID = "2uK-1s-tk7"; */
-"2uK-1s-tk7.title" = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes.";
+"2uK-1s-tk7.title" = "\t您可以從其他裝置匯入您的帳號,但您必須先取得 PIN 碼。 \n\t要生成 PIN 碼,請到帳號管理設定中的前一個裝置,選擇要使用的 Jami 帳號,並選取「連結其他裝置到這個帳號」。您將會取得用以完成此表單的 PIN 碼。PIN 碼的有效期限只有10分鐘。";
 
 /* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
 "3ik-rY-Gig.title" = "輸入您的 PIN";
@@ -36,13 +36,13 @@
 "WlR-QM-tK4.ibShadowedNotApplicablePlaceholder" = "密碼...";
 
 /* Class = "NSButtonCell"; title = "Select file"; ObjectID = "XJE-cy-nfQ"; */
-"XJE-cy-nfQ.title" = "Select file";
+"XJE-cy-nfQ.title" = "選取檔案";
 
 /* Class = "NSTextFieldCell"; title = "Import archive file"; ObjectID = "kXa-FL-Enf"; */
-"kXa-FL-Enf.title" = "Import archive file";
+"kXa-FL-Enf.title" = "匯入封存檔";
 
 /* Class = "NSTextFieldCell"; title = "\tYou can directly import your account from an archive file on your device."; ObjectID = "kfe-m7-MTT"; */
-"kfe-m7-MTT.title" = "\tYou can directly import your account from an archive file on your device.";
+"kfe-m7-MTT.title" = "\t您可以直接從您裝置上的封存檔匯入您的帳號。";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "確定";
@@ -60,4 +60,4 @@
 "vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "PIN 碼";
 
 /* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
-"zWn-4H-ODH.title" = "Linking...";
+"zWn-4H-ODH.title" = "正在連結……";