diff --git a/ui/es.lproj/ExportPasswordWindow.strings b/ui/es.lproj/ExportPasswordWindow.strings
index 4b093eb..bb3b397 100644
--- a/ui/es.lproj/ExportPasswordWindow.strings
+++ b/ui/es.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Contraseña...";
 
 /* 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" = "Por favor ingrese su contraseña para comenzar";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Ventana";
diff --git a/ui/es.lproj/GeneralPrefs.strings b/ui/es.lproj/GeneralPrefs.strings
index 2a66c5d..da9e31f 100644
--- a/ui/es.lproj/GeneralPrefs.strings
+++ b/ui/es.lproj/GeneralPrefs.strings
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "Actualizar";
 
 /* 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" = "Habilitar notificaciones para llamadas entrantes.";
 
 /* 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";
+"uYI-hA-JHk.title" = "Traer a Jami a primer plano en las llamadas entrantes";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
 "vbU-2S-O58.title" = "Esto se comparte con tus contactos";
diff --git a/ui/es.lproj/Localizable.strings b/ui/es.lproj/Localizable.strings
index 1e7fb41..dcaadc8 100644
--- a/ui/es.lproj/Localizable.strings
+++ b/ui/es.lproj/Localizable.strings
@@ -183,7 +183,7 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Welcome to Jami";
+"Welcome to Ring" = "Bienvenido a Jami";
 "Create a new account" = "Crear una cuenta";
 "Add a SIP account" = "Add a SIP account";
 
diff --git a/ui/es.lproj/MainMenu.strings b/ui/es.lproj/MainMenu.strings
index 430589a..f12ad0e 100644
--- a/ui/es.lproj/MainMenu.strings
+++ b/ui/es.lproj/MainMenu.strings
@@ -21,7 +21,7 @@
 "57.title" = "Jami";
 
 /* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
-"58.title" = "About Jami";
+"58.title" = "Acerca de Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferencias...";
@@ -33,10 +33,10 @@
 "131.title" = "Servicios";
 
 /* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
-"134.title" = "Hide Jami";
+"134.title" = "Ocultar Jami";
 
 /* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
-"136.title" = "Quit Jami";
+"136.title" = "Quitar Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Ocultar";
@@ -189,7 +189,7 @@
 "491.title" = "Ayuda";
 
 /* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
-"492.title" = "Jami Help";
+"492.title" = "Ayuda en Jami";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Buscar y Reemplazar...";
diff --git a/ui/es.lproj/MigrateRingAccountsWindow.strings b/ui/es.lproj/MigrateRingAccountsWindow.strings
index 641d77a..ea797b7 100644
--- a/ui/es.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/es.lproj/MigrateRingAccountsWindow.strings
@@ -6,7 +6,7 @@
 "859-10-HEb.placeholderString" = "ID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed 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 Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Jami account format:\\n Alias : \\nID:\\n To proceed 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 your not ready to choose a password, you may close Jami and resume the migration later.";
+"859-10-HEb.title" = "La siguiente cuenta debe migrarse al nuevo formato de cuentas de Ring:\nAlias:\nID:\nPara proseguir con la migración, debes escoger una contraseña para la cuenta. Esta contraseña se usará para cifrar tu llave maestra. Será requerida para agregar nuevos dispositivos a la cuenta de Ring. Si no estás listo para agregar una contraseña, puedes cerrar Ring y continuar la migración más tarde.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "Error al migrar la cuenta";
diff --git a/ui/es.lproj/PreferencesWindow.strings b/ui/es.lproj/PreferencesWindow.strings
index 120638e..c64b874 100644
--- a/ui/es.lproj/PreferencesWindow.strings
+++ b/ui/es.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" = "Preferencias de Jami";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "General";
diff --git a/ui/es.lproj/RegisterNameWindow.strings b/ui/es.lproj/RegisterNameWindow.strings
index 3f8c938..16f050e 100644
--- a/ui/es.lproj/RegisterNameWindow.strings
+++ b/ui/es.lproj/RegisterNameWindow.strings
@@ -3,7 +3,7 @@
 "1TO-Ov-S8j.placeholderString" = "Requerido*";
 
 /* 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" = "Otros usuarios pueden utilizarlo en lugar de tu RingID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
 "Aeh-tK-RjX.title" = "Se ha producido un error al registrar el nombre de usuario";
diff --git a/ui/es.lproj/RingWindow.strings b/ui/es.lproj/RingWindow.strings
index 3b00062..3621cf3 100644
--- a/ui/es.lproj/RingWindow.strings
+++ b/ui/es.lproj/RingWindow.strings
@@ -33,7 +33,7 @@
 "Wi9-Zd-O1N.label" = "Historial";
 
 /* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
+"Xb9-UT-M2F.title" = "Este es tu ID.\n¡Cópialo y compártelo con tus amigos!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contactos";
@@ -45,7 +45,7 @@
 "d5o-nL-fRP.placeholderString" = "Categoría";
 
 /* 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 es software libre para la comunicación universal que respeta las libertades y la privacidad de sus usuarios.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Categoría";
diff --git a/ui/es.lproj/RingWizard.strings b/ui/es.lproj/RingWizard.strings
index 9de6061..c20307d 100644
--- a/ui/es.lproj/RingWizard.strings
+++ b/ui/es.lproj/RingWizard.strings
@@ -1,3 +1,3 @@
 
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
-"2mM-yx-BfM.title" = "Bienvenido a Ring";
+/* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Bienvenido a Jami";
diff --git a/ui/es.lproj/RingWizardLinkAccount.strings b/ui/es.lproj/RingWizardLinkAccount.strings
index 8b69425..722335c 100644
--- a/ui/es.lproj/RingWizardLinkAccount.strings
+++ b/ui/es.lproj/RingWizardLinkAccount.strings
@@ -9,7 +9,7 @@
 "4ev-TK-8Yt.title" = "Cancelar";
 
 /* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  "; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  ";
+"4me-D9-6GK.title" = "Vaya a la configuración de administración de la cuenta del dispositivo, elija la cuenta de Jami para usar y seleccione \"Vincular otro dispositivo a esta cuenta\".↵";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Conexión";
diff --git a/ui/es.lproj/RingWizardNewAccount.strings b/ui/es.lproj/RingWizardNewAccount.strings
index f85fa5f..9384759 100644
--- a/ui/es.lproj/RingWizardNewAccount.strings
+++ b/ui/es.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
+"0qE-Sz-hdc.title" = "Al marcar esto, registrará un nombre de usuario único en la red Jami. Las personas pueden usarlo para contactarlo en lugar de usar su ID, que tiene 40 caracteres.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Requerido*";
diff --git a/ui/hu.lproj/ExportPasswordWindow.strings b/ui/hu.lproj/ExportPasswordWindow.strings
index 4b7ce9b..a9c6263 100644
--- a/ui/hu.lproj/ExportPasswordWindow.strings
+++ b/ui/hu.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Jelszó…";
 
 /* 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" = "Jelszó megadása";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Ablak";
diff --git a/ui/hu.lproj/GeneralPrefs.strings b/ui/hu.lproj/GeneralPrefs.strings
index 6957ccd..c0e4252 100644
--- a/ui/hu.lproj/GeneralPrefs.strings
+++ b/ui/hu.lproj/GeneralPrefs.strings
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "Frissítés";
 
 /* 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" = "Értesítések engedélyezése a bejövő hívásokhoz";
 
 /* 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";
+"uYI-hA-JHk.title" = "A Jami előtérbe hozása bejövő hívások esetén";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
 "vbU-2S-O58.title" = "Ez meg van osztva a partnereivel";
diff --git a/ui/hu.lproj/Localizable.strings b/ui/hu.lproj/Localizable.strings
index 37afe6f..420832e 100644
--- a/ui/hu.lproj/Localizable.strings
+++ b/ui/hu.lproj/Localizable.strings
@@ -17,7 +17,7 @@
 "Clear conversation" = "Beszélgetés törlése";
 
 /* Contextual menu action */
-"Block contact" = "Blokkolt partner";
+"Block contact" = "Partner letiltása";
 
 /* Text shown to the user */
 "Alias : " = "Alias : ";
@@ -183,7 +183,7 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Welcome to Jami";
+"Welcome to Ring" = "Isten hozott!";
 "Create a new account" = "Új fiók létrehozása";
 "Add a SIP account" = "Add a SIP account";
 
diff --git a/ui/hu.lproj/MainMenu.strings b/ui/hu.lproj/MainMenu.strings
index 8f85abe..e1b6702 100644
--- a/ui/hu.lproj/MainMenu.strings
+++ b/ui/hu.lproj/MainMenu.strings
@@ -21,7 +21,7 @@
 "57.title" = "Jami";
 
 /* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
-"58.title" = "About Jami";
+"58.title" = "A Jami névjegye";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Beállítások…";
@@ -33,10 +33,10 @@
 "131.title" = "Szolgáltatások";
 
 /* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
-"134.title" = "Hide Jami";
+"134.title" = "Jami elrejtése";
 
 /* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
-"136.title" = "Quit Jami";
+"136.title" = "Kilépés a Jamiből";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Mások elrejtése";
@@ -189,7 +189,7 @@
 "491.title" = "Súgó";
 
 /* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
-"492.title" = "Jami Help";
+"492.title" = "Jami súgó";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Keresés és csere…";
diff --git a/ui/hu.lproj/MigrateRingAccountsWindow.strings b/ui/hu.lproj/MigrateRingAccountsWindow.strings
index 109c00c..692c52e 100644
--- a/ui/hu.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/hu.lproj/MigrateRingAccountsWindow.strings
@@ -6,7 +6,7 @@
 "859-10-HEb.placeholderString" = "Azonosító";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed 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 Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Jami account format:\\n Alias : \\nID:\\n To proceed 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 your not ready to choose a password, you may close Jami and resume the migration later.";
+"859-10-HEb.title" = "A következő fiókot át kell telepíteni az új Jami fiókformátumra:\\nÁlnév: \\nAzonosító: \\nAz áttelepítés folytatásához ki kell választania a fiókhoz tartozó jelszót. Ezt a jelszót fogja használni a fő kulcs titkosításához. Szükséges, hogy új eszközöket adjon hozzá a Jami fiókjához. Ha nem áll készen a jelszó kiválasztására, akkor bezárhatja a Jami-t és később folytathatja az áttelepítést.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "Fiók átvitel hiba";
diff --git a/ui/hu.lproj/PreferencesWindow.strings b/ui/hu.lproj/PreferencesWindow.strings
index 24d0c0a..dca5a1a 100644
--- a/ui/hu.lproj/PreferencesWindow.strings
+++ b/ui/hu.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" = "A Jami beállításai";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "Általános";
diff --git a/ui/hu.lproj/RegisterNameWindow.strings b/ui/hu.lproj/RegisterNameWindow.strings
index db5eb1f..9262124 100644
--- a/ui/hu.lproj/RegisterNameWindow.strings
+++ b/ui/hu.lproj/RegisterNameWindow.strings
@@ -3,7 +3,7 @@
 "1TO-Ov-S8j.placeholderString" = "Kötelező*";
 
 /* 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" = "Más felhasználók használhatják az azonosító helyett";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
 "Aeh-tK-RjX.title" = "Hiba történt a felhasználónév bejegyzés során";
diff --git a/ui/hu.lproj/RingWindow.strings b/ui/hu.lproj/RingWindow.strings
index 9ad938c..ae5f86a 100644
--- a/ui/hu.lproj/RingWindow.strings
+++ b/ui/hu.lproj/RingWindow.strings
@@ -33,7 +33,7 @@
 "Wi9-Zd-O1N.label" = "Előzmények";
 
 /* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
+"Xb9-UT-M2F.title" = "Ez az Ön azonosítója.\nMásolja és ossza meg a barátaival!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Partnerek";
diff --git a/ui/hu.lproj/RingWizard.strings b/ui/hu.lproj/RingWizard.strings
index 8eec253..710ef0c 100644
--- a/ui/hu.lproj/RingWizard.strings
+++ b/ui/hu.lproj/RingWizard.strings
@@ -1,3 +1,3 @@
 
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
+/* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
 "2mM-yx-BfM.title" = "Isten hozott!";
diff --git a/ui/hu.lproj/RingWizardLinkAccount.strings b/ui/hu.lproj/RingWizardLinkAccount.strings
index ee678ba..af5cb3e 100644
--- a/ui/hu.lproj/RingWizardLinkAccount.strings
+++ b/ui/hu.lproj/RingWizardLinkAccount.strings
@@ -9,7 +9,7 @@
 "4ev-TK-8Yt.title" = "Mégse";
 
 /* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  "; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  ";
+"4me-D9-6GK.title" = "Menjen a készülék fiókkezelő beállításához, válassza ki a használni kívánt Jami fiókot és válassza a „Egy másik eszköz összekapcsolása ehhez a fiókhoz” lehetőséget.";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Kapcsolat";
diff --git a/ui/hu.lproj/RingWizardNewAccount.strings b/ui/hu.lproj/RingWizardNewAccount.strings
index e0f1559..a4754f8 100644
--- a/ui/hu.lproj/RingWizardNewAccount.strings
+++ b/ui/hu.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
+"0qE-Sz-hdc.title" = "Ezt bejelölve, regisztrál egy egyedi felhasználónevet a Jami hálózaton. Az emberek ezt az azonosítója (amely 40 karakter hosszú) helyett használhatják, hogy elérjék Önt.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Kötelező*";
diff --git a/ui/pt.lproj/ExportPasswordWindow.strings b/ui/pt.lproj/ExportPasswordWindow.strings
index 636dcd5..92aaf9f 100644
--- a/ui/pt.lproj/ExportPasswordWindow.strings
+++ b/ui/pt.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Palavra-chave...";
 
 /* 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" = "Por favor forneça a sua palavra-chave para iniciar";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Janela";
diff --git a/ui/pt.lproj/GeneralPrefs.strings b/ui/pt.lproj/GeneralPrefs.strings
index 74e6ddc..5180fbd 100644
--- a/ui/pt.lproj/GeneralPrefs.strings
+++ b/ui/pt.lproj/GeneralPrefs.strings
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "Atualização";
 
 /* 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" = "Ativar notificações para chamadas recebidas";
 
 /* 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";
+"uYI-hA-JHk.title" = "Trazer o Jami para o primeiro plano ao receber chamadas";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
 "vbU-2S-O58.title" = "Isto é compartilhado com seus contactos";
diff --git a/ui/pt.lproj/MainMenu.strings b/ui/pt.lproj/MainMenu.strings
index 4d38351..f28ecac 100644
--- a/ui/pt.lproj/MainMenu.strings
+++ b/ui/pt.lproj/MainMenu.strings
@@ -33,10 +33,10 @@
 "131.title" = "Serviços";
 
 /* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
-"134.title" = "Hide Jami";
+"134.title" = "Esconder Jami";
 
 /* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
-"136.title" = "Quit Jami";
+"136.title" = "Sair do Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Esconder Outros";
@@ -189,7 +189,7 @@
 "491.title" = "Ajuda";
 
 /* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
-"492.title" = "Jami Help";
+"492.title" = "Ajuda do Jami";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Pesquisar e Substituir...";
diff --git a/ui/pt.lproj/MigrateRingAccountsWindow.strings b/ui/pt.lproj/MigrateRingAccountsWindow.strings
index dac04bf..3790fe8 100644
--- a/ui/pt.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/pt.lproj/MigrateRingAccountsWindow.strings
@@ -6,7 +6,7 @@
 "859-10-HEb.placeholderString" = "ID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed 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 Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Jami account format:\\n Alias : \\nID:\\n To proceed 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 your not ready to choose a password, you may close Jami and resume the migration later.";
+"859-10-HEb.title" = "A seguinte conta tem de ser migrada para o novo formato da conta Jami:\\nApelido: \\nID:\\nPara continuar a migração, tem de escolher uma palavra-chave para a sua conta. Esta palavra-chave será utilizada para criptografar a sua palavra-chave mestre. Ela será solicitada quando forem adicionados novos dispositivos na sua conta Jami. Caso não decida criar uma palavra-chave agora, pode fechar o Jami e continuar com a migração mais tarde.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "Erro de migração de conta";
diff --git a/ui/pt.lproj/PreferencesWindow.strings b/ui/pt.lproj/PreferencesWindow.strings
index e1e83c9..b381a0c 100644
--- a/ui/pt.lproj/PreferencesWindow.strings
+++ b/ui/pt.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" = "Preferências do Jami";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "Geral";
diff --git a/ui/pt.lproj/RegisterNameWindow.strings b/ui/pt.lproj/RegisterNameWindow.strings
index 65c7aea..ad50c95 100644
--- a/ui/pt.lproj/RegisterNameWindow.strings
+++ b/ui/pt.lproj/RegisterNameWindow.strings
@@ -3,7 +3,7 @@
 "1TO-Ov-S8j.placeholderString" = "Obrigatório*";
 
 /* 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" = "Os outros utilizadores pode usá-lo em vez do seu ID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
 "Aeh-tK-RjX.title" = "Ocorreu um erro durante o registo do seu nome de utilizador";
diff --git a/ui/pt.lproj/RingWindow.strings b/ui/pt.lproj/RingWindow.strings
index b28ea42..f8b958b 100644
--- a/ui/pt.lproj/RingWindow.strings
+++ b/ui/pt.lproj/RingWindow.strings
@@ -33,7 +33,7 @@
 "Wi9-Zd-O1N.label" = "Histórico";
 
 /* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
+"Xb9-UT-M2F.title" = "Este é o seu ID. \n Copie-o e partilhe-o com os seus amigos!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contatos";
diff --git a/ui/pt.lproj/RingWizardLinkAccount.strings b/ui/pt.lproj/RingWizardLinkAccount.strings
index 0442cad..f49b7fb 100644
--- a/ui/pt.lproj/RingWizardLinkAccount.strings
+++ b/ui/pt.lproj/RingWizardLinkAccount.strings
@@ -9,7 +9,7 @@
 "4ev-TK-8Yt.title" = "Cancelar";
 
 /* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  "; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  ";
+"4me-D9-6GK.title" = "Aceda às configurações de gestão de conta no dispositivo, escolha a \nconta Jami a usar e selecione \"Associar outro dispositivo a esta conta\". ↵";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Associar";
diff --git a/ui/pt.lproj/RingWizardNewAccount.strings b/ui/pt.lproj/RingWizardNewAccount.strings
index a6eb4fe..40ca4ff 100644
--- a/ui/pt.lproj/RingWizardNewAccount.strings
+++ b/ui/pt.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
+"0qE-Sz-hdc.title" = "Ao ativar isto, irá registar um nome de utilizador único na rede Jami. As pessoas podem usá-lo para o contactar em vez de usarem o seu ID, que contém 40 caracteres.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obrigatório*";
diff --git a/ui/pt_PT.lproj/ExportPasswordWindow.strings b/ui/pt_PT.lproj/ExportPasswordWindow.strings
index 636dcd5..92aaf9f 100644
--- a/ui/pt_PT.lproj/ExportPasswordWindow.strings
+++ b/ui/pt_PT.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Palavra-chave...";
 
 /* 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" = "Por favor forneça a sua palavra-chave para iniciar";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Janela";
diff --git a/ui/pt_PT.lproj/GeneralPrefs.strings b/ui/pt_PT.lproj/GeneralPrefs.strings
index 74e6ddc..5180fbd 100644
--- a/ui/pt_PT.lproj/GeneralPrefs.strings
+++ b/ui/pt_PT.lproj/GeneralPrefs.strings
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "Atualização";
 
 /* 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" = "Ativar notificações para chamadas recebidas";
 
 /* 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";
+"uYI-hA-JHk.title" = "Trazer o Jami para o primeiro plano ao receber chamadas";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
 "vbU-2S-O58.title" = "Isto é compartilhado com seus contactos";
diff --git a/ui/pt_PT.lproj/MainMenu.strings b/ui/pt_PT.lproj/MainMenu.strings
index 4d38351..88f4710 100644
--- a/ui/pt_PT.lproj/MainMenu.strings
+++ b/ui/pt_PT.lproj/MainMenu.strings
@@ -33,10 +33,10 @@
 "131.title" = "Serviços";
 
 /* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
-"134.title" = "Hide Jami";
+"134.title" = "Esconder o Jami";
 
 /* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
-"136.title" = "Quit Jami";
+"136.title" = "Sair do Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Esconder Outros";
@@ -189,7 +189,7 @@
 "491.title" = "Ajuda";
 
 /* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
-"492.title" = "Jami Help";
+"492.title" = "Ajuda do Jami";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Pesquisar e Substituir...";
diff --git a/ui/pt_PT.lproj/MigrateRingAccountsWindow.strings b/ui/pt_PT.lproj/MigrateRingAccountsWindow.strings
index 1ced896..9770ebe 100644
--- a/ui/pt_PT.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/pt_PT.lproj/MigrateRingAccountsWindow.strings
@@ -6,7 +6,7 @@
 "859-10-HEb.placeholderString" = "ID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed 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 Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Jami account format:\\n Alias : \\nID:\\n To proceed 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 your not ready to choose a password, you may close Jami and resume the migration later.";
+"859-10-HEb.title" = "A seguinte conta tem de ser migrada para o novo formato da conta Jami:\\nApelido: \\nID:\\nPara continuar a migração, tem de escolher uma palavra-chave para a sua conta. Esta palavra-chave será utilizada para criptografar a sua palavra-chave mestre. Ela será solicitada quando forem adicionados novos dispositivos na sua conta Jami. Caso não decida criar uma palavra-chave agora, pode fechar o Jami e continuar com a migração mais tarde.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "Erro de migração de conta";
diff --git a/ui/pt_PT.lproj/PreferencesWindow.strings b/ui/pt_PT.lproj/PreferencesWindow.strings
index 556484d..199e88d 100644
--- a/ui/pt_PT.lproj/PreferencesWindow.strings
+++ b/ui/pt_PT.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" = "Preferências do Jami";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "Geral";
diff --git a/ui/pt_PT.lproj/RegisterNameWindow.strings b/ui/pt_PT.lproj/RegisterNameWindow.strings
index 1213639..f62e6cd 100644
--- a/ui/pt_PT.lproj/RegisterNameWindow.strings
+++ b/ui/pt_PT.lproj/RegisterNameWindow.strings
@@ -3,7 +3,7 @@
 "1TO-Ov-S8j.placeholderString" = "Obrigatório*";
 
 /* 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" = "Os outros utilizadores pode usá-lo em vez do seu ID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
 "Aeh-tK-RjX.title" = "Ocorreu um erro durante o registo do seu nome de utilizador";
diff --git a/ui/pt_PT.lproj/RingWindow.strings b/ui/pt_PT.lproj/RingWindow.strings
index 059a80a..a766b3e 100644
--- a/ui/pt_PT.lproj/RingWindow.strings
+++ b/ui/pt_PT.lproj/RingWindow.strings
@@ -33,7 +33,7 @@
 "Wi9-Zd-O1N.label" = "Histórico";
 
 /* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
+"Xb9-UT-M2F.title" = "Este é o seu ID. \n Copie-o e partilhe-o com os seus amigos!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contactos";
diff --git a/ui/pt_PT.lproj/RingWizardLinkAccount.strings b/ui/pt_PT.lproj/RingWizardLinkAccount.strings
index c610e41..d9c0441 100644
--- a/ui/pt_PT.lproj/RingWizardLinkAccount.strings
+++ b/ui/pt_PT.lproj/RingWizardLinkAccount.strings
@@ -9,7 +9,7 @@
 "4ev-TK-8Yt.title" = "Cancelar";
 
 /* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  "; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  ";
+"4me-D9-6GK.title" = "Aceda às configurações de gestão de conta no dispositivo, escolha a \nconta Jami a usar e selecione \"Associar outro dispositivo a esta conta\". ↵";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Associar";
diff --git a/ui/pt_PT.lproj/RingWizardNewAccount.strings b/ui/pt_PT.lproj/RingWizardNewAccount.strings
index 186d2aa..267ba53 100644
--- a/ui/pt_PT.lproj/RingWizardNewAccount.strings
+++ b/ui/pt_PT.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
+"0qE-Sz-hdc.title" = "Ao ativar isto, irá registar um nome de utilizador único na rede Jami. As pessoas podem usá-lo para o contactar em vez de usarem o seu ID, que contém 40 caracteres.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obrigatório*";
diff --git a/ui/sq_AL.lproj/ExportPasswordWindow.strings b/ui/sq_AL.lproj/ExportPasswordWindow.strings
index fb06fab..bc67d3c 100644
--- a/ui/sq_AL.lproj/ExportPasswordWindow.strings
+++ b/ui/sq_AL.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Fjalëkalim…";
 
 /* 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" = "Ju lutemi, që t’ia fillohet, jepni fjalëkalimin tuaj";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Dritare";
diff --git a/ui/sq_AL.lproj/GeneralPrefs.strings b/ui/sq_AL.lproj/GeneralPrefs.strings
index 722bbab..d34b5a8 100644
--- a/ui/sq_AL.lproj/GeneralPrefs.strings
+++ b/ui/sq_AL.lproj/GeneralPrefs.strings
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "Përditësim";
 
 /* 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" = "Aktivizo njoftimet për thirrje ardhëse";
 
 /* 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";
+"uYI-hA-JHk.title" = "Sille Jami-n përpara për thirrje ardhëse";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
 "vbU-2S-O58.title" = "Kjo ndahet me kontaktet tuaja";
diff --git a/ui/sq_AL.lproj/MainMenu.strings b/ui/sq_AL.lproj/MainMenu.strings
index 9a2ad09..5848c40 100644
--- a/ui/sq_AL.lproj/MainMenu.strings
+++ b/ui/sq_AL.lproj/MainMenu.strings
@@ -33,10 +33,10 @@
 "131.title" = "Shërbime";
 
 /* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
-"134.title" = "Hide Jami";
+"134.title" = "Fshihe Jami-n";
 
 /* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
-"136.title" = "Quit Jami";
+"136.title" = "Mbylle Jami-n";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Fshihi të Tjerët";
@@ -189,7 +189,7 @@
 "491.title" = "Ndihmë";
 
 /* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
-"492.title" = "Jami Help";
+"492.title" = "Ndihmë për Jami-n";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Gjeni dhe Zëvendësoni…";
diff --git a/ui/sq_AL.lproj/MigrateRingAccountsWindow.strings b/ui/sq_AL.lproj/MigrateRingAccountsWindow.strings
index bf47ab0..bdf78bb 100644
--- a/ui/sq_AL.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/sq_AL.lproj/MigrateRingAccountsWindow.strings
@@ -6,7 +6,7 @@
 "859-10-HEb.placeholderString" = "ID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed 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 Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Jami account format:\\n Alias : \\nID:\\n To proceed 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 your not ready to choose a password, you may close Jami and resume the migration later.";
+"859-10-HEb.title" = "Llogaria vijuese lypset të migrohet nën formatin e llogarisë së re Jami:\\n Alias : \\nID:\\n Që të vazhdohet me migrimin, duhet të zgjidhni për llogarinë tuaj një fjalëkalim. Ky fjalëkalim do të përdoret për të fshehtëzuar kyçin tuaj të përgjithshëm. Do të kërkohet për shtim pajisjesh të reja te llogaria juaj Jami. Nëse s’jeni gati të zgjidhni një fjalëkalim, mund ta mbyllni Jami-un dhe t’i riktheheni migrimit më vonë.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "Gabim migrimi llogarie";
diff --git a/ui/sq_AL.lproj/PreferencesWindow.strings b/ui/sq_AL.lproj/PreferencesWindow.strings
index 88ff765..8f8859e 100644
--- a/ui/sq_AL.lproj/PreferencesWindow.strings
+++ b/ui/sq_AL.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" = "Parapëlqime për Jami-n";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "Të përgjithshme";
diff --git a/ui/sq_AL.lproj/RegisterNameWindow.strings b/ui/sq_AL.lproj/RegisterNameWindow.strings
index 2bca003..10cfd4e 100644
--- a/ui/sq_AL.lproj/RegisterNameWindow.strings
+++ b/ui/sq_AL.lproj/RegisterNameWindow.strings
@@ -3,7 +3,7 @@
 "1TO-Ov-S8j.placeholderString" = "E detyrueshme*";
 
 /* 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" = "Përdorues të tjerë mund të përdorin këtë, në vend se të ID-së tuaj";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
 "Aeh-tK-RjX.title" = "Ndodhi një gabim gjatë regjistrimit të emrit tuaj të përdoruesit";
diff --git a/ui/sq_AL.lproj/RingWindow.strings b/ui/sq_AL.lproj/RingWindow.strings
index 7418385..a60d970 100644
--- a/ui/sq_AL.lproj/RingWindow.strings
+++ b/ui/sq_AL.lproj/RingWindow.strings
@@ -33,7 +33,7 @@
 "Wi9-Zd-O1N.label" = "Historik";
 
 /* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
+"Xb9-UT-M2F.title" = "Kjo është ID-ja juaj. \n Kopjojeni dhe jepuani shokëve!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakte";
diff --git a/ui/sq_AL.lproj/RingWizardLinkAccount.strings b/ui/sq_AL.lproj/RingWizardLinkAccount.strings
index 6b47bc7..17673ca 100644
--- a/ui/sq_AL.lproj/RingWizardLinkAccount.strings
+++ b/ui/sq_AL.lproj/RingWizardLinkAccount.strings
@@ -9,7 +9,7 @@
 "4ev-TK-8Yt.title" = "Anuloje";
 
 /* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  "; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  ";
+"4me-D9-6GK.title" = "Shkoni te rregullimet e pajisjes për administrim llogarish, zgjidhni llogarinë Jami që do përdorur dhe përzgjidhni \"Lidhni një tjetër pajisje te kjo llogari\". ↵";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Lidhje";
diff --git a/ui/sq_AL.lproj/RingWizardNewAccount.strings b/ui/sq_AL.lproj/RingWizardNewAccount.strings
index 5e37dbc..b5f5ae1 100644
--- a/ui/sq_AL.lproj/RingWizardNewAccount.strings
+++ b/ui/sq_AL.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
+"0qE-Sz-hdc.title" = "Duke i vënë shenjë kësaj, do të regjistroni një emër përdoruesi unik në rrjetin Jami. Njerëzit mund ta përdorin për t’u lidhur me ju, në vend se të ID-së tuaj Ring, që është 40 shenja i gjatë.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "E detyrueshme*";
diff --git a/ui/sv.lproj/ExportPasswordWindow.strings b/ui/sv.lproj/ExportPasswordWindow.strings
index a0dc2e2..e0ae15c 100644
--- a/ui/sv.lproj/ExportPasswordWindow.strings
+++ b/ui/sv.lproj/ExportPasswordWindow.strings
@@ -12,7 +12,7 @@
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Lösenord...";
 
 /* 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" = "Ange ditt lösenord för att starta";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Fönster";
diff --git a/ui/sv.lproj/GeneralPrefs.strings b/ui/sv.lproj/GeneralPrefs.strings
index 14de712..2b1b5be 100644
--- a/ui/sv.lproj/GeneralPrefs.strings
+++ b/ui/sv.lproj/GeneralPrefs.strings
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "Uppdatera";
 
 /* 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" = "Aktivera avisering för inkommande samtal";
 
 /* 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";
+"uYI-hA-JHk.title" = "Visa Jami i förgrunden vid inkommande samtal";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
 "vbU-2S-O58.title" = "Detta delas med dina kontakter";
diff --git a/ui/sv.lproj/MainMenu.strings b/ui/sv.lproj/MainMenu.strings
index 4f8132c..6ef974b 100644
--- a/ui/sv.lproj/MainMenu.strings
+++ b/ui/sv.lproj/MainMenu.strings
@@ -33,10 +33,10 @@
 "131.title" = "Tjänster";
 
 /* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
-"134.title" = "Hide Jami";
+"134.title" = "Dölj Jami";
 
 /* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
-"136.title" = "Quit Jami";
+"136.title" = "Avsluta Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Dölj annat";
@@ -189,7 +189,7 @@
 "491.title" = "Hjälp";
 
 /* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
-"492.title" = "Jami Help";
+"492.title" = "Jami-hjälp";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Sök och ersätt…";
diff --git a/ui/sv.lproj/MigrateRingAccountsWindow.strings b/ui/sv.lproj/MigrateRingAccountsWindow.strings
index 28e40d7..b5373f6 100644
--- a/ui/sv.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/sv.lproj/MigrateRingAccountsWindow.strings
@@ -6,7 +6,7 @@
 "859-10-HEb.placeholderString" = "ID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed 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 Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Jami account format:\\n Alias : \\nID:\\n To proceed 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 your not ready to choose a password, you may close Jami and resume the migration later.";
+"859-10-HEb.title" = "Följande konto behöver migreras till det nya Jami-kontoformatet:\\nAlias:\\nID:\\nFör att fortsätta migreringen måste du välja ett lösenord för kontot. Lösenordet kommer att användas för att kryptera din \"huvudnyckel\". Det kommer också att krävas för att lägga till nya enheter till ditt Jami-konto. Om du inte är redo att välja ett lösenord, kan du stänga Jami och återuppta migreringen senare.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "Kontomigreringsfel";
diff --git a/ui/sv.lproj/PreferencesWindow.strings b/ui/sv.lproj/PreferencesWindow.strings
index f155442..2621c99 100644
--- a/ui/sv.lproj/PreferencesWindow.strings
+++ b/ui/sv.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-inställningar";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "Allmänt";
diff --git a/ui/sv.lproj/RegisterNameWindow.strings b/ui/sv.lproj/RegisterNameWindow.strings
index f62a730..06cb2f9 100644
--- a/ui/sv.lproj/RegisterNameWindow.strings
+++ b/ui/sv.lproj/RegisterNameWindow.strings
@@ -3,7 +3,7 @@
 "1TO-Ov-S8j.placeholderString" = "Obligatoriskt*";
 
 /* 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" = "Andra användare kan använda det istället för ditt ID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
 "Aeh-tK-RjX.title" = "Ett fel inträffade under registreringen av användarnamnet";
diff --git a/ui/sv.lproj/RingWindow.strings b/ui/sv.lproj/RingWindow.strings
index 11ccde9..e6db318 100644
--- a/ui/sv.lproj/RingWindow.strings
+++ b/ui/sv.lproj/RingWindow.strings
@@ -33,7 +33,7 @@
 "Wi9-Zd-O1N.label" = "Historik";
 
 /* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
+"Xb9-UT-M2F.title" = "Detta är ditt ID.\nKopiera och dela det med dina vänner!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakter";
diff --git a/ui/sv.lproj/RingWizardLinkAccount.strings b/ui/sv.lproj/RingWizardLinkAccount.strings
index 719cad1..cdbca9a 100644
--- a/ui/sv.lproj/RingWizardLinkAccount.strings
+++ b/ui/sv.lproj/RingWizardLinkAccount.strings
@@ -9,7 +9,7 @@
 "4ev-TK-8Yt.title" = "Avbryt";
 
 /* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  "; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  ";
+"4me-D9-6GK.title" = "Gå till kontohanteringen på enheten, välj önskat Jami-konto och välj \"Koppla en annan enhet till detta konto\".";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Länka";
diff --git a/ui/sv.lproj/RingWizardNewAccount.strings b/ui/sv.lproj/RingWizardNewAccount.strings
index 47f8080..66c58d8 100644
--- a/ui/sv.lproj/RingWizardNewAccount.strings
+++ b/ui/sv.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
+"0qE-Sz-hdc.title" = "Genom att aktivera detta, registrerar du ett unikt användarnamn på Jami-nätverket. Folk kan använda det för att kontakta dig, istället för att använda ditt ID, som är 40 tecken långt.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obligatoriskt*";
diff --git a/ui/zh_TW.lproj/ExportPasswordWindow.strings b/ui/zh_TW.lproj/ExportPasswordWindow.strings
index 2e9f45b..c16d710 100644
--- a/ui/zh_TW.lproj/ExportPasswordWindow.strings
+++ b/ui/zh_TW.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" = "視窗";
diff --git a/ui/zh_TW.lproj/GeneralPrefs.strings b/ui/zh_TW.lproj/GeneralPrefs.strings
index ab36f79..c767168 100644
--- a/ui/zh_TW.lproj/GeneralPrefs.strings
+++ b/ui/zh_TW.lproj/GeneralPrefs.strings
@@ -45,10 +45,10 @@
 "r4u-t3-gBc.title" = "更新";
 
 /* 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" = "啟用來電通知";
 
 /* 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";
+"uYI-hA-JHk.title" = "有來電時將 Jami 帶到前景";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
 "vbU-2S-O58.title" = "這會與您的聯絡人分享";
diff --git a/ui/zh_TW.lproj/Localizable.strings b/ui/zh_TW.lproj/Localizable.strings
index cab5890..a6180a9 100644
--- a/ui/zh_TW.lproj/Localizable.strings
+++ b/ui/zh_TW.lproj/Localizable.strings
@@ -183,7 +183,7 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Welcome to Jami";
+"Welcome to Ring" = "歡迎來到 Jami";
 "Create a new account" = "建立新帳號";
 "Add a SIP account" = "Add a SIP account";
 
diff --git a/ui/zh_TW.lproj/MainMenu.strings b/ui/zh_TW.lproj/MainMenu.strings
index 7c0c5bc..eca360a 100644
--- a/ui/zh_TW.lproj/MainMenu.strings
+++ b/ui/zh_TW.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" = "偏好設定...";
@@ -33,10 +33,10 @@
 "131.title" = "服務";
 
 /* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
-"134.title" = "Hide Jami";
+"134.title" = "隱藏 Jami";
 
 /* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
-"136.title" = "Quit Jami";
+"136.title" = "離開 Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "隱藏其他";
@@ -189,7 +189,7 @@
 "491.title" = "說明";
 
 /* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
-"492.title" = "Jami Help";
+"492.title" = "Jami 說明";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "尋找與取代...";
diff --git a/ui/zh_TW.lproj/MigrateRingAccountsWindow.strings b/ui/zh_TW.lproj/MigrateRingAccountsWindow.strings
index 46c34e9..274f5ca 100644
--- a/ui/zh_TW.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/zh_TW.lproj/MigrateRingAccountsWindow.strings
@@ -6,7 +6,7 @@
 "859-10-HEb.placeholderString" = "ID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed 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 Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Jami account format:\\n Alias : \\nID:\\n To proceed 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 your not ready to choose a password, you may close Jami and resume the migration later.";
+"859-10-HEb.title" = "下列帳號需要遷移到新的 Jami 帳號格式：\\n 別名：\\nID:\\n 要進行遷移，你需要為你的帳號選擇密碼。這個密碼將會被用來加密你的主要金鑰。加入新裝置到你的 Jami 帳號時需要密碼。如果你還沒準備好要選擇密碼，你可以關閉 Jami 並且稍候再繼續遷移。";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "帳號遷移錯誤";
diff --git a/ui/zh_TW.lproj/PreferencesWindow.strings b/ui/zh_TW.lproj/PreferencesWindow.strings
index 335c47a..c840c2f 100644
--- a/ui/zh_TW.lproj/PreferencesWindow.strings
+++ b/ui/zh_TW.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/RegisterNameWindow.strings b/ui/zh_TW.lproj/RegisterNameWindow.strings
index c68c592..6c446ac 100644
--- a/ui/zh_TW.lproj/RegisterNameWindow.strings
+++ b/ui/zh_TW.lproj/RegisterNameWindow.strings
@@ -3,7 +3,7 @@
 "1TO-Ov-S8j.placeholderString" = "強制*";
 
 /* 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" = "其他使用者可以使用它而不是你的 ID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
 "Aeh-tK-RjX.title" = "你的使用者名稱註冊時發生錯誤";
diff --git a/ui/zh_TW.lproj/RingWindow.strings b/ui/zh_TW.lproj/RingWindow.strings
index b55f76f..b8f0054 100644
--- a/ui/zh_TW.lproj/RingWindow.strings
+++ b/ui/zh_TW.lproj/RingWindow.strings
@@ -33,7 +33,7 @@
 "Wi9-Zd-O1N.label" = "歷史記錄";
 
 /* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
+"Xb9-UT-M2F.title" = "這是你的 ID。\n複製並與你的朋友分享！";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "聯絡人";
diff --git a/ui/zh_TW.lproj/RingWizard.strings b/ui/zh_TW.lproj/RingWizard.strings
index 5a5f608..020cecc 100644
--- a/ui/zh_TW.lproj/RingWizard.strings
+++ b/ui/zh_TW.lproj/RingWizard.strings
@@ -1,3 +1,3 @@
 
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
-"2mM-yx-BfM.title" = "歡迎來到 Ring";
+/* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "歡迎來到 Jami";
diff --git a/ui/zh_TW.lproj/RingWizardLinkAccount.strings b/ui/zh_TW.lproj/RingWizardLinkAccount.strings
index 9951c9b..13abf9d 100644
--- a/ui/zh_TW.lproj/RingWizardLinkAccount.strings
+++ b/ui/zh_TW.lproj/RingWizardLinkAccount.strings
@@ -9,7 +9,7 @@
 "4ev-TK-8Yt.title" = "取消";
 
 /* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  "; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\".  ";
+"4me-D9-6GK.title" = "到裝置的帳號管理設定頁面，選擇使用 Jami 帳號並選取「連結其他裝置到此帳號」。\n";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "連結";
diff --git a/ui/zh_TW.lproj/RingWizardNewAccount.strings b/ui/zh_TW.lproj/RingWizardNewAccount.strings
index 149d406..0acdb30 100644
--- a/ui/zh_TW.lproj/RingWizardNewAccount.strings
+++ b/ui/zh_TW.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
+"0qE-Sz-hdc.title" = "透過勾選這個，您將會在 Jami 網路上註冊一個獨一無二的使用者名稱。人們可以使用它來聯絡您，而不必使用長達 40 個字元的您的 ID。";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "強制*";