diff --git a/ui/ar.lproj/AccAdvancedRing.strings b/ui/ar.lproj/AccAdvancedRing.strings
index 25725a65980d65bb9b2f3d94d683990b3c27daa9..13499f50b85171fdf818de3e5ba6477f9db5fb12 100644
--- a/ui/ar.lproj/AccAdvancedRing.strings
+++ b/ui/ar.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "السماح لأطراف غير موثوقة بالاتصال";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "بروتوكول UPnP";
diff --git a/ui/ar.lproj/Localizable.strings b/ui/ar.lproj/Localizable.strings
index ad964399b37d8b37d2a9f703bd6a76fd1d85dd37..7c12ff73b2c420f30172fb2b3015818e12838c58 100644
--- a/ui/ar.lproj/Localizable.strings
+++ b/ui/ar.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "اقبل";
 
+/* Button Action */
+"Cancel" = "ألغِ";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "منجز";
+
+/* Edit Sip Account Action */
+"Edit Account" = "تعديل الحساب";
+
diff --git a/ui/bg.lproj/AccAdvancedRing.strings b/ui/bg.lproj/AccAdvancedRing.strings
index ca58084d883312aa97cb2fa5e074325f8d5c982d..5ff430e0ca0d178514bbe6985674fe76ccf282bc 100644
--- a/ui/bg.lproj/AccAdvancedRing.strings
+++ b/ui/bg.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/bg.lproj/Localizable.strings b/ui/bg.lproj/Localizable.strings
index 2797076d0fe4f08b6ab38f820a3b94b6a9020870..81a1ad91cd616c53403735b8a631d7daabd85c15 100644
--- a/ui/bg.lproj/Localizable.strings
+++ b/ui/bg.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Приемане";
 
+/* Button Action */
+"Cancel" = "Отказ";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Промяна на парола";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Готово";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Редактиране на акаунта";
+
diff --git a/ui/ca.lproj/AccAdvancedRing.strings b/ui/ca.lproj/AccAdvancedRing.strings
index 68b2aac3e20b72c677c8de8ff35cc88d7b012f83..3d036f5f72b7b012d54d445acf001cb5ac5f88b6 100644
--- a/ui/ca.lproj/AccAdvancedRing.strings
+++ b/ui/ca.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/ca.lproj/Localizable.strings b/ui/ca.lproj/Localizable.strings
index 1a008d16da4eb978b273ad5abd4a91e422e0bf2f..14767eef40a169786d9cccb5e2eb834746aaa61d 100644
--- a/ui/ca.lproj/Localizable.strings
+++ b/ui/ca.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accepta";
 
+/* Button Action */
+"Cancel" = "Cancel·la";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Fet";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/cs_CZ.lproj/AccAdvancedRing.strings b/ui/cs_CZ.lproj/AccAdvancedRing.strings
index dad9055a64e2b61950ab2b5bc974ddc6cf37b0c4..429d75b440955efbb2283432ab2a1981f542b001 100644
--- a/ui/cs_CZ.lproj/AccAdvancedRing.strings
+++ b/ui/cs_CZ.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Povolit hovory od nehodnověrných uživatelů";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/cs_CZ.lproj/Localizable.strings b/ui/cs_CZ.lproj/Localizable.strings
index adf87a56d0b93480b95604c2ac4cfe9649f58c32..462e3022a297a6b724289400a8d6df9b96e5c52c 100644
--- a/ui/cs_CZ.lproj/Localizable.strings
+++ b/ui/cs_CZ.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Přijmout";
 
+/* Button Action */
+"Cancel" = "Zrušit";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Změnit heslo";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Hotovo";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Upravit účet";
+
diff --git a/ui/da.lproj/AccAdvancedRing.strings b/ui/da.lproj/AccAdvancedRing.strings
index 5efb424bb350c90ad11ce13409679dee2721b542..eeda587a8f3a570e6d7cfe49c0b48d8d5c00d02a 100644
--- a/ui/da.lproj/AccAdvancedRing.strings
+++ b/ui/da.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Tillad opkald fra partnere som der ikke er tillid til";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/da.lproj/Localizable.strings b/ui/da.lproj/Localizable.strings
index 44b47fcac1a650e7535144911aa41a5b469662fc..93564720832a4a624c9b2469b57f39cb52d4ac11 100644
--- a/ui/da.lproj/Localizable.strings
+++ b/ui/da.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accepter";
 
+/* Button Action */
+"Cancel" = "Annuller";
+
 /* Welcome title */
 "Add a SIP account" = "Tilføj en SIP-konto";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Skift adgangskode";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Færdig";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Rediger konto";
+
diff --git a/ui/de.lproj/AccAdvancedRing.strings b/ui/de.lproj/AccAdvancedRing.strings
index ae98105da86093d5cc1dbc57e3ec6da54c885d8f..8a4ba03fcc38e136f28812ff316a4f038fe184fb 100644
--- a/ui/de.lproj/AccAdvancedRing.strings
+++ b/ui/de.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Anruf von nicht vertrauenswürdigen Gegenstellen erlauben";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/de.lproj/Localizable.strings b/ui/de.lproj/Localizable.strings
index 7034473521f62dd4359bf01f3152277c0e88cd96..4b94ffe05f909476026b4aff09d49583c1d65327 100644
--- a/ui/de.lproj/Localizable.strings
+++ b/ui/de.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Akzeptieren";
 
+/* Button Action */
+"Cancel" = "Abbrechen";
+
 /* Welcome title */
 "Add a SIP account" = "SIP-Konto hinzufügen";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Möchten Sie eine Nachricht hinterlassen?";
 
+/* Password button title */
+"Change password" = "Passwort ändern";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Erledigt";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Konto bearbeiten";
+
diff --git a/ui/de_DE.lproj/AccAdvancedRing.strings b/ui/de_DE.lproj/AccAdvancedRing.strings
index e9257b55f41a55fe73d28ddef33b57075bca7c25..cb89228ae5e6e167131b8fa2a141d80448be61b1 100644
--- a/ui/de_DE.lproj/AccAdvancedRing.strings
+++ b/ui/de_DE.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/de_DE.lproj/Localizable.strings b/ui/de_DE.lproj/Localizable.strings
index 63b7e66384a07548740c21c0d0207ef0fa4d972e..5142e4b7e4fb9d54e3f01c88297803563539a7b4 100644
--- a/ui/de_DE.lproj/Localizable.strings
+++ b/ui/de_DE.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Akzeptieren";
 
+/* Button Action */
+"Cancel" = "Abbrechen";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -116,7 +119,7 @@
 "Registered name: " = "Registered name: ";
 
 /* Remove account alert title */
-"Remove account" = "Remove account";
+"Remove account" = "Account entfernen";
 
 /* export account button title */
 "Select archive" = "Select archive";
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Passwort ändern";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/el.lproj/AccAdvancedRing.strings b/ui/el.lproj/AccAdvancedRing.strings
index 85c2ae320aff9710883ce6e3901454b211ada4a0..1251ab750fb5c2c497e7170e64ebb2d62b7f31f5 100644
--- a/ui/el.lproj/AccAdvancedRing.strings
+++ b/ui/el.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/el.lproj/Localizable.strings b/ui/el.lproj/Localizable.strings
index bd896d00acbb8268b3b698d8ea104c896295815f..69f4c3c8f875e937bc4cc29a9fdede1389423060 100644
--- a/ui/el.lproj/Localizable.strings
+++ b/ui/el.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Αποδοχή";
 
+/* Button Action */
+"Cancel" = "Ακύρωση";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Τροποποίηση λογαριασμού";
+
diff --git a/ui/eo.lproj/AccAdvancedRing.strings b/ui/eo.lproj/AccAdvancedRing.strings
index 178d2ae61f7d185fb34cc7f0b7d17a0e51bd6485..0b837d55f579bcdc8bba7b182c86ff084a5a8ead 100644
--- a/ui/eo.lproj/AccAdvancedRing.strings
+++ b/ui/eo.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/eo.lproj/Localizable.strings b/ui/eo.lproj/Localizable.strings
index 722e350862cf15bcfe93d19908c653bf4a43fe27..282354befed480e8413642423c8cdbe1686dc813 100644
--- a/ui/eo.lproj/Localizable.strings
+++ b/ui/eo.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Akcepti";
 
+/* Button Action */
+"Cancel" = "Rezigni";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Finita";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/es.lproj/AccAdvancedRing.strings b/ui/es.lproj/AccAdvancedRing.strings
index 4fdf3b789dfbae38d4a9c836d7866f3f78e76bff..a4961aa1937c499de5939123bf6306963461872a 100644
--- a/ui/es.lproj/AccAdvancedRing.strings
+++ b/ui/es.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Permitir llamadas de pares no confiables";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/es.lproj/Localizable.strings b/ui/es.lproj/Localizable.strings
index f48b68b324f3010abc37d6077ec99688fb592b91..61c61a3b96bfcdf1875af5f7adc8532c87d8576f 100644
--- a/ui/es.lproj/Localizable.strings
+++ b/ui/es.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Aceptar";
 
+/* Button Action */
+"Cancel" = "Cancelar";
+
 /* Welcome title */
 "Add a SIP account" = "Añadir una cuenta SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "¿Deseas dejar un mensaje?";
 
+/* Password button title */
+"Change password" = "Cambiar contraseña";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Hecho";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Editar cuenta";
+
diff --git a/ui/es_AR.lproj/AccAdvancedRing.strings b/ui/es_AR.lproj/AccAdvancedRing.strings
index 71b76ba9897c5b215fc73451c33cf72b330845fe..08bdcf345e6b104cbf806f786b45bf664bc7d107 100644
--- a/ui/es_AR.lproj/AccAdvancedRing.strings
+++ b/ui/es_AR.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/es_AR.lproj/Localizable.strings b/ui/es_AR.lproj/Localizable.strings
index de5ad72c4614216c261e39b8b119d93dcbc54154..4453b799023d667d7e691bcc106caad42ec1bbd1 100644
--- a/ui/es_AR.lproj/Localizable.strings
+++ b/ui/es_AR.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Aceptar";
 
+/* Button Action */
+"Cancel" = "Cancelar";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Cambiar contraseña";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Editar Cuenta";
+
diff --git a/ui/es_MX.lproj/AccRingGeneral.strings b/ui/es_MX.lproj/AccRingGeneral.strings
new file mode 100644
index 0000000000000000000000000000000000000000..70f739a93c3f4e6f27527e0f6b50131b9262965e
--- /dev/null
+++ b/ui/es_MX.lproj/AccRingGeneral.strings
@@ -0,0 +1,60 @@
+
+/* Class = "NSButtonCell"; title = "Export Account"; ObjectID = "1aj-MG-mHp"; */
+"1aj-MG-mHp.title" = "Export Account";
+
+/* Class = "NSTextFieldCell"; title = "Banned Contacts"; ObjectID = "6fI-98-VvQ"; */
+"6fI-98-VvQ.title" = "Banned Contacts";
+
+/* Class = "NSButtonCell"; title = "Advanced"; ObjectID = "Hbq-nL-BhK"; */
+"Hbq-nL-BhK.title" = "Advanced";
+
+/* Class = "NSButtonCell"; title = "Enable"; ObjectID = "Op4-XO-WsE"; */
+"Op4-XO-WsE.title" = "Enable";
+
+/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "TYk-QK-iaT"; */
+"TYk-QK-iaT.title" = "Password:";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Edit name"; ObjectID = "WEo-a0-wVL"; */
+"WEo-a0-wVL.ibShadowedToolTip" = "Edit name";
+
+/* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "Yf6-8d-SNh"; */
+"Yf6-8d-SNh.title" = "Remove Account";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
+"aQL-hX-CfA.title" = "Text Cell";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Unblock"; ObjectID = "bOY-mY-1Yo"; */
+"bOY-mY-1Yo.ibShadowedToolTip" = "Desbloquear";
+
+/* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "fPK-Zv-Uom"; */
+"fPK-Zv-Uom.title" = "Username:";
+
+/* Class = "NSButtonCell"; title = "Register"; ObjectID = "gLp-qz-XYs"; */
+"gLp-qz-XYs.title" = "Register";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "gTn-6p-Gtk"; */
+"gTn-6p-Gtk.title" = "Box";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "kt0-P6-fdQ"; */
+"kt0-P6-fdQ.placeholderString" = "Enter name";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Revoke"; ObjectID = "lrB-j5-Mvy"; */
+"lrB-j5-Mvy.ibShadowedToolTip" = "Revoke";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "oVO-wj-fwQ"; */
+"oVO-wj-fwQ.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
+"oga-WC-4gb.title" = "Linked devices";
+
+/* Class = "NSTextFieldCell"; title = "Identifier:"; ObjectID = "qx7-i1-3Na"; */
+"qx7-i1-3Na.title" = "Identifier:";
+
+/* Class = "NSButtonCell"; title = "Link another device"; ObjectID = "tWk-Od-BEQ"; */
+"tWk-Od-BEQ.title" = "Link another device";
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "uLQ-MS-pZ7"; */
+"uLQ-MS-pZ7.title" = "Cuenta";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "yYf-Ei-lMG"; */
+"yYf-Ei-lMG.title" = "Text Cell";
diff --git a/ui/es_MX.lproj/AccSipGeneral.strings b/ui/es_MX.lproj/AccSipGeneral.strings
new file mode 100644
index 0000000000000000000000000000000000000000..531469e6d12daccff7915e11598e8a581c402425
--- /dev/null
+++ b/ui/es_MX.lproj/AccSipGeneral.strings
@@ -0,0 +1,39 @@
+
+/* Class = "NSTextFieldCell"; title = "Proxy"; ObjectID = "688-Sx-Gvr"; */
+"688-Sx-Gvr.title" = "Proxy";
+
+/* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Fj6-Q3-Gz3"; */
+"Fj6-Q3-Gz3.title" = "User Name";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "NlM-R9-ola"; */
+"NlM-R9-ola.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "Voicemail"; ObjectID = "R7s-DE-PiP"; */
+"R7s-DE-PiP.title" = "Voicemail";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YAG-qB-4wH"; */
+"YAG-qB-4wH.placeholderString" = "Enter name";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "Yof-e7-IBF"; */
+"Yof-e7-IBF.title" = "Password";
+
+/* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ZKc-70-TFH"; */
+"ZKc-70-TFH.title" = "SIP Server";
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "eQt-bc-Eev"; */
+"eQt-bc-Eev.title" = "Cuenta";
+
+/* Class = "NSButtonCell"; title = "Advanced"; ObjectID = "iEr-fN-5vD"; */
+"iEr-fN-5vD.title" = "Advanced";
+
+/* Class = "NSButtonCell"; title = "Edit Account"; ObjectID = "jdU-uZ-Rfy"; */
+"jdU-uZ-Rfy.title" = "Edit Account";
+
+/* Class = "NSButtonCell"; title = "enable"; ObjectID = "nW8-pd-fNj"; */
+"nW8-pd-fNj.title" = "enable";
+
+/* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "oE8-tN-SfC"; */
+"oE8-tN-SfC.title" = "Profile";
+
+/* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "uFM-Am-0kz"; */
+"uFM-Am-0kz.title" = "Remove Account";
diff --git a/ui/es_MX.lproj/AddSIPAccountVC.strings b/ui/es_MX.lproj/AddSIPAccountVC.strings
new file mode 100644
index 0000000000000000000000000000000000000000..4a5a9114b1db666b6c725d1f9988ddd92202a985
--- /dev/null
+++ b/ui/es_MX.lproj/AddSIPAccountVC.strings
@@ -0,0 +1,33 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter SIP address"; ObjectID = "0UI-j5-0at"; */
+"0UI-j5-0at.placeholderString" = "Enter SIP address";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "Aem-zQ-Ya3"; */
+"Aem-zQ-Ya3.title" = "Password";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter password"; ObjectID = "DBU-zJ-vj6"; */
+"DBU-zJ-vj6.placeholderString" = "Enter password";
+
+/* Class = "NSButtonCell"; title = "Done"; ObjectID = "DJz-do-CJo"; */
+"DJz-do-CJo.title" = "Done";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "O1S-KI-2LG"; */
+"O1S-KI-2LG.title" = "Cancelar";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter username"; ObjectID = "Rej-Yd-PDb"; */
+"Rej-Yd-PDb.placeholderString" = "Enter username";
+
+/* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Srm-hv-9WR"; */
+"Srm-hv-9WR.title" = "User Name";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YeS-R8-ZLT"; */
+"YeS-R8-ZLT.placeholderString" = "Enter name";
+
+/* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "fgN-nq-QdO"; */
+"fgN-nq-QdO.title" = "Profile";
+
+/* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ubR-HD-O15"; */
+"ubR-HD-O15.title" = "SIP Server";
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "zAN-HT-1oE"; */
+"zAN-HT-1oE.title" = "Cuenta";
diff --git a/ui/es_MX.lproj/AudioPrefs.strings b/ui/es_MX.lproj/AudioPrefs.strings
new file mode 100644
index 0000000000000000000000000000000000000000..d394feccdf5c6257b2bca019a36c2a3c8c7ba417
--- /dev/null
+++ b/ui/es_MX.lproj/AudioPrefs.strings
@@ -0,0 +1,6 @@
+
+/* Class = "NSTextFieldCell"; title = "Output"; ObjectID = "2gZ-Ab-XHf"; */
+"2gZ-Ab-XHf.title" = "Salida";
+
+/* Class = "NSTextFieldCell"; title = "Input"; ObjectID = "x1o-rT-jy6"; */
+"x1o-rT-jy6.title" = "Entrada";
diff --git a/ui/es_MX.lproj/CurrentCall.strings b/ui/es_MX.lproj/CurrentCall.strings
new file mode 100644
index 0000000000000000000000000000000000000000..e4ce7b6be222c690d7d1cc10fdabcf853e8193b4
--- /dev/null
+++ b/ui/es_MX.lproj/CurrentCall.strings
@@ -0,0 +1,72 @@
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "2cB-dz-KYg"; */
+"2cB-dz-KYg.ibShadowedToolTip" = "Hang up";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "4xt-xs-LVn"; */
+"4xt-xs-LVn.title" = "Box";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "DSf-SJ-l6k"; */
+"DSf-SJ-l6k.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
+"GBy-HF-JeP.title" = "Label";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
+"KCp-bZ-69S.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "Kjq-iM-NBL"; */
+"Kjq-iM-NBL.ibShadowedToolTip" = "Hang up";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Mute Video"; ObjectID = "LVS-yZ-98V"; */
+"LVS-yZ-98V.ibShadowedToolTip" = "Mute Video";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedMultipleValuesPlaceholder" = "Send a message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedNoSelectionPlaceholder" = "Send a message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedNotApplicablePlaceholder" = "Send a message";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "QYT-0n-4sw"; */
+"QYT-0n-4sw.ibShadowedToolTip" = "Record";
+
+/* Class = "NSButton"; ibShadowedToolTip = "add contact to call"; ObjectID = "Vhk-fx-6RW"; */
+"Vhk-fx-6RW.ibShadowedToolTip" = "add contact to call";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "YGj-SP-ikj"; */
+"YGj-SP-ikj.title" = "Text Cell";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hold"; ObjectID = "anb-Y8-JQi"; */
+"anb-Y8-JQi.ibShadowedToolTip" = "En espera";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "d4g-hS-EMn"; */
+"d4g-hS-EMn.placeholderString" = "Send a message";
+
+/* Class = "NSTextFieldCell"; placeholderString = "State"; ObjectID = "dPt-JY-yxV"; */
+"dPt-JY-yxV.placeholderString" = "State";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
+"fmp-x4-Pef.ibShadowedToolTip" = "Toggle chat";
+
+/* Class = "NSTextFieldCell"; title = "person Id"; ObjectID = "hKi-Ay-ex5"; */
+"hKi-Ay-ex5.title" = "person Id";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "hfc-s5-yWK"; */
+"hfc-s5-yWK.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "ngO-WV-cXD"; */
+"ngO-WV-cXD.ibShadowedToolTip" = "Send a file";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
+"qgD-3D-nD5.ibShadowedToolTip" = "Pick up";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "rqa-be-VIB"; */
+"rqa-be-VIB.ibShadowedToolTip" = "Send";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Mute Audio"; ObjectID = "tQl-cT-0Lb"; */
+"tQl-cT-0Lb.ibShadowedToolTip" = "Mute Audio";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "ues-20-34k"; */
+"ues-20-34k.placeholderString" = "Person name";
diff --git a/ui/es_MX.lproj/ExportPasswordWindow.strings b/ui/es_MX.lproj/ExportPasswordWindow.strings
new file mode 100644
index 0000000000000000000000000000000000000000..eb1ddae92f0043cebf2fe6fa86f3319084d9d9f4
--- /dev/null
+++ b/ui/es_MX.lproj/ExportPasswordWindow.strings
@@ -0,0 +1,42 @@
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
+
+/* Class = "NSTextFieldCell"; title = "Please provide your password to start"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "Please provide your password to start";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "OK";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
+"cSU-aD-OwX.title" = "Cancelar";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "dfD-AK-f3R"; */
+"dfD-AK-f3R.title" = "OK";
+
+/* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.placeholderString" = "error label";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "OK";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "Password";
+
+/* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
+"wmv-sA-Mlh.title" = "Link another device to this account";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "Password...";
diff --git a/ui/es_MX.lproj/GeneralPrefs.strings b/ui/es_MX.lproj/GeneralPrefs.strings
new file mode 100644
index 0000000000000000000000000000000000000000..56efb3a38d878df8be0a528a7db6ad6bb27d761e
--- /dev/null
+++ b/ui/es_MX.lproj/GeneralPrefs.strings
@@ -0,0 +1,66 @@
+
+/* Class = "NSButtonCell"; title = "Enable notifications for incoming messages"; ObjectID = "0jV-Q4-232"; */
+"0jV-Q4-232.title" = "Enable notifications for incoming messages";
+
+/* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
+"42E-UY-qlP.title" = "Monthly";
+
+/* Class = "NSTextFieldCell"; title = "Download folder"; ObjectID = "6Ye-pe-9WV"; */
+"6Ye-pe-9WV.title" = "Download folder";
+
+/* Class = "NSButtonCell"; title = "Always record calls"; ObjectID = "6zp-rh-brb"; */
+"6zp-rh-brb.title" = "Always record calls";
+
+/* Class = "NSTextFieldCell"; title = "System"; ObjectID = "8xm-Tc-NMN"; */
+"8xm-Tc-NMN.title" = "System";
+
+/* Class = "NSTextFieldCell"; title = "  0"; ObjectID = "9sg-PF-ffw"; */
+"9sg-PF-ffw.title" = "  0";
+
+/* Class = "NSMenuItem"; title = "Weekly"; ObjectID = "AId-am-73Q"; */
+"AId-am-73Q.title" = "Weekly";
+
+/* Class = "NSTextFieldCell"; title = "Quality(Kbps)"; ObjectID = "AOr-Cq-w57"; */
+"AOr-Cq-w57.title" = "Quality(Kbps)";
+
+/* Class = "NSTextFieldCell"; title = "Notifications"; ObjectID = "I0d-mx-KhT"; */
+"I0d-mx-KhT.title" = "Notifications";
+
+/* Class = "NSTextFieldCell"; title = "6000"; ObjectID = "JGj-TS-Hxl"; */
+"JGj-TS-Hxl.title" = "6000";
+
+/* Class = "NSButtonCell"; title = "Enable notifications for invitations"; ObjectID = "Lww-Wb-yrf"; */
+"Lww-Wb-yrf.title" = "Enable notifications for invitations";
+
+/* Class = "NSButtonCell"; title = "Launch on Startup"; ObjectID = "O2C-xR-mHF"; */
+"O2C-xR-mHF.title" = "Launch on Startup";
+
+/* Class = "NSTextFieldCell"; title = "Call recording"; ObjectID = "Qb8-tb-vJd"; */
+"Qb8-tb-vJd.title" = "Call recording";
+
+/* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
+"T3a-yx-ZaW.title" = "Automatically check for updates";
+
+/* Class = "NSTextFieldCell"; title = "Conversations"; ObjectID = "ZCU-sa-SEk"; */
+"ZCU-sa-SEk.title" = "Conversaciones";
+
+/* Class = "NSMenuItem"; title = "Daily"; ObjectID = "cB6-4m-9MU"; */
+"cB6-4m-9MU.title" = "Daily";
+
+/* Class = "NSTextFieldCell"; title = "Record folder"; ObjectID = "ep4-QU-rGl"; */
+"ep4-QU-rGl.title" = "Record folder";
+
+/* Class = "NSMenuItem"; title = "Hourly"; ObjectID = "mbu-TH-bs8"; */
+"mbu-TH-bs8.title" = "Hourly";
+
+/* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
+"r4u-t3-gBc.title" = "Update";
+
+/* Class = "NSButtonCell"; title = "Enable notifications for incoming calls"; ObjectID = "uCL-ye-tsv"; */
+"uCL-ye-tsv.title" = "Enable notifications for incoming calls";
+
+/* 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";
+
+/* Class = "NSButtonCell"; title = "Record local video"; ObjectID = "y5x-4d-E26"; */
+"y5x-4d-E26.title" = "Record local video";
diff --git a/ui/es_MX.lproj/Localizable.strings b/ui/es_MX.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..8e05eff2bfd181917a5ee808026413d2044e431e
--- /dev/null
+++ b/ui/es_MX.lproj/Localizable.strings
@@ -0,0 +1,210 @@
+
+"A network error occured during the export" = "A network error occured during the export";
+
+/* Button Action */
+"Accept" = "Accept";
+
+/* Button Action */
+"Cancel" = "Cancelar";
+
+/* Welcome title */
+"Add a SIP account" = "Add a SIP account";
+
+/* Contextual menu action */
+"Add to contacts" = "Add to contacts";
+
+/* Backup error */
+"An error occured during the backup" = "An error occured during the backup";
+
+/* Error shown to the user */
+"An error occured during the export" = "An error occured during the export";
+
+/* Peer busy message */
+"appears to be busy." = "appears to be busy.";
+
+/* Error audio permission */
+"Audio permission not granted" = "Audio permission not granted";
+
+/* Backup account */
+"Backup your account" = "Backup your account";
+
+/* Contextual menu action */
+"Block contact" = "Block contact";
+
+/* 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.";
+
+/* File transfer canceled label */
+"Canceled" = "Canceled";
+
+/* Contextual menu entry */
+"Choose file" = "Choose file";
+
+/* Contextual menu action */
+"Clear conversation" = "Clear conversation";
+
+/* No comment provided by engineer. */
+"Copy" = "Copy";
+
+/* Recording view explanation label */
+"Could not record message during call" = "Could not record message during call";
+
+/* Welcome title */
+"Create a new account" = "Create a new account";
+
+/* Backup enter password */
+"Enter account password" = "Enter account password";
+
+/* File transfer failed label */
+"Failed" = "Falló";
+
+/* Error message shown to user when it is impossible to migrate account */
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+
+/* Text shown to user when an error occur at registration */
+"Failed to perform lookup" = "Failed to perform lookup";
+
+/* Text shown to the user */
+"ID: " = "ID: ";
+
+/* link account title */
+"Import from backup" = "Import from backup";
+
+/* link account title */
+"Import from other device" = "Import from other device";
+
+/* Incoming call from {Name} */
+"Incoming call from %@" = "Incoming call from %@";
+
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
+/* Text shown to user when his username is invalid to be registered */
+"Invalid username" = "Invalid username";
+
+/* Text shown to user when his username is invalid to be registered */
+"Invalid username." = "Invalid username.";
+
+/* Allert message when no accounts are available */
+"Navigate to preferences to create a new account" = "Navigate to preferences to create a new account";
+
+/* Displayed as RingID when no accounts are available for selection */
+"No account available" = "No account available";
+
+/* Text show to the user when password didn't match */
+"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+
+/* Indication for user */
+"Password is too short" = "Password is too short";
+
+/* Indication for user */
+"Passwords don't match" = "Passwords don't match";
+
+/* Contextual menu action */
+"Place audio call" = "Place audio call";
+
+/* Contextual menu action */
+"Place video call" = "Place video call";
+
+/* Recording view explanation label */
+"Press to start recording" = "Press to start recording";
+
+/* Record message title */
+"Record a message" = "Record a message";
+
+/* Button Action */
+"Refuse" = "Refuse";
+
+/* Text shown to the user */
+"Registered name: " = "Registered name: ";
+
+/* Remove account alert title */
+"Remove account" = "Remove account";
+
+/* export account button title */
+"Select archive" = "Select archive";
+
+/* Send button title */
+"Send" = "Send";
+
+/* Notification message */
+"Send you a contact request" = "Send you a contact request";
+
+/* No comment provided by engineer. */
+"Share" = "Share";
+
+/* Contextual menu entry */
+"Share screen" = "Share screen";
+
+/* Sign In */
+"Sign In" = "Sign In";
+
+/* Record message title */
+"Stop recording" = "Stop recording";
+
+/* File transfer successful label */
+"Success" = "Success";
+
+/* No comment provided by engineer. */
+"Text Actions" = "Text Actions";
+
+/* Text shown to user when his username is available to be registered */
+"The entered username is available" = "The entered username is available";
+
+/* Text shown to user when his username is already registered */
+"The entered username is not available" = "The entered username is not available";
+
+/* Error shown to the user */
+"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+
+/* Text shown to the user */
+"This account needs to be migrated" = "This account needs to be migrated";
+
+/* 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!";
+
+/* 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!";
+
+/* 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.";
+
+/* Text shown to the user */
+"To proceed with the migration, you need to enter a password that was used for this account." = "To proceed with the migration, you need to enter a password that was used for this account.";
+
+/* File transfer peer unjoinable label */
+"Unjoinable" = "Unjoinable";
+
+/* Error video permission */
+"Video permission not granted" = "Video permission not granted";
+
+/* Welcome title */
+"Welcome to Jami" = "Welcome to Jami";
+
+/* Peer busy message */
+"Would you like to leave a message?" = "Would you like to leave a message?";
+
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/es_MX.lproj/MessageCells.strings b/ui/es_MX.lproj/MessageCells.strings
new file mode 100644
index 0000000000000000000000000000000000000000..ca8839d724ea508d1404c1e26d67674c09445691
--- /dev/null
+++ b/ui/es_MX.lproj/MessageCells.strings
@@ -0,0 +1,42 @@
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "1c6-BK-hfV"; */
+"1c6-BK-hfV.title" = "Cancelar";
+
+/* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "3i8-bi-EQN"; */
+"3i8-bi-EQN.title" = "Round Rect";
+
+/* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "8CE-a4-Ayu"; */
+"8CE-a4-Ayu.title" = "Round Rect";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "9Oq-TB-quZ"; */
+"9Oq-TB-quZ.title" = "Cancelar";
+
+/* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "DmW-13-1QZ"; */
+"DmW-13-1QZ.title" = "Round Rect";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "EAm-7Z-ubs"; */
+"EAm-7Z-ubs.title" = "Box";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "Ko5-2g-foK"; */
+"Ko5-2g-foK.title" = "Box";
+
+/* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "Oo1-gq-aPY"; */
+"Oo1-gq-aPY.title" = "Round Rect";
+
+/* Class = "NSButtonCell"; title = "Refuse"; ObjectID = "QGs-MO-mVi"; */
+"QGs-MO-mVi.title" = "Refuse";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "dDX-sZ-ylI"; */
+"dDX-sZ-ylI.title" = "Box";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "e0e-TK-qch"; */
+"e0e-TK-qch.title" = "Box";
+
+/* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "fu2-X7-GW8"; */
+"fu2-X7-GW8.title" = "Round Rect";
+
+/* Class = "NSButtonCell"; title = "Accept"; ObjectID = "tBq-Qe-bEm"; */
+"tBq-Qe-bEm.title" = "Accept";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "x2B-gu-YBe"; */
+"x2B-gu-YBe.title" = "Box";
diff --git a/ui/es_MX.lproj/PasswordChange.strings b/ui/es_MX.lproj/PasswordChange.strings
new file mode 100644
index 0000000000000000000000000000000000000000..82a556d27b0060aaa0a2a8b024c30ffa8da7c2e7
--- /dev/null
+++ b/ui/es_MX.lproj/PasswordChange.strings
@@ -0,0 +1,30 @@
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat a new password"; ObjectID = "1Bs-Te-34p"; */
+"1Bs-Te-34p.placeholderString" = "Repeat a new password";
+
+/* Class = "NSTextFieldCell"; title = "Change Password"; ObjectID = "4Uf-yO-9X8"; */
+"4Uf-yO-9X8.title" = "Change Password";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter a new password"; ObjectID = "4aD-Xd-zHS"; */
+"4aD-Xd-zHS.placeholderString" = "Enter a new password";
+
+/* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
+"8KO-IO-ykP.title" = "Repeat";
+
+/* Class = "NSButtonCell"; title = "Accept"; ObjectID = "Ggu-EQ-cqC"; */
+"Ggu-EQ-cqC.title" = "Accept";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter your old password"; ObjectID = "Kwp-mD-Y94"; */
+"Kwp-mD-Y94.placeholderString" = "Enter your old password";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "MZw-ep-8aW"; */
+"MZw-ep-8aW.title" = "Cancelar";
+
+/* Class = "NSTextFieldCell"; title = "Password is incorrect"; ObjectID = "WyU-Dx-U1u"; */
+"WyU-Dx-U1u.title" = "Password is incorrect";
+
+/* Class = "NSTextFieldCell"; title = "Old password"; ObjectID = "gPw-Jf-0M7"; */
+"gPw-Jf-0M7.title" = "Old password";
+
+/* Class = "NSTextFieldCell"; title = "New password"; ObjectID = "pZe-DO-jWp"; */
+"pZe-DO-jWp.title" = "New password";
diff --git a/ui/es_MX.lproj/PreferencesWindow.strings b/ui/es_MX.lproj/PreferencesWindow.strings
new file mode 100644
index 0000000000000000000000000000000000000000..511e6afe85f6cde22851ee560d08bda3a8357015
--- /dev/null
+++ b/ui/es_MX.lproj/PreferencesWindow.strings
@@ -0,0 +1,27 @@
+
+/* Class = "NSWindow"; title = "Jami Preferences"; ObjectID = "C1T-wE-wxb"; */
+"C1T-wE-wxb.title" = "Jami Preferences";
+
+/* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.label" = "General";
+
+/* Class = "NSToolbarItem"; paletteLabel = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.paletteLabel" = "General";
+
+/* Class = "NSToolbarItem"; label = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.label" = "Advanced";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.paletteLabel" = "Advanced";
+
+/* Class = "NSToolbarItem"; label = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.label" = "Audio";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.paletteLabel" = "Audio";
+
+/* Class = "NSToolbarItem"; label = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.label" = "Video";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.paletteLabel" = "Video";
diff --git a/ui/es_MX.lproj/RegisterNameWindow.strings b/ui/es_MX.lproj/RegisterNameWindow.strings
new file mode 100644
index 0000000000000000000000000000000000000000..daa89f8dc0d8c78f962fc1ecb464f9fd6fcc251f
--- /dev/null
+++ b/ui/es_MX.lproj/RegisterNameWindow.strings
@@ -0,0 +1,51 @@
+
+/* 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";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
+"Aeh-tK-RjX.title" = "An error occured during your username registration";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
+"JWw-7m-ywL.title" = "Window";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedIsNilPlaceholder" = "Enter password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedMultipleValuesPlaceholder" = "Enter password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedNoSelectionPlaceholder" = "Enter password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedNotApplicablePlaceholder" = "Enter password...";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
+"YIN-YL-JBs.title" = "Just a moment...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "Enter username...";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
+"cbA-c2-LlV.title" = "Cancelar";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "egF-LJ-khJ"; */
+"egF-LJ-khJ.title" = "Password";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "eoS-s7-b3w"; */
+"eoS-s7-b3w.title" = "Cancelar";
+
+/* Class = "NSButtonCell"; title = "Ok"; ObjectID = "fOn-FV-2x8"; */
+"fOn-FV-2x8.title" = "Ok";
+
+/* Class = "NSButtonCell"; title = "Register"; ObjectID = "lT3-Bh-MnL"; */
+"lT3-Bh-MnL.title" = "Register";
+
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "lo5-ei-wHM"; */
+"lo5-ei-wHM.title" = "Username";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter password..."; ObjectID = "nFA-uz-WjI"; */
+"nFA-uz-WjI.placeholderString" = "Enter password...";
+
+/* Class = "NSTextFieldCell"; title = "Register a public username "; ObjectID = "tje-EZ-ZPI"; */
+"tje-EZ-ZPI.title" = "Register a public username ";
diff --git a/ui/es_MX.lproj/RingWindow.strings b/ui/es_MX.lproj/RingWindow.strings
new file mode 100644
index 0000000000000000000000000000000000000000..fb3e0a910cf557afec9a8c864890d8ec39061613
--- /dev/null
+++ b/ui/es_MX.lproj/RingWindow.strings
@@ -0,0 +1,60 @@
+
+/* Class = "NSTabViewItem"; label = "SmartView"; ObjectID = "0MO-4e-8mo"; */
+"0MO-4e-8mo.label" = "SmartView";
+
+/* Class = "NSSegmentedCell"; 6T7-ip-Pun.ibShadowedLabels[0] = "Conversations"; ObjectID = "6T7-ip-Pun"; */
+"6T7-ip-Pun.ibShadowedLabels[0]" = "Conversaciones";
+
+/* Class = "NSSegmentedCell"; 6T7-ip-Pun.ibShadowedLabels[1] = "Requests"; ObjectID = "6T7-ip-Pun"; */
+"6T7-ip-Pun.ibShadowedLabels[1]" = "Requests";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
+"Ap7-26-S6b.title" = "Text Cell";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "DPK-hh-Aq5"; */
+"DPK-hh-Aq5.title" = "Item 2";
+
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Accept Invitation"; ObjectID = "Fc5-KS-cim"; */
+"Fc5-KS-cim.ibShadowedToolTip" = "Accept Invitation";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Share account info"; ObjectID = "Oac-o7-2Ge"; */
+"Oac-o7-2Ge.ibShadowedToolTip" = "Share account info";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Oe5-Nj-cP3"; */
+"Oe5-Nj-cP3.title" = "Item 3";
+
+/* Class = "NSToolbarItem"; label = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.label" = "Toolbar Item";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.paletteLabel" = "Toolbar Item";
+
+/* Class = "NSTextFieldCell"; title = "This is your ID.\nCopy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID.\nCopy and share it with your friends!";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "eVv-lu-T1Y"; */
+"eVv-lu-T1Y.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
+"eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Ignore invitation"; ObjectID = "ejM-H2-aJX"; */
+"ejM-H2-aJX.ibShadowedToolTip" = "Ignore invitation";
+
+/* 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.";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
+"j0J-Xd-uth.placeholderString" = "Call name";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "mK5-kV-YOO"; */
+"mK5-kV-YOO.placeholderString" = "detalles";
+
+/* Class = "NSSearchFieldCell"; placeholderString = "Search for new or existing contact"; ObjectID = "vvE-nM-kSl"; */
+"vvE-nM-kSl.placeholderString" = "Search for new or existing contact";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Block contact"; ObjectID = "xP1-ZW-WZ8"; */
+"xP1-ZW-WZ8.ibShadowedToolTip" = "Block contact";
diff --git a/ui/es_MX.lproj/RingWizardChoose.strings b/ui/es_MX.lproj/RingWizardChoose.strings
new file mode 100644
index 0000000000000000000000000000000000000000..ab4ccae32d3b81b5416f022766db23b4eef42e91
--- /dev/null
+++ b/ui/es_MX.lproj/RingWizardChoose.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSButtonCell"; title = "Connect to account manager"; ObjectID = "HGQ-Kd-WIw"; */
+"HGQ-Kd-WIw.title" = "Connect to account manager";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
+"YJ3-7G-cU1.title" = "Cancelar";
+
+/* Class = "NSButtonCell"; title = "Import from other device"; ObjectID = "Z9K-mD-ucr"; */
+"Z9K-mD-ucr.title" = "Import from other device";
+
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
+
+/* Class = "NSButtonCell"; title = "Import from archive backup"; ObjectID = "rtw-Db-BWL"; */
+"rtw-Db-BWL.title" = "Import from archive backup";
+
+/* Class = "NSButtonCell"; title = "Advanced…"; ObjectID = "vCj-67-PGK"; */
+"vCj-67-PGK.title" = "Advanced…";
+
+/* Class = "NSButtonCell"; title = "Add a new SIP account"; ObjectID = "yBt-Bv-fi2"; */
+"yBt-Bv-fi2.title" = "Add a new SIP account";
diff --git a/ui/es_MX.lproj/RingWizardLinkAccount.strings b/ui/es_MX.lproj/RingWizardLinkAccount.strings
new file mode 100644
index 0000000000000000000000000000000000000000..04d2d01b604e1b1f13b0797fd14828cd32ecd021
--- /dev/null
+++ b/ui/es_MX.lproj/RingWizardLinkAccount.strings
@@ -0,0 +1,57 @@
+
+/* 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.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
+
+/* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
+"DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Cancelar";
+
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "WlR-QM-tK4"; */
+"WlR-QM-tK4.ibShadowedIsNilPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "WlR-QM-tK4"; */
+"WlR-QM-tK4.ibShadowedMultipleValuesPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "WlR-QM-tK4"; */
+"WlR-QM-tK4.ibShadowedNoSelectionPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "WlR-QM-tK4"; */
+"WlR-QM-tK4.ibShadowedNotApplicablePlaceholder" = "Password...";
+
+/* Class = "NSButtonCell"; title = "Select file"; ObjectID = "XJE-cy-nfQ"; */
+"XJE-cy-nfQ.title" = "Select file";
+
+/* Class = "NSTextFieldCell"; title = "Import archive file"; ObjectID = "kXa-FL-Enf"; */
+"kXa-FL-Enf.title" = "Import archive file";
+
+/* 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.";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "t12-O0-kcf"; */
+"t12-O0-kcf.title" = "OK";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
+"vVf-hg-sWk.ibShadowedIsNilPlaceholder" = "PIN";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
+"vVf-hg-sWk.ibShadowedMultipleValuesPlaceholder" = "PIN";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
+"vVf-hg-sWk.ibShadowedNoSelectionPlaceholder" = "PIN";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
+"vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "PIN";
+
+/* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
+"zWn-4H-ODH.title" = "Linking...";
diff --git a/ui/es_MX.lproj/RingWizardNewAccount.strings b/ui/es_MX.lproj/RingWizardNewAccount.strings
new file mode 100644
index 0000000000000000000000000000000000000000..a554b3270ee4fd02485661daa14d2491dc2b04a0
--- /dev/null
+++ b/ui/es_MX.lproj/RingWizardNewAccount.strings
@@ -0,0 +1,75 @@
+
+/* 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 D 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 D which is 40 characters long.";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Password..."; ObjectID = "1TO-Ov-S8j"; */
+"1TO-Ov-S8j.placeholderString" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedIsNilPlaceholder" = "Repeat password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedMultipleValuesPlaceholder" = "Repeat password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedNoSelectionPlaceholder" = "Repeat password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedNotApplicablePlaceholder" = "Repeat password...";
+
+/* Class = "NSButtonCell"; title = "Register public username"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Repeat password"; ObjectID = "BCg-5V-Ek4"; */
+"BCg-5V-Ek4.placeholderString" = "Repeat password";
+
+/* Class = "NSButtonCell"; title = "Choose password for enhance security"; ObjectID = "Cnw-4p-3Uc"; */
+"Cnw-4p-3Uc.title" = "Choose password for enhance security";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedIsNilPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedMultipleValuesPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedNoSelectionPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedNotApplicablePlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedIsNilPlaceholder" = "Username...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedMultipleValuesPlaceholder" = "Username...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedNoSelectionPlaceholder" = "Username...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedNotApplicablePlaceholder" = "Username...";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
+"YIN-YL-JBs.title" = "Just a moment...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "Username...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "gEy-ak-Cgq"; */
+"gEy-ak-Cgq.placeholderString" = "Enter name";
+
+/* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Profile";
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Cuenta";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
+"v7f-52-GJA.title" = "Cancelar";
+
+/* Class = "NSTextFieldCell"; title = "This password will be used to encrypt your account data and link new devices to your account. It is not mandatory but recommended to set one."; ObjectID = "zUH-kc-cik"; */
+"zUH-kc-cik.title" = "This password will be used to encrypt your account data and link new devices to your account. It is not mandatory but recommended to set one.";
+
+/* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
+"zfA-n9-V4X.title" = "Create";
diff --git a/ui/es_MX.lproj/VideoPrefs.strings b/ui/es_MX.lproj/VideoPrefs.strings
new file mode 100644
index 0000000000000000000000000000000000000000..b5cb6ee2745004617f516aa16a16d70a807e3654
--- /dev/null
+++ b/ui/es_MX.lproj/VideoPrefs.strings
@@ -0,0 +1,12 @@
+
+/* Class = "NSTextFieldCell"; title = "Device"; ObjectID = "170-NP-CSP"; */
+"170-NP-CSP.title" = "Dispositivo";
+
+/* Class = "NSTextFieldCell"; title = "Size"; ObjectID = "4bq-ls-mCp"; */
+"4bq-ls-mCp.title" = "Tamaño";
+
+/* Class = "NSTextFieldCell"; title = "Rate"; ObjectID = "5Im-df-jdd"; */
+"5Im-df-jdd.title" = "Rate";
+
+/* Class = "NSButtonCell"; title = "Enable hardware acceleration"; ObjectID = "e7y-eV-Gsz"; */
+"e7y-eV-Gsz.title" = "Activar aceleración por hardware";
diff --git a/ui/et.lproj/Localizable.strings b/ui/et.lproj/Localizable.strings
index 3b5c1579dd4989ee2b0ca86723eb6f176d755c05..a388bd848560d35c35ee2e99f4bf40589c79f236 100644
--- a/ui/et.lproj/Localizable.strings
+++ b/ui/et.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accept";
 
+/* Button Action */
+"Cancel" = "Cancel";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/eu.lproj/AccAdvancedRing.strings b/ui/eu.lproj/AccAdvancedRing.strings
index ce4286b5153387aa75b2d35b03da4b7389463253..f5cefc1df2075b8faeb020133d63ff671e35fe4d 100644
--- a/ui/eu.lproj/AccAdvancedRing.strings
+++ b/ui/eu.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/eu.lproj/Localizable.strings b/ui/eu.lproj/Localizable.strings
index c08b6bf2bfcd97a9a2fc50a813d7fde384579570..3501d50a95d34cb0de20fdc9c818e378cf3a9e79 100644
--- a/ui/eu.lproj/Localizable.strings
+++ b/ui/eu.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Onartu";
 
+/* Button Action */
+"Cancel" = "Ezeztatu";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Aldatu pasahitza";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/fa_IR.lproj/AccAdvancedRing.strings b/ui/fa_IR.lproj/AccAdvancedRing.strings
index 0b3b6715daf35b9ca9fca9da4a4dbeff5db48746..e9e9e5a933221a9604685cbad900ba299f88c8c9 100644
--- a/ui/fa_IR.lproj/AccAdvancedRing.strings
+++ b/ui/fa_IR.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "اجازه تماس به همتاهای ناشناخته";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/fa_IR.lproj/Localizable.strings b/ui/fa_IR.lproj/Localizable.strings
index 7beac27216b5a26153006433f4c0539721b76412..5605e32f47addaed0b04f9359c722282b5709412 100644
--- a/ui/fa_IR.lproj/Localizable.strings
+++ b/ui/fa_IR.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "پذیرش";
 
+/* Button Action */
+"Cancel" = "لغو";
+
 /* Welcome title */
 "Add a SIP account" = "افزودن یک حساب SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "مایلید که پیامی بگذارید؟";
 
+/* Password button title */
+"Change password" = "تغییر گذرواژه";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "انجام شد";
+
+/* Edit Sip Account Action */
+"Edit Account" = "ویرایش حساب‌کاربری";
+
diff --git a/ui/fi.lproj/AccAdvancedRing.strings b/ui/fi.lproj/AccAdvancedRing.strings
index 88f0ab5d34f5870b578d3c42fcf868673be03f47..362c3e7bd62efee71e9b404fea234a88362ec568 100644
--- a/ui/fi.lproj/AccAdvancedRing.strings
+++ b/ui/fi.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Salli puhelut tuntemattomilta";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/fi.lproj/Localizable.strings b/ui/fi.lproj/Localizable.strings
index 30d892a1f8f0737cca8631cd2126bfd8a9c256ed..df58f5abd0d9d59c560e63cac819639102e87147 100644
--- a/ui/fi.lproj/Localizable.strings
+++ b/ui/fi.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Hyväksy";
 
+/* Button Action */
+"Cancel" = "Peruuta";
+
 /* Welcome title */
 "Add a SIP account" = "Lisää SIP-tunnus";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Haluaisitko jättää viestin?";
 
+/* Password button title */
+"Change password" = "Vaihda salasana";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Valmis";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Muokkaa tunnusta";
+
diff --git a/ui/fr.lproj/AccAdvancedRing.strings b/ui/fr.lproj/AccAdvancedRing.strings
index d41d1e039687062d3994461197fe1c71dd84943d..cf7b5725873cbf89ce0f9e015fefcc0ed211a214 100644
--- a/ui/fr.lproj/AccAdvancedRing.strings
+++ b/ui/fr.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Autoriser les appels de correspondants non vérifiés";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/fr.lproj/Localizable.strings b/ui/fr.lproj/Localizable.strings
index e59ce4505034d4b149fc9b276fcb87a2dfbd9a21..1e80b10d1bbf5e0d2bb2cfb03fe75f44fe697764 100644
--- a/ui/fr.lproj/Localizable.strings
+++ b/ui/fr.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accepter";
 
+/* Button Action */
+"Cancel" = "Annuler";
+
 /* Welcome title */
 "Add a SIP account" = "Ajouter un compte SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Souhaitez-vous laisser un message ?";
 
+/* Password button title */
+"Change password" = "Changer le mot de passe";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Effectué";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Éditer le compte";
+
diff --git a/ui/fr_BE.lproj/AccAdvancedRing.strings b/ui/fr_BE.lproj/AccAdvancedRing.strings
index dcf98b27d9ca3c2af0727c4bb9bd88f18bcb7975..6f22550d4d452fa4eee7709b20b183f5846e03e6 100644
--- a/ui/fr_BE.lproj/AccAdvancedRing.strings
+++ b/ui/fr_BE.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
@@ -12,49 +12,49 @@
 "7eU-EP-4br.title" = "Box";
 
 /* 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" = "Call settings";
+"BIS-Ft-yJn.title" = "Paramètres appels";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "DSe-Cs-oD6"; */
-"DSe-Cs-oD6.title" = "Auto answer calls";
+"DSe-Cs-oD6.title" = "Réponse automatique aux appels";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "EyV-Io-d3f"; */
 "EyV-Io-d3f.title" = "Cellule de texte";
 
 /* Class = "NSTextFieldCell"; title = "Name server"; ObjectID = "ID3-Sv-gYY"; */
-"ID3-Sv-gYY.title" = "Name server";
+"ID3-Sv-gYY.title" = "Serveur de nom";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "K0z-NH-3Cq"; */
 "K0z-NH-3Cq.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "User certificate"; ObjectID = "LWs-a2-E7f"; */
-"LWs-a2-E7f.title" = "User certificate";
+"LWs-a2-E7f.title" = "Certificat d'utilisateur";
 
 /* Class = "NSTextFieldCell"; title = "Audio codecs"; ObjectID = "Q4t-zo-brK"; */
 "Q4t-zo-brK.title" = "Audio codecs";
 
 /* Class = "NSTextFieldCell"; title = "Security"; ObjectID = "Qxp-I4-A7W"; */
-"Qxp-I4-A7W.title" = "Security";
+"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" = "Activer proxy";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
-"Wrh-zD-uh5.title" = "Video codecs";
+"Wrh-zD-uh5.title" = "Codecs vidéo";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "XU0-bl-lDD"; */
 "XU0-bl-lDD.title" = "TURN realm";
 
 /* 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" = "Bootstrap";
+"YJM-iQ-0lE.title" = "Amorcer";
 
 /* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "YcX-lE-8ug"; */
-"YcX-lE-8ug.title" = "Private key password";
+"YcX-lE-8ug.title" = "Mot de passe de la clé privée ";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "Ywo-5x-8kh"; */
 "Ywo-5x-8kh.title" = "Box";
@@ -63,34 +63,34 @@
 "ZNe-H0-dJk.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "ZqB-gt-yFt"; */
-"ZqB-gt-yFt.title" = "Address";
+"ZqB-gt-yFt.title" = "Adresse";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "eGX-gk-Zxp"; */
 "eGX-gk-Zxp.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "eMG-uY-bpH"; */
-"eMG-uY-bpH.title" = "TURN username";
+"eMG-uY-bpH.title" = "Nom d'utilisateur TURN";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "g8T-u3-MS3"; */
 "g8T-u3-MS3.title" = "Cellule de texte";
 
 /* Class = "NSTextFieldCell"; title = "TURN password"; ObjectID = "gUl-Px-cIJ"; */
-"gUl-Px-cIJ.title" = "TURN password";
+"gUl-Px-cIJ.title" = "Mot de passe TURN";
 
 /* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "k7i-pK-JXp"; */
-"k7i-pK-JXp.title" = "CA certificate";
+"k7i-pK-JXp.title" = "Autorité de Certification";
 
 /* Class = "NSButtonCell"; title = "Use STUN"; ObjectID = "nqX-Vu-UuA"; */
-"nqX-Vu-UuA.title" = "Use STUN";
+"nqX-Vu-UuA.title" = "Utiliser STUN";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "qFq-Yh-2JL"; */
-"qFq-Yh-2JL.title" = "Custom ringtone";
+"qFq-Yh-2JL.title" = "Sonnerie personnalisée";
 
 /* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "sVe-iG-OCw"; */
-"sVe-iG-OCw.title" = "Connectivity";
+"sVe-iG-OCw.title" = "Connectivité";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "soR-nF-ybe"; */
-"soR-nF-ybe.title" = "Private key";
+"soR-nF-ybe.title" = "Clé privée";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "sy5-OH-wyB"; */
 "sy5-OH-wyB.title" = "Box";
@@ -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" = "Configuration OpenDHT";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "zPJ-cO-neQ"; */
-"zPJ-cO-neQ.title" = "Use TURN";
+"zPJ-cO-neQ.title" = "Utiliser le TURN";
diff --git a/ui/fr_BE.lproj/AccAdvancedSip.strings b/ui/fr_BE.lproj/AccAdvancedSip.strings
index ff1d9f40510a7abb4de1c4a7238049dc3a471fc3..46b627005d50139e68bdf86e339cabedf430a7ea 100644
--- a/ui/fr_BE.lproj/AccAdvancedSip.strings
+++ b/ui/fr_BE.lproj/AccAdvancedSip.strings
@@ -6,25 +6,25 @@
 "0cb-ib-oHd.title" = "Video RTP port Range";
 
 /* Class = "NSTextFieldCell"; title = "Security"; ObjectID = "24s-we-pkD"; */
-"24s-we-pkD.title" = "Security";
+"24s-we-pkD.title" = "Sécurité";
 
 /* Class = "NSTextFieldCell"; title = "Registration expire timeout (seconds)"; ObjectID = "2rB-Bv-c9U"; */
 "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" = "Paramètres appels";
 
 /* Class = "NSButtonCell"; title = "Fallback on RTP on encryption failure"; ObjectID = "3rM-KT-bNf"; */
 "3rM-KT-bNf.title" = "Fallback on RTP on encryption failure";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "3vs-TI-tkg"; */
-"3vs-TI-tkg.title" = "Auto answer calls";
+"3vs-TI-tkg.title" = "Réponse automatique aux appels";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "6eH-la-JbF"; */
 "6eH-la-JbF.title" = "TURN realm";
 
 /* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "72p-GY-gu6"; */
-"72p-GY-gu6.title" = "Private key password";
+"72p-GY-gu6.title" = "Mot de passe de la clé privée ";
 
 /* Class = "NSTextFieldCell"; title = "Outgoing TLS server name"; ObjectID = "8JD-11-wHZ"; */
 "8JD-11-wHZ.title" = "Outgoing TLS server name";
@@ -42,13 +42,13 @@
 "ELr-A7-mGE.title" = "Published address";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "Gwi-Mp-NpZ"; */
-"Gwi-Mp-NpZ.title" = "Use TURN";
+"Gwi-Mp-NpZ.title" = "Utiliser le TURN";
 
 /* Class = "NSButtonCell"; title = "Use STUN"; ObjectID = "HRM-FR-1sH"; */
-"HRM-FR-1sH.title" = "Use STUN";
+"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" = "Require a certificate for incoming TLS connections";
@@ -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" = "Sonnerie personnalisée";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
 "OEo-C7-vEh.title" = "Item 2";
@@ -84,25 +84,25 @@
 "Vke-hs-iXz.title" = "Audio codecs";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "W9F-Nf-ehp"; */
-"W9F-Nf-ehp.title" = "Private key";
+"W9F-Nf-ehp.title" = "Clé privée";
 
 /* Class = "NSButtonCell"; title = "Verify answer certificates (client side)"; ObjectID = "WsS-1e-Epm"; */
 "WsS-1e-Epm.title" = "Verify answer certificates (client side)";
 
 /* Class = "NSTextFieldCell"; title = "User certificate"; ObjectID = "Xp3-bL-3Cs"; */
-"Xp3-bL-3Cs.title" = "User certificate";
+"Xp3-bL-3Cs.title" = "Certificat d'utilisateur";
 
 /* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "Xxr-gl-ukE"; */
-"Xxr-gl-ukE.title" = "Address";
+"Xxr-gl-ukE.title" = "Adresse";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "Zuz-jy-rLn"; */
 "Zuz-jy-rLn.title" = "Box";
 
 /* 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" = "CA certificate";
+"b2y-85-ZHK.title" = "Autorité de Certification";
 
 /* 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";
@@ -123,7 +123,7 @@
 "fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "gJs-aX-7Ox"; */
-"gJs-aX-7Ox.title" = "Video codecs";
+"gJs-aX-7Ox.title" = "Codecs vidéo";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "jgX-tQ-dIA"; */
 "jgX-tQ-dIA.title" = "Cellule de texte";
@@ -141,7 +141,7 @@
 "nuq-Wl-sfd.title" = "Use custom address and port";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "rMN-Wf-tmp"; */
-"rMN-Wf-tmp.title" = "TURN username";
+"rMN-Wf-tmp.title" = "Nom d'utilisateur TURN";
 
 /* Class = "NSButtonCell"; title = "Encrypt media streams(SRTP)"; ObjectID = "vCS-s8-mZI"; */
 "vCS-s8-mZI.title" = "Encrypt media streams(SRTP)";
@@ -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" = "Connectivité";
 
 /* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "wq6-KV-8X3"; */
 "wq6-KV-8X3.title" = "Max";
@@ -162,7 +162,7 @@
 "x93-zk-hAW.title" = "UPnP";
 
 /* Class = "NSTextFieldCell"; title = "TURN password"; ObjectID = "xjL-Wb-7VN"; */
-"xjL-Wb-7VN.title" = "TURN password";
+"xjL-Wb-7VN.title" = "Mot de passe TURN";
 
 /* Class = "NSTextFieldCell"; title = "TLS protocol method"; ObjectID = "zBy-cW-KY3"; */
 "zBy-cW-KY3.title" = "TLS protocol method";
diff --git a/ui/fr_BE.lproj/AccRingGeneral.strings b/ui/fr_BE.lproj/AccRingGeneral.strings
index 7d2b444dee36316c8182002a011875ee07a007ac..6fe996a5ca3ca312a3c385b2a2077a55ad0b2aaa 100644
--- a/ui/fr_BE.lproj/AccRingGeneral.strings
+++ b/ui/fr_BE.lproj/AccRingGeneral.strings
@@ -1,33 +1,33 @@
 
 /* Class = "NSButtonCell"; title = "Export Account"; ObjectID = "1aj-MG-mHp"; */
-"1aj-MG-mHp.title" = "Export Account";
+"1aj-MG-mHp.title" = "Sauvegarder Compte";
 
 /* Class = "NSTextFieldCell"; title = "Banned Contacts"; ObjectID = "6fI-98-VvQ"; */
-"6fI-98-VvQ.title" = "Banned Contacts";
+"6fI-98-VvQ.title" = "Contacts bloqués";
 
 /* Class = "NSButtonCell"; title = "Advanced"; ObjectID = "Hbq-nL-BhK"; */
 "Hbq-nL-BhK.title" = "Options avancées";
 
 /* Class = "NSButtonCell"; title = "Enable"; ObjectID = "Op4-XO-WsE"; */
-"Op4-XO-WsE.title" = "Enable";
+"Op4-XO-WsE.title" = "Activé";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "TYk-QK-iaT"; */
-"TYk-QK-iaT.title" = "Password:";
+"TYk-QK-iaT.title" = "Mot de passe:";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Edit name"; ObjectID = "WEo-a0-wVL"; */
-"WEo-a0-wVL.ibShadowedToolTip" = "Edit name";
+"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 Compte";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
 "aQL-hX-CfA.title" = "Cellule de texte";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Unblock"; ObjectID = "bOY-mY-1Yo"; */
-"bOY-mY-1Yo.ibShadowedToolTip" = "Unblock";
+"bOY-mY-1Yo.ibShadowedToolTip" = "Débloquer";
 
 /* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "fPK-Zv-Uom"; */
-"fPK-Zv-Uom.title" = "Username:";
+"fPK-Zv-Uom.title" = "Nom d'utilisateur :";
 
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "gLp-qz-XYs"; */
 "gLp-qz-XYs.title" = "Enregistrer";
@@ -39,19 +39,19 @@
 "kt0-P6-fdQ.placeholderString" = "Entrer un nom";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Revoke"; ObjectID = "lrB-j5-Mvy"; */
-"lrB-j5-Mvy.ibShadowedToolTip" = "Revoke";
+"lrB-j5-Mvy.ibShadowedToolTip" = "Révoquer";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "oVO-wj-fwQ"; */
 "oVO-wj-fwQ.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
-"oga-WC-4gb.title" = "Linked devices";
+"oga-WC-4gb.title" = "Appareils lié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" = "Link another device";
+"tWk-Od-BEQ.title" = "Lier autre appareil";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "uLQ-MS-pZ7"; */
 "uLQ-MS-pZ7.title" = "Compte";
diff --git a/ui/fr_BE.lproj/AccSipGeneral.strings b/ui/fr_BE.lproj/AccSipGeneral.strings
index ec712c8fe96cb6ce360c524763efc973349a1cc2..d0a5623f7f2fb6bc41cec4ec91d4ca0f88ace9c4 100644
--- a/ui/fr_BE.lproj/AccSipGeneral.strings
+++ b/ui/fr_BE.lproj/AccSipGeneral.strings
@@ -36,4 +36,4 @@
 "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 Compte";
diff --git a/ui/fr_BE.lproj/Localizable.strings b/ui/fr_BE.lproj/Localizable.strings
index 58e5a32e159e24d32ac3744ad7971d20e901195e..656ec024d33939d86862e87e806e7581e4fad709 100644
--- a/ui/fr_BE.lproj/Localizable.strings
+++ b/ui/fr_BE.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accepter";
 
+/* Button Action */
+"Cancel" = "Annuler";
+
 /* Welcome title */
 "Add a SIP account" = "Ajouter un compte SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Souhaitez-vous laisser un message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/fr_CA.lproj/AccAdvancedRing.strings b/ui/fr_CA.lproj/AccAdvancedRing.strings
index 2b24b2a8bf40e0359f54cafec66181e19d02cd96..f721ef27dbccbf25238bc547cfa65df943be10c0 100644
--- a/ui/fr_CA.lproj/AccAdvancedRing.strings
+++ b/ui/fr_CA.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
@@ -12,19 +12,19 @@
 "7eU-EP-4br.title" = "Box";
 
 /* 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" = "Call settings";
+"BIS-Ft-yJn.title" = "Paramètres appels";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "DSe-Cs-oD6"; */
-"DSe-Cs-oD6.title" = "Auto answer calls";
+"DSe-Cs-oD6.title" = "Réponse automatique aux appels";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "EyV-Io-d3f"; */
 "EyV-Io-d3f.title" = "Cellule de texte";
 
 /* Class = "NSTextFieldCell"; title = "Name server"; ObjectID = "ID3-Sv-gYY"; */
-"ID3-Sv-gYY.title" = "Name server";
+"ID3-Sv-gYY.title" = "Serveur de nom";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "K0z-NH-3Cq"; */
 "K0z-NH-3Cq.title" = "Box";
@@ -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" = "Activer proxy";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
 "Wrh-zD-uh5.title" = "Vidéo codecs";
@@ -48,7 +48,7 @@
 "XU0-bl-lDD.title" = "TURN realm";
 
 /* 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" = "Amorcer";
@@ -78,19 +78,19 @@
 "gUl-Px-cIJ.title" = "Mot de passe TURN";
 
 /* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "k7i-pK-JXp"; */
-"k7i-pK-JXp.title" = "CA certificate";
+"k7i-pK-JXp.title" = "Autorité de Certification";
 
 /* Class = "NSButtonCell"; title = "Use STUN"; ObjectID = "nqX-Vu-UuA"; */
 "nqX-Vu-UuA.title" = "Utiliser STUN";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "qFq-Yh-2JL"; */
-"qFq-Yh-2JL.title" = "Custom ringtone";
+"qFq-Yh-2JL.title" = "Sonnerie personnalisée";
 
 /* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "sVe-iG-OCw"; */
 "sVe-iG-OCw.title" = "Connectivité";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "soR-nF-ybe"; */
-"soR-nF-ybe.title" = "clé privée";
+"soR-nF-ybe.title" = "Clé privée";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "sy5-OH-wyB"; */
 "sy5-OH-wyB.title" = "Box";
@@ -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" = "Configuration OpenDHT";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "zPJ-cO-neQ"; */
 "zPJ-cO-neQ.title" = "Utiliser le TURN";
diff --git a/ui/fr_CA.lproj/AccAdvancedSip.strings b/ui/fr_CA.lproj/AccAdvancedSip.strings
index 3506b7acf34dbfe3b38ab686ab1edaa9bc77920d..58f99dd7f0b7779ccecb75b0ccced910227a3fee 100644
--- a/ui/fr_CA.lproj/AccAdvancedSip.strings
+++ b/ui/fr_CA.lproj/AccAdvancedSip.strings
@@ -12,13 +12,13 @@
 "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" = "Paramètres appels";
 
 /* Class = "NSButtonCell"; title = "Fallback on RTP on encryption failure"; ObjectID = "3rM-KT-bNf"; */
 "3rM-KT-bNf.title" = "Fallback on RTP on encryption failure";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "3vs-TI-tkg"; */
-"3vs-TI-tkg.title" = "Auto answer calls";
+"3vs-TI-tkg.title" = "Réponse automatique aux appels";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "6eH-la-JbF"; */
 "6eH-la-JbF.title" = "TURN realm";
@@ -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" = "Require a certificate for incoming TLS connections";
@@ -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" = "Sonnerie personnalisée";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
 "OEo-C7-vEh.title" = "Item 2";
@@ -99,10 +99,10 @@
 "Zuz-jy-rLn.title" = "Box";
 
 /* 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" = "CA certificate";
+"b2y-85-ZHK.title" = "Autorité de Certification";
 
 /* 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";
diff --git a/ui/fr_CA.lproj/AccRingGeneral.strings b/ui/fr_CA.lproj/AccRingGeneral.strings
index b3d7206c58a3657cd9cb416af63a733b6fe81569..e095e0f65b7490db2283e6f8cb28e7824d73c82b 100644
--- a/ui/fr_CA.lproj/AccRingGeneral.strings
+++ b/ui/fr_CA.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" = "Sauvegarder Compte";
 
 /* Class = "NSTextFieldCell"; title = "Banned Contacts"; ObjectID = "6fI-98-VvQ"; */
 "6fI-98-VvQ.title" = "Contacts bloqués";
@@ -9,16 +9,16 @@
 "Hbq-nL-BhK.title" = "Avancé";
 
 /* Class = "NSButtonCell"; title = "Enable"; ObjectID = "Op4-XO-WsE"; */
-"Op4-XO-WsE.title" = "Enable";
+"Op4-XO-WsE.title" = "Activé";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "TYk-QK-iaT"; */
-"TYk-QK-iaT.title" = "Password:";
+"TYk-QK-iaT.title" = "Mot de passe:";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Edit name"; ObjectID = "WEo-a0-wVL"; */
-"WEo-a0-wVL.ibShadowedToolTip" = "Edit name";
+"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 Compte";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
 "aQL-hX-CfA.title" = "Cellule de texte";
@@ -27,7 +27,7 @@
 "bOY-mY-1Yo.ibShadowedToolTip" = "Débloquer";
 
 /* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "fPK-Zv-Uom"; */
-"fPK-Zv-Uom.title" = "Username:";
+"fPK-Zv-Uom.title" = "Nom d'utilisateur :";
 
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "gLp-qz-XYs"; */
 "gLp-qz-XYs.title" = "Inscription";
@@ -39,19 +39,19 @@
 "kt0-P6-fdQ.placeholderString" = "Entrer un nom";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Revoke"; ObjectID = "lrB-j5-Mvy"; */
-"lrB-j5-Mvy.ibShadowedToolTip" = "Revoke";
+"lrB-j5-Mvy.ibShadowedToolTip" = "Révoquer";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "oVO-wj-fwQ"; */
 "oVO-wj-fwQ.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
-"oga-WC-4gb.title" = "Linked devices";
+"oga-WC-4gb.title" = "Appareils lié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" = "Link another device";
+"tWk-Od-BEQ.title" = "Lier autre appareil";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "uLQ-MS-pZ7"; */
 "uLQ-MS-pZ7.title" = "Compte";
diff --git a/ui/fr_CA.lproj/AccSipGeneral.strings b/ui/fr_CA.lproj/AccSipGeneral.strings
index 9475098f30262eb88b49fb6415c4df67cc00133b..2b2121dc2c25e6ebf99113d270b2be82d6b92a9b 100644
--- a/ui/fr_CA.lproj/AccSipGeneral.strings
+++ b/ui/fr_CA.lproj/AccSipGeneral.strings
@@ -36,4 +36,4 @@
 "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 Compte";
diff --git a/ui/fr_CA.lproj/Localizable.strings b/ui/fr_CA.lproj/Localizable.strings
index 7a166c1f93f674198c4adba5e6f48891eb8c461c..9bfbffb83d904479830de9f0c5141e33903c583d 100644
--- a/ui/fr_CA.lproj/Localizable.strings
+++ b/ui/fr_CA.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accepter";
 
+/* Button Action */
+"Cancel" = "Annuler";
+
 /* Welcome title */
 "Add a SIP account" = "Ajouter un compte SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Souhaitez-vous laisser un message?";
 
+/* Password button title */
+"Change password" = "Changer mot de passe";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/fr_CH.lproj/AccAdvancedRing.strings b/ui/fr_CH.lproj/AccAdvancedRing.strings
index dcf98b27d9ca3c2af0727c4bb9bd88f18bcb7975..6f22550d4d452fa4eee7709b20b183f5846e03e6 100644
--- a/ui/fr_CH.lproj/AccAdvancedRing.strings
+++ b/ui/fr_CH.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
@@ -12,49 +12,49 @@
 "7eU-EP-4br.title" = "Box";
 
 /* 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" = "Call settings";
+"BIS-Ft-yJn.title" = "Paramètres appels";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "DSe-Cs-oD6"; */
-"DSe-Cs-oD6.title" = "Auto answer calls";
+"DSe-Cs-oD6.title" = "Réponse automatique aux appels";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "EyV-Io-d3f"; */
 "EyV-Io-d3f.title" = "Cellule de texte";
 
 /* Class = "NSTextFieldCell"; title = "Name server"; ObjectID = "ID3-Sv-gYY"; */
-"ID3-Sv-gYY.title" = "Name server";
+"ID3-Sv-gYY.title" = "Serveur de nom";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "K0z-NH-3Cq"; */
 "K0z-NH-3Cq.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "User certificate"; ObjectID = "LWs-a2-E7f"; */
-"LWs-a2-E7f.title" = "User certificate";
+"LWs-a2-E7f.title" = "Certificat d'utilisateur";
 
 /* Class = "NSTextFieldCell"; title = "Audio codecs"; ObjectID = "Q4t-zo-brK"; */
 "Q4t-zo-brK.title" = "Audio codecs";
 
 /* Class = "NSTextFieldCell"; title = "Security"; ObjectID = "Qxp-I4-A7W"; */
-"Qxp-I4-A7W.title" = "Security";
+"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" = "Activer proxy";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
-"Wrh-zD-uh5.title" = "Video codecs";
+"Wrh-zD-uh5.title" = "Codecs vidéo";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "XU0-bl-lDD"; */
 "XU0-bl-lDD.title" = "TURN realm";
 
 /* 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" = "Bootstrap";
+"YJM-iQ-0lE.title" = "Amorcer";
 
 /* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "YcX-lE-8ug"; */
-"YcX-lE-8ug.title" = "Private key password";
+"YcX-lE-8ug.title" = "Mot de passe de la clé privée ";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "Ywo-5x-8kh"; */
 "Ywo-5x-8kh.title" = "Box";
@@ -63,34 +63,34 @@
 "ZNe-H0-dJk.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "ZqB-gt-yFt"; */
-"ZqB-gt-yFt.title" = "Address";
+"ZqB-gt-yFt.title" = "Adresse";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "eGX-gk-Zxp"; */
 "eGX-gk-Zxp.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "eMG-uY-bpH"; */
-"eMG-uY-bpH.title" = "TURN username";
+"eMG-uY-bpH.title" = "Nom d'utilisateur TURN";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "g8T-u3-MS3"; */
 "g8T-u3-MS3.title" = "Cellule de texte";
 
 /* Class = "NSTextFieldCell"; title = "TURN password"; ObjectID = "gUl-Px-cIJ"; */
-"gUl-Px-cIJ.title" = "TURN password";
+"gUl-Px-cIJ.title" = "Mot de passe TURN";
 
 /* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "k7i-pK-JXp"; */
-"k7i-pK-JXp.title" = "CA certificate";
+"k7i-pK-JXp.title" = "Autorité de Certification";
 
 /* Class = "NSButtonCell"; title = "Use STUN"; ObjectID = "nqX-Vu-UuA"; */
-"nqX-Vu-UuA.title" = "Use STUN";
+"nqX-Vu-UuA.title" = "Utiliser STUN";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "qFq-Yh-2JL"; */
-"qFq-Yh-2JL.title" = "Custom ringtone";
+"qFq-Yh-2JL.title" = "Sonnerie personnalisée";
 
 /* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "sVe-iG-OCw"; */
-"sVe-iG-OCw.title" = "Connectivity";
+"sVe-iG-OCw.title" = "Connectivité";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "soR-nF-ybe"; */
-"soR-nF-ybe.title" = "Private key";
+"soR-nF-ybe.title" = "Clé privée";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "sy5-OH-wyB"; */
 "sy5-OH-wyB.title" = "Box";
@@ -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" = "Configuration OpenDHT";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "zPJ-cO-neQ"; */
-"zPJ-cO-neQ.title" = "Use TURN";
+"zPJ-cO-neQ.title" = "Utiliser le TURN";
diff --git a/ui/fr_CH.lproj/AccAdvancedSip.strings b/ui/fr_CH.lproj/AccAdvancedSip.strings
index ff1d9f40510a7abb4de1c4a7238049dc3a471fc3..46b627005d50139e68bdf86e339cabedf430a7ea 100644
--- a/ui/fr_CH.lproj/AccAdvancedSip.strings
+++ b/ui/fr_CH.lproj/AccAdvancedSip.strings
@@ -6,25 +6,25 @@
 "0cb-ib-oHd.title" = "Video RTP port Range";
 
 /* Class = "NSTextFieldCell"; title = "Security"; ObjectID = "24s-we-pkD"; */
-"24s-we-pkD.title" = "Security";
+"24s-we-pkD.title" = "Sécurité";
 
 /* Class = "NSTextFieldCell"; title = "Registration expire timeout (seconds)"; ObjectID = "2rB-Bv-c9U"; */
 "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" = "Paramètres appels";
 
 /* Class = "NSButtonCell"; title = "Fallback on RTP on encryption failure"; ObjectID = "3rM-KT-bNf"; */
 "3rM-KT-bNf.title" = "Fallback on RTP on encryption failure";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "3vs-TI-tkg"; */
-"3vs-TI-tkg.title" = "Auto answer calls";
+"3vs-TI-tkg.title" = "Réponse automatique aux appels";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "6eH-la-JbF"; */
 "6eH-la-JbF.title" = "TURN realm";
 
 /* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "72p-GY-gu6"; */
-"72p-GY-gu6.title" = "Private key password";
+"72p-GY-gu6.title" = "Mot de passe de la clé privée ";
 
 /* Class = "NSTextFieldCell"; title = "Outgoing TLS server name"; ObjectID = "8JD-11-wHZ"; */
 "8JD-11-wHZ.title" = "Outgoing TLS server name";
@@ -42,13 +42,13 @@
 "ELr-A7-mGE.title" = "Published address";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "Gwi-Mp-NpZ"; */
-"Gwi-Mp-NpZ.title" = "Use TURN";
+"Gwi-Mp-NpZ.title" = "Utiliser le TURN";
 
 /* Class = "NSButtonCell"; title = "Use STUN"; ObjectID = "HRM-FR-1sH"; */
-"HRM-FR-1sH.title" = "Use STUN";
+"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" = "Require a certificate for incoming TLS connections";
@@ -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" = "Sonnerie personnalisée";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
 "OEo-C7-vEh.title" = "Item 2";
@@ -84,25 +84,25 @@
 "Vke-hs-iXz.title" = "Audio codecs";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "W9F-Nf-ehp"; */
-"W9F-Nf-ehp.title" = "Private key";
+"W9F-Nf-ehp.title" = "Clé privée";
 
 /* Class = "NSButtonCell"; title = "Verify answer certificates (client side)"; ObjectID = "WsS-1e-Epm"; */
 "WsS-1e-Epm.title" = "Verify answer certificates (client side)";
 
 /* Class = "NSTextFieldCell"; title = "User certificate"; ObjectID = "Xp3-bL-3Cs"; */
-"Xp3-bL-3Cs.title" = "User certificate";
+"Xp3-bL-3Cs.title" = "Certificat d'utilisateur";
 
 /* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "Xxr-gl-ukE"; */
-"Xxr-gl-ukE.title" = "Address";
+"Xxr-gl-ukE.title" = "Adresse";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "Zuz-jy-rLn"; */
 "Zuz-jy-rLn.title" = "Box";
 
 /* 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" = "CA certificate";
+"b2y-85-ZHK.title" = "Autorité de Certification";
 
 /* 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";
@@ -123,7 +123,7 @@
 "fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "gJs-aX-7Ox"; */
-"gJs-aX-7Ox.title" = "Video codecs";
+"gJs-aX-7Ox.title" = "Codecs vidéo";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "jgX-tQ-dIA"; */
 "jgX-tQ-dIA.title" = "Cellule de texte";
@@ -141,7 +141,7 @@
 "nuq-Wl-sfd.title" = "Use custom address and port";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "rMN-Wf-tmp"; */
-"rMN-Wf-tmp.title" = "TURN username";
+"rMN-Wf-tmp.title" = "Nom d'utilisateur TURN";
 
 /* Class = "NSButtonCell"; title = "Encrypt media streams(SRTP)"; ObjectID = "vCS-s8-mZI"; */
 "vCS-s8-mZI.title" = "Encrypt media streams(SRTP)";
@@ -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" = "Connectivité";
 
 /* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "wq6-KV-8X3"; */
 "wq6-KV-8X3.title" = "Max";
@@ -162,7 +162,7 @@
 "x93-zk-hAW.title" = "UPnP";
 
 /* Class = "NSTextFieldCell"; title = "TURN password"; ObjectID = "xjL-Wb-7VN"; */
-"xjL-Wb-7VN.title" = "TURN password";
+"xjL-Wb-7VN.title" = "Mot de passe TURN";
 
 /* Class = "NSTextFieldCell"; title = "TLS protocol method"; ObjectID = "zBy-cW-KY3"; */
 "zBy-cW-KY3.title" = "TLS protocol method";
diff --git a/ui/fr_CH.lproj/AccRingGeneral.strings b/ui/fr_CH.lproj/AccRingGeneral.strings
index 7d2b444dee36316c8182002a011875ee07a007ac..6fe996a5ca3ca312a3c385b2a2077a55ad0b2aaa 100644
--- a/ui/fr_CH.lproj/AccRingGeneral.strings
+++ b/ui/fr_CH.lproj/AccRingGeneral.strings
@@ -1,33 +1,33 @@
 
 /* Class = "NSButtonCell"; title = "Export Account"; ObjectID = "1aj-MG-mHp"; */
-"1aj-MG-mHp.title" = "Export Account";
+"1aj-MG-mHp.title" = "Sauvegarder Compte";
 
 /* Class = "NSTextFieldCell"; title = "Banned Contacts"; ObjectID = "6fI-98-VvQ"; */
-"6fI-98-VvQ.title" = "Banned Contacts";
+"6fI-98-VvQ.title" = "Contacts bloqués";
 
 /* Class = "NSButtonCell"; title = "Advanced"; ObjectID = "Hbq-nL-BhK"; */
 "Hbq-nL-BhK.title" = "Options avancées";
 
 /* Class = "NSButtonCell"; title = "Enable"; ObjectID = "Op4-XO-WsE"; */
-"Op4-XO-WsE.title" = "Enable";
+"Op4-XO-WsE.title" = "Activé";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "TYk-QK-iaT"; */
-"TYk-QK-iaT.title" = "Password:";
+"TYk-QK-iaT.title" = "Mot de passe:";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Edit name"; ObjectID = "WEo-a0-wVL"; */
-"WEo-a0-wVL.ibShadowedToolTip" = "Edit name";
+"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 Compte";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
 "aQL-hX-CfA.title" = "Cellule de texte";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Unblock"; ObjectID = "bOY-mY-1Yo"; */
-"bOY-mY-1Yo.ibShadowedToolTip" = "Unblock";
+"bOY-mY-1Yo.ibShadowedToolTip" = "Débloquer";
 
 /* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "fPK-Zv-Uom"; */
-"fPK-Zv-Uom.title" = "Username:";
+"fPK-Zv-Uom.title" = "Nom d'utilisateur :";
 
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "gLp-qz-XYs"; */
 "gLp-qz-XYs.title" = "Enregistrer";
@@ -39,19 +39,19 @@
 "kt0-P6-fdQ.placeholderString" = "Entrer un nom";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Revoke"; ObjectID = "lrB-j5-Mvy"; */
-"lrB-j5-Mvy.ibShadowedToolTip" = "Revoke";
+"lrB-j5-Mvy.ibShadowedToolTip" = "Révoquer";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "oVO-wj-fwQ"; */
 "oVO-wj-fwQ.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
-"oga-WC-4gb.title" = "Linked devices";
+"oga-WC-4gb.title" = "Appareils lié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" = "Link another device";
+"tWk-Od-BEQ.title" = "Lier autre appareil";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "uLQ-MS-pZ7"; */
 "uLQ-MS-pZ7.title" = "Compte";
diff --git a/ui/fr_CH.lproj/AccSipGeneral.strings b/ui/fr_CH.lproj/AccSipGeneral.strings
index ec712c8fe96cb6ce360c524763efc973349a1cc2..d0a5623f7f2fb6bc41cec4ec91d4ca0f88ace9c4 100644
--- a/ui/fr_CH.lproj/AccSipGeneral.strings
+++ b/ui/fr_CH.lproj/AccSipGeneral.strings
@@ -36,4 +36,4 @@
 "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 Compte";
diff --git a/ui/fr_CH.lproj/Localizable.strings b/ui/fr_CH.lproj/Localizable.strings
index 141c76a0586cbf4d0e430c51cdeab3163e67e3f7..de196b7edca689749c6d1a3c1c3acb03176546c2 100644
--- a/ui/fr_CH.lproj/Localizable.strings
+++ b/ui/fr_CH.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accepter";
 
+/* Button Action */
+"Cancel" = "Annuler";
+
 /* Welcome title */
 "Add a SIP account" = "Ajouter un compte SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Souhaitez-vous laisser un message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/fr_FR.lproj/AccAdvancedRing.strings b/ui/fr_FR.lproj/AccAdvancedRing.strings
index e02e7977086c3531f3f402516c1e82e71130b008..6f22550d4d452fa4eee7709b20b183f5846e03e6 100644
--- a/ui/fr_FR.lproj/AccAdvancedRing.strings
+++ b/ui/fr_FR.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
@@ -12,49 +12,49 @@
 "7eU-EP-4br.title" = "Box";
 
 /* 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" = "Call settings";
+"BIS-Ft-yJn.title" = "Paramètres appels";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "DSe-Cs-oD6"; */
-"DSe-Cs-oD6.title" = "Auto answer calls";
+"DSe-Cs-oD6.title" = "Réponse automatique aux appels";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "EyV-Io-d3f"; */
 "EyV-Io-d3f.title" = "Cellule de texte";
 
 /* Class = "NSTextFieldCell"; title = "Name server"; ObjectID = "ID3-Sv-gYY"; */
-"ID3-Sv-gYY.title" = "Name server";
+"ID3-Sv-gYY.title" = "Serveur de nom";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "K0z-NH-3Cq"; */
 "K0z-NH-3Cq.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "User certificate"; ObjectID = "LWs-a2-E7f"; */
-"LWs-a2-E7f.title" = "User certificate";
+"LWs-a2-E7f.title" = "Certificat d'utilisateur";
 
 /* Class = "NSTextFieldCell"; title = "Audio codecs"; ObjectID = "Q4t-zo-brK"; */
 "Q4t-zo-brK.title" = "Audio codecs";
 
 /* Class = "NSTextFieldCell"; title = "Security"; ObjectID = "Qxp-I4-A7W"; */
-"Qxp-I4-A7W.title" = "securité";
+"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" = "Activer proxy";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
-"Wrh-zD-uh5.title" = "Video codecs";
+"Wrh-zD-uh5.title" = "Codecs vidéo";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "XU0-bl-lDD"; */
 "XU0-bl-lDD.title" = "TURN realm";
 
 /* 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" = "Bootstrap";
+"YJM-iQ-0lE.title" = "Amorcer";
 
 /* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "YcX-lE-8ug"; */
-"YcX-lE-8ug.title" = "Private key password";
+"YcX-lE-8ug.title" = "Mot de passe de la clé privée ";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "Ywo-5x-8kh"; */
 "Ywo-5x-8kh.title" = "Box";
@@ -63,34 +63,34 @@
 "ZNe-H0-dJk.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "ZqB-gt-yFt"; */
-"ZqB-gt-yFt.title" = "Address";
+"ZqB-gt-yFt.title" = "Adresse";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "eGX-gk-Zxp"; */
 "eGX-gk-Zxp.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "eMG-uY-bpH"; */
-"eMG-uY-bpH.title" = "TURN username";
+"eMG-uY-bpH.title" = "Nom d'utilisateur TURN";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "g8T-u3-MS3"; */
 "g8T-u3-MS3.title" = "Cellule de texte";
 
 /* Class = "NSTextFieldCell"; title = "TURN password"; ObjectID = "gUl-Px-cIJ"; */
-"gUl-Px-cIJ.title" = "TURN password";
+"gUl-Px-cIJ.title" = "Mot de passe TURN";
 
 /* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "k7i-pK-JXp"; */
-"k7i-pK-JXp.title" = "CA certificate";
+"k7i-pK-JXp.title" = "Autorité de Certification";
 
 /* Class = "NSButtonCell"; title = "Use STUN"; ObjectID = "nqX-Vu-UuA"; */
-"nqX-Vu-UuA.title" = "Use STUN";
+"nqX-Vu-UuA.title" = "Utiliser STUN";
 
 /* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "qFq-Yh-2JL"; */
-"qFq-Yh-2JL.title" = "Custom ringtone";
+"qFq-Yh-2JL.title" = "Sonnerie personnalisée";
 
 /* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "sVe-iG-OCw"; */
-"sVe-iG-OCw.title" = "Connectivity";
+"sVe-iG-OCw.title" = "Connectivité";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "soR-nF-ybe"; */
-"soR-nF-ybe.title" = "Private key";
+"soR-nF-ybe.title" = "Clé privée";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "sy5-OH-wyB"; */
 "sy5-OH-wyB.title" = "Box";
@@ -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" = "Configuration OpenDHT";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "zPJ-cO-neQ"; */
-"zPJ-cO-neQ.title" = "Use TURN";
+"zPJ-cO-neQ.title" = "Utiliser le TURN";
diff --git a/ui/fr_FR.lproj/AccAdvancedSip.strings b/ui/fr_FR.lproj/AccAdvancedSip.strings
index 70dea58bb5637c160658f5afadcc1cda0aeac3dd..abb11e3ed105b2c62b3bcffc177b46e25a5b4582 100644
--- a/ui/fr_FR.lproj/AccAdvancedSip.strings
+++ b/ui/fr_FR.lproj/AccAdvancedSip.strings
@@ -12,19 +12,19 @@
 "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" = "Paramètres appels";
 
 /* Class = "NSButtonCell"; title = "Fallback on RTP on encryption failure"; ObjectID = "3rM-KT-bNf"; */
 "3rM-KT-bNf.title" = "Fallback on RTP on encryption failure";
 
 /* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "3vs-TI-tkg"; */
-"3vs-TI-tkg.title" = "Auto answer calls";
+"3vs-TI-tkg.title" = "Réponse automatique aux appels";
 
 /* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "6eH-la-JbF"; */
 "6eH-la-JbF.title" = "TURN realm";
 
 /* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "72p-GY-gu6"; */
-"72p-GY-gu6.title" = "Private key password";
+"72p-GY-gu6.title" = "Mot de passe de la clé privée ";
 
 /* Class = "NSTextFieldCell"; title = "Outgoing TLS server name"; ObjectID = "8JD-11-wHZ"; */
 "8JD-11-wHZ.title" = "Outgoing TLS server name";
@@ -42,13 +42,13 @@
 "ELr-A7-mGE.title" = "Published address";
 
 /* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "Gwi-Mp-NpZ"; */
-"Gwi-Mp-NpZ.title" = "Use TURN";
+"Gwi-Mp-NpZ.title" = "Utiliser le TURN";
 
 /* Class = "NSButtonCell"; title = "Use STUN"; ObjectID = "HRM-FR-1sH"; */
-"HRM-FR-1sH.title" = "Use STUN";
+"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" = "Require a certificate for incoming TLS connections";
@@ -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" = "Sonnerie personnalisée";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
 "OEo-C7-vEh.title" = "Item 2";
@@ -84,25 +84,25 @@
 "Vke-hs-iXz.title" = "Audio codecs";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "W9F-Nf-ehp"; */
-"W9F-Nf-ehp.title" = "Private key";
+"W9F-Nf-ehp.title" = "Clé privée";
 
 /* Class = "NSButtonCell"; title = "Verify answer certificates (client side)"; ObjectID = "WsS-1e-Epm"; */
 "WsS-1e-Epm.title" = "Verify answer certificates (client side)";
 
 /* Class = "NSTextFieldCell"; title = "User certificate"; ObjectID = "Xp3-bL-3Cs"; */
-"Xp3-bL-3Cs.title" = "User certificate";
+"Xp3-bL-3Cs.title" = "Certificat d'utilisateur";
 
 /* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "Xxr-gl-ukE"; */
-"Xxr-gl-ukE.title" = "Address";
+"Xxr-gl-ukE.title" = "Adresse";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "Zuz-jy-rLn"; */
 "Zuz-jy-rLn.title" = "Box";
 
 /* 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" = "CA certificate";
+"b2y-85-ZHK.title" = "Autorité de Certification";
 
 /* 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";
@@ -123,7 +123,7 @@
 "fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
 
 /* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "gJs-aX-7Ox"; */
-"gJs-aX-7Ox.title" = "Video codecs";
+"gJs-aX-7Ox.title" = "Codecs vidéo";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "jgX-tQ-dIA"; */
 "jgX-tQ-dIA.title" = "Cellule de texte";
@@ -141,7 +141,7 @@
 "nuq-Wl-sfd.title" = "Use custom address and port";
 
 /* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "rMN-Wf-tmp"; */
-"rMN-Wf-tmp.title" = "TURN username";
+"rMN-Wf-tmp.title" = "Nom d'utilisateur TURN";
 
 /* Class = "NSButtonCell"; title = "Encrypt media streams(SRTP)"; ObjectID = "vCS-s8-mZI"; */
 "vCS-s8-mZI.title" = "Encrypt media streams(SRTP)";
@@ -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" = "Connectivité";
 
 /* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "wq6-KV-8X3"; */
 "wq6-KV-8X3.title" = "Max";
@@ -162,7 +162,7 @@
 "x93-zk-hAW.title" = "UPnP";
 
 /* Class = "NSTextFieldCell"; title = "TURN password"; ObjectID = "xjL-Wb-7VN"; */
-"xjL-Wb-7VN.title" = "TURN password";
+"xjL-Wb-7VN.title" = "Mot de passe TURN";
 
 /* Class = "NSTextFieldCell"; title = "TLS protocol method"; ObjectID = "zBy-cW-KY3"; */
 "zBy-cW-KY3.title" = "TLS protocol method";
diff --git a/ui/fr_FR.lproj/AccRingGeneral.strings b/ui/fr_FR.lproj/AccRingGeneral.strings
index af0b8e0ebfad5e2f9929654174307d90299d1501..72ef52d72cd067c99ec6a342da0aea1e94c2c0a7 100644
--- a/ui/fr_FR.lproj/AccRingGeneral.strings
+++ b/ui/fr_FR.lproj/AccRingGeneral.strings
@@ -1,33 +1,33 @@
 
 /* Class = "NSButtonCell"; title = "Export Account"; ObjectID = "1aj-MG-mHp"; */
-"1aj-MG-mHp.title" = "Export Account";
+"1aj-MG-mHp.title" = "Sauvegarder Compte";
 
 /* Class = "NSTextFieldCell"; title = "Banned Contacts"; ObjectID = "6fI-98-VvQ"; */
-"6fI-98-VvQ.title" = "Banned Contacts";
+"6fI-98-VvQ.title" = "Contacts bloqués";
 
 /* Class = "NSButtonCell"; title = "Advanced"; ObjectID = "Hbq-nL-BhK"; */
 "Hbq-nL-BhK.title" = "Options avancées";
 
 /* Class = "NSButtonCell"; title = "Enable"; ObjectID = "Op4-XO-WsE"; */
-"Op4-XO-WsE.title" = "Enable";
+"Op4-XO-WsE.title" = "Activé";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "TYk-QK-iaT"; */
-"TYk-QK-iaT.title" = "Password:";
+"TYk-QK-iaT.title" = "Mot de passe:";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Edit name"; ObjectID = "WEo-a0-wVL"; */
-"WEo-a0-wVL.ibShadowedToolTip" = "Edit name";
+"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 Compte";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
 "aQL-hX-CfA.title" = "Cellule de texte";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Unblock"; ObjectID = "bOY-mY-1Yo"; */
-"bOY-mY-1Yo.ibShadowedToolTip" = "débloquer";
+"bOY-mY-1Yo.ibShadowedToolTip" = "Débloquer";
 
 /* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "fPK-Zv-Uom"; */
-"fPK-Zv-Uom.title" = "Username:";
+"fPK-Zv-Uom.title" = "Nom d'utilisateur :";
 
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "gLp-qz-XYs"; */
 "gLp-qz-XYs.title" = "Enregistrer";
@@ -39,19 +39,19 @@
 "kt0-P6-fdQ.placeholderString" = "Entrer un nom";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Revoke"; ObjectID = "lrB-j5-Mvy"; */
-"lrB-j5-Mvy.ibShadowedToolTip" = "Revoke";
+"lrB-j5-Mvy.ibShadowedToolTip" = "Révoquer";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "oVO-wj-fwQ"; */
 "oVO-wj-fwQ.title" = "Box";
 
 /* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
-"oga-WC-4gb.title" = "Linked devices";
+"oga-WC-4gb.title" = "Appareils lié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" = "Link another device";
+"tWk-Od-BEQ.title" = "Lier autre appareil";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "uLQ-MS-pZ7"; */
 "uLQ-MS-pZ7.title" = "compte";
diff --git a/ui/fr_FR.lproj/AccSipGeneral.strings b/ui/fr_FR.lproj/AccSipGeneral.strings
index 80006da8d77f77f87bcd62762f7ed95c93774d68..5d0a796b7f49bbc07d2b6d220677dc042c49ba3b 100644
--- a/ui/fr_FR.lproj/AccSipGeneral.strings
+++ b/ui/fr_FR.lproj/AccSipGeneral.strings
@@ -36,4 +36,4 @@
 "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 Compte";
diff --git a/ui/fr_FR.lproj/Localizable.strings b/ui/fr_FR.lproj/Localizable.strings
index fc227181cc891a1b8e714428ce7a3d7560a5a575..2ad18857d0612567971d0870e67443dc29788bf7 100644
--- a/ui/fr_FR.lproj/Localizable.strings
+++ b/ui/fr_FR.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accepter";
 
+/* Button Action */
+"Cancel" = "Annuler";
+
 /* Welcome title */
 "Add a SIP account" = "Ajouter un compte SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Souhaitez-vous laisser un message?";
 
+/* Password button title */
+"Change password" = "changer le mot de passe";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/gl.lproj/AccAdvancedRing.strings b/ui/gl.lproj/AccAdvancedRing.strings
index e2e4921633896c2a68d18024c1545d38f1196def..24edfd71b26fff48dcf49f5c4bccaa5adab9257d 100644
--- a/ui/gl.lproj/AccAdvancedRing.strings
+++ b/ui/gl.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Permitir chamadas de pares nos que aínda non confiaches";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/gl.lproj/AccSipGeneral.strings b/ui/gl.lproj/AccSipGeneral.strings
index e833d6f3ce593f814e021eed20946e7e4c6eac1d..58d3cbba056da984ab4b476a1faa1391b341ba2d 100644
--- a/ui/gl.lproj/AccSipGeneral.strings
+++ b/ui/gl.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" = "Nome de Usuaria";
+"Fj6-Q3-Gz3.title" = "Nome de usuaria";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "NlM-R9-ola"; */
 "NlM-R9-ola.title" = "Box";
diff --git a/ui/gl.lproj/AddSIPAccountVC.strings b/ui/gl.lproj/AddSIPAccountVC.strings
index 11bae8f970cb3174f79e8e515718977f9e8765ea..c91eb22c9d9faf33c44736012decceacc42458d1 100644
--- a/ui/gl.lproj/AddSIPAccountVC.strings
+++ b/ui/gl.lproj/AddSIPAccountVC.strings
@@ -18,7 +18,7 @@
 "Rej-Yd-PDb.placeholderString" = "Escribir nome de usuaria";
 
 /* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Srm-hv-9WR"; */
-"Srm-hv-9WR.title" = "Nome de Usuaria";
+"Srm-hv-9WR.title" = "Nome de usuaria";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YeS-R8-ZLT"; */
 "YeS-R8-ZLT.placeholderString" = "Escribir nome";
diff --git a/ui/gl.lproj/CurrentCall.strings b/ui/gl.lproj/CurrentCall.strings
index 0602111f5c07125816ddcf8c1496c939194ca166..08c5b4660cf84cc16222b89d22e175ed70b3ab3e 100644
--- a/ui/gl.lproj/CurrentCall.strings
+++ b/ui/gl.lproj/CurrentCall.strings
@@ -48,7 +48,7 @@
 "dPt-JY-yxV.placeholderString" = "Estado";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
-"fmp-x4-Pef.ibShadowedToolTip" = "Activar chat";
+"fmp-x4-Pef.ibShadowedToolTip" = "Activar a conversa";
 
 /* Class = "NSTextFieldCell"; title = "person Id"; ObjectID = "hKi-Ay-ex5"; */
 "hKi-Ay-ex5.title" = "ID da persoa";
diff --git a/ui/gl.lproj/Localizable.strings b/ui/gl.lproj/Localizable.strings
index b534413646a8e562e6a37b5c3472d6930de06987..712dfc70b7fb29d0e532bb67dd943e5de5083f1a 100644
--- a/ui/gl.lproj/Localizable.strings
+++ b/ui/gl.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Aceptar";
 
+/* Button Action */
+"Cancel" = "Cancelar";
+
 /* Welcome title */
 "Add a SIP account" = "Engadir conta SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Queres deixar unha mensaxe?";
 
+/* Password button title */
+"Change password" = "Cambiar contrasinal";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Feito";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Editar conta";
+
diff --git a/ui/gl.lproj/RegisterNameWindow.strings b/ui/gl.lproj/RegisterNameWindow.strings
index 86635637ab85b62680f735bdf6c265c044f4a41d..59f1be4aaa7f2c9e7878dedc216a10e7cebded33 100644
--- a/ui/gl.lproj/RegisterNameWindow.strings
+++ b/ui/gl.lproj/RegisterNameWindow.strings
@@ -48,4 +48,4 @@
 "nFA-uz-WjI.placeholderString" = "Escribe o contrasinal...";
 
 /* Class = "NSTextFieldCell"; title = "Register a public username "; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Rexistra un nome de usuaria público";
+"tje-EZ-ZPI.title" = "Rexistrar o nome público de usuaria";
diff --git a/ui/gl.lproj/RingWizardNewAccount.strings b/ui/gl.lproj/RingWizardNewAccount.strings
index 07963a6436beb5a215d3d74bdee1663efce1adeb..b7811ab8f8d71f8cfa5cf7f66138ee312dabcefb 100644
--- a/ui/gl.lproj/RingWizardNewAccount.strings
+++ b/ui/gl.lproj/RingWizardNewAccount.strings
@@ -18,7 +18,7 @@
 "93I-zf-xAk.ibShadowedNotApplicablePlaceholder" = "Repite o contrasinal...";
 
 /* Class = "NSButtonCell"; title = "Register public username"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Rexistrar nome de usuaria público";
+"AG5-GR-bii.title" = "Rexistrar o nome público de usuaria";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Repeat password"; ObjectID = "BCg-5V-Ek4"; */
 "BCg-5V-Ek4.placeholderString" = "Repite contrasinal";
diff --git a/ui/he.lproj/AccAdvancedRing.strings b/ui/he.lproj/AccAdvancedRing.strings
index fc0f7b1cb6dacb3eb58d2ae03c8820b6621ff815..7139bd7a0b99ab1a2647ee1b6ecffe9192ebe0a0 100644
--- a/ui/he.lproj/AccAdvancedRing.strings
+++ b/ui/he.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/he.lproj/Localizable.strings b/ui/he.lproj/Localizable.strings
index 588f0c21dc427d29c81274428b419edcd1dfcd55..6d6cd0dd2c43212ea0117a7d92bfdd41fc7b189c 100644
--- a/ui/he.lproj/Localizable.strings
+++ b/ui/he.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "קבל";
 
+/* Button Action */
+"Cancel" = "ביטול";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "סיים";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/hr.lproj/AccAdvancedRing.strings b/ui/hr.lproj/AccAdvancedRing.strings
index b79e1d1d6e047311e27b620f858e2e32636246f1..e25f56621fd8130861e0e1d4391070b85e615433 100644
--- a/ui/hr.lproj/AccAdvancedRing.strings
+++ b/ui/hr.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/hr.lproj/Localizable.strings b/ui/hr.lproj/Localizable.strings
index 4882c6b91398483d87716f78b5121a252006c04a..342615f645e9ab6b427c888adc9b10aa99dc32ba 100644
--- a/ui/hr.lproj/Localizable.strings
+++ b/ui/hr.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Prihvati";
 
+/* Button Action */
+"Cancel" = "Poništi";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Učinjeno";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/hu.lproj/AccAdvancedRing.strings b/ui/hu.lproj/AccAdvancedRing.strings
index 5770a1ac8d0165ab6b4d1ed314ab2a5618727fa7..ea710f2299cbc7b2fb3ea1b7ccac5047b3073389 100644
--- a/ui/hu.lproj/AccAdvancedRing.strings
+++ b/ui/hu.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Hívások engedélyezése ismeretlen kapcsolatoktól";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/hu.lproj/Localizable.strings b/ui/hu.lproj/Localizable.strings
index 82d53db75ec8b7e8acbf2395cd0031e769382512..ee34d46d4a4b813f1f31baf7e63355868c559544 100644
--- a/ui/hu.lproj/Localizable.strings
+++ b/ui/hu.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Elfogadás";
 
+/* Button Action */
+"Cancel" = "Mégse";
+
 /* Welcome title */
 "Add a SIP account" = "SIP fiók hozzáadása";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Szeretne üzenetet hagyni?";
 
+/* Password button title */
+"Change password" = "Jelszó megváltoztatása";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Kész";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Fiók szerkesztése";
+
diff --git a/ui/id.lproj/Localizable.strings b/ui/id.lproj/Localizable.strings
index e986f033b5e4dbd06d1927fd04897df13dc67139..90b18e54afc2a8179fdd95807424f05756901944 100644
--- a/ui/id.lproj/Localizable.strings
+++ b/ui/id.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Terima";
 
+/* Button Action */
+"Cancel" = "Cancel";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/ig.lproj/Localizable.strings b/ui/ig.lproj/Localizable.strings
index b2f0ffa06e3ddf4ea4d63d48da04d34344fa6743..0e412332155752e82114a80cdb8b38cbb9bf2900 100644
--- a/ui/ig.lproj/Localizable.strings
+++ b/ui/ig.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accept";
 
+/* Button Action */
+"Cancel" = "Cancel";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/it.lproj/AccAdvancedRing.strings b/ui/it.lproj/AccAdvancedRing.strings
index cdfad9f8210ded5b21749599853ceacc84e1bf89..140e45f8ea08dae9dd0adbb11d0f8a842376cb08 100644
--- a/ui/it.lproj/AccAdvancedRing.strings
+++ b/ui/it.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Consenti chiamate da peer non attendibili";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/it.lproj/Localizable.strings b/ui/it.lproj/Localizable.strings
index 8e2832249057b69b894f639b5b314036b1996f34..f2b50923b6bc2d765887bd2ca356e17c2f9cc870 100644
--- a/ui/it.lproj/Localizable.strings
+++ b/ui/it.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accetta";
 
+/* Button Action */
+"Cancel" = "Annulla";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Cambia password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/it_IT.lproj/AccAdvancedRing.strings b/ui/it_IT.lproj/AccAdvancedRing.strings
index 739980c1b246def796fe0f72c58e4ca62503d0c5..0afc8e9a267fa10b66240fd6a68fc7bea55458ac 100644
--- a/ui/it_IT.lproj/AccAdvancedRing.strings
+++ b/ui/it_IT.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Consenti chiamate da peer non attendibili";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/it_IT.lproj/Localizable.strings b/ui/it_IT.lproj/Localizable.strings
index 819fd6eb5f9714d83d63a9be87ea660c4e708f07..07ef4a1d8a9343fe37f283bb292a160d06eb6f76 100644
--- a/ui/it_IT.lproj/Localizable.strings
+++ b/ui/it_IT.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accetta";
 
+/* Button Action */
+"Cancel" = "Annulla";
+
 /* Welcome title */
 "Add a SIP account" = "Aggiungi un account SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Vuoi lasciare un messaggio?";
 
+/* Password button title */
+"Change password" = "Cambia password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Fatto";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Modifica l'account";
+
diff --git a/ui/ja.lproj/AccAdvancedRing.strings b/ui/ja.lproj/AccAdvancedRing.strings
index 500e6a8081904ef7e92caa77da559873af1b783d..d75253462dca1c07d02cce15ec9385a3943a414d 100644
--- a/ui/ja.lproj/AccAdvancedRing.strings
+++ b/ui/ja.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "信頼できないピアからの通話を許可する";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/ja.lproj/Localizable.strings b/ui/ja.lproj/Localizable.strings
index 186db6f89eea8425a4f2bfd54b173ebeeeb053eb..8242926fc2d60d7f8ce1e4bc34d4aa476103a4df 100644
--- a/ui/ja.lproj/Localizable.strings
+++ b/ui/ja.lproj/Localizable.strings
@@ -4,8 +4,11 @@
 /* Button Action */
 "Accept" = "受け入れ";
 
+/* Button Action */
+"Cancel" = "キャンセル";
+
 /* Welcome title */
-"Add a SIP account" = "Add a SIP account";
+"Add a SIP account" = "SIPアカウントを追加";
 
 /* Contextual menu action */
 "Add to contacts" = "連絡先に追加";
@@ -23,10 +26,10 @@
 "Audio permission not granted" = "Audio permission not granted";
 
 /* Backup account */
-"Backup your account" = "Backup your account";
+"Backup your account" = "アカウントをバックアップ";
 
 /* Contextual menu action */
-"Block contact" = "ブロックした連絡先";
+"Block contact" = "連絡先をブロック";
 
 /* 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.";
@@ -35,10 +38,10 @@
 "Canceled" = "キャンセルしました";
 
 /* Contextual menu entry */
-"Choose file" = "Choose file";
+"Choose file" = "ファイルの選択";
 
 /* Contextual menu action */
-"Clear conversation" = "Clear conversation";
+"Clear conversation" = "会話履歴を削除";
 
 /* No comment provided by engineer. */
 "Copy" = "コピー";
@@ -47,10 +50,10 @@
 "Could not record message during call" = "Could not record message during call";
 
 /* Welcome title */
-"Create a new account" = "Create a new account";
+"Create a new account" = "新しいアカウントを作成";
 
 /* Backup enter password */
-"Enter account password" = "Enter account password";
+"Enter account password" = "アカウントのパスワードを入力";
 
 /* File transfer failed label */
 "Failed" = "失敗しました";
@@ -68,13 +71,13 @@
 "Import from backup" = "バックアップからインポート";
 
 /* link account title */
-"Import from other device" = "Import from other device";
+"Import from other device" = "別のデバイスからインポート";
 
 /* Incoming call from {Name} */
-"Incoming call from %@" = "Incoming call from %@";
+"Incoming call from %@" = "%@ から着信";
 
 /* Incoming message from {Name} */
-"Incoming message from %@" = "Incoming message from %@";
+"Incoming message from %@" = "%@ からのメッセージ";
 
 /* Text shown to user when his username is invalid to be registered */
 "Invalid username" = "無効なユーザー名";
@@ -98,10 +101,10 @@
 "Passwords don't match" = "パスワードが一致しません";
 
 /* Contextual menu action */
-"Place audio call" = "Place audio call";
+"Place audio call" = "音声通話を開始";
 
 /* Contextual menu action */
-"Place video call" = "Place video call";
+"Place video call" = "ビデオ通話を開始";
 
 /* Recording view explanation label */
 "Press to start recording" = "Press to start recording";
@@ -113,13 +116,13 @@
 "Refuse" = "拒否";
 
 /* Text shown to the user */
-"Registered name: " = "Registered name: ";
+"Registered name: " = "登録名:";
 
 /* Remove account alert title */
-"Remove account" = "Remove account";
+"Remove account" = "アカウントを削除";
 
 /* export account button title */
-"Select archive" = "Select archive";
+"Select archive" = "アーカイブを選択";
 
 /* Send button title */
 "Send" = "送信";
@@ -131,13 +134,13 @@
 "Share" = "共有";
 
 /* Contextual menu entry */
-"Share screen" = "Share screen";
+"Share screen" = "画面を共有";
 
 /* Sign In */
 "Sign In" = "サインイン";
 
 /* Record message title */
-"Stop recording" = "Stop recording";
+"Stop recording" = "録音を停止";
 
 /* File transfer successful label */
 "Success" = "成功";
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "パスワードを変更";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "完了";
+
+/* Edit Sip Account Action */
+"Edit Account" = "アカウントを編集";
+
diff --git a/ui/ja.lproj/MainMenu.strings b/ui/ja.lproj/MainMenu.strings
index 19f0452bdb8c59a5f9e20af00357325a0f4ffee8..c493d55c8c5ed3bd11714488bced5903782fc10e 100644
--- a/ui/ja.lproj/MainMenu.strings
+++ b/ui/ja.lproj/MainMenu.strings
@@ -6,7 +6,7 @@
 "19.title" = "ウィンドウ";
 
 /* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
-"23.title" = "Minimize";
+"23.title" = "最小化";
 
 /* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
 "24.title" = "ウィンドウ";
@@ -24,7 +24,7 @@
 "58.title" = "Jamiについて";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
-"129.title" = "Preferences…";
+"129.title" = "設定…";
 
 /* Class = "NSMenu"; title = "Services"; ObjectID = "130"; */
 "130.title" = "サービス";
@@ -33,13 +33,13 @@
 "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" = "Hide Others";
+"145.title" = "他を隠す";
 
 /* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
 "150.title" = "全て表示";
@@ -123,10 +123,10 @@
 "239.title" = "拡大";
 
 /* Class = "NSMenuItem"; title = "View"; ObjectID = "295"; */
-"295.title" = "View";
+"295.title" = "表示";
 
 /* Class = "NSMenu"; title = "View"; ObjectID = "296"; */
-"296.title" = "View";
+"296.title" = "表示";
 
 /* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "297"; */
 "297.title" = "Show Toolbar";
diff --git a/ui/ja.lproj/PasswordChange.strings b/ui/ja.lproj/PasswordChange.strings
index a41813badfabcb2502906799d49e14459e73544e..12e709861b180f1c2827b476e5099a9be7aef3df 100644
--- a/ui/ja.lproj/PasswordChange.strings
+++ b/ui/ja.lproj/PasswordChange.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat a new password"; ObjectID = "1Bs-Te-34p"; */
-"1Bs-Te-34p.placeholderString" = "Repeat a new password";
+"1Bs-Te-34p.placeholderString" = "新しいパスワードの確認";
 
 /* Class = "NSTextFieldCell"; title = "Change Password"; ObjectID = "4Uf-yO-9X8"; */
 "4Uf-yO-9X8.title" = "パスワードの変更";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Enter a new password"; ObjectID = "4aD-Xd-zHS"; */
-"4aD-Xd-zHS.placeholderString" = "Enter a new password";
+"4aD-Xd-zHS.placeholderString" = "新しいパスワードを入力";
 
 /* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
 "8KO-IO-ykP.title" = "Repeat";
@@ -15,7 +15,7 @@
 "Ggu-EQ-cqC.title" = "受け入れ";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Enter your old password"; ObjectID = "Kwp-mD-Y94"; */
-"Kwp-mD-Y94.placeholderString" = "Enter your old password";
+"Kwp-mD-Y94.placeholderString" = "現在のパスワードを入力";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "MZw-ep-8aW"; */
 "MZw-ep-8aW.title" = "キャンセル";
diff --git a/ui/ja.lproj/PersonLinker.strings b/ui/ja.lproj/PersonLinker.strings
index ac61bd6992a3e7fb2eabd3a9c4d9dc4e59541666..f1f76c47a4d1b867d56d724088fd40042f2a5a3b 100644
--- a/ui/ja.lproj/PersonLinker.strings
+++ b/ui/ja.lproj/PersonLinker.strings
@@ -12,13 +12,13 @@
 "cGT-nu-sPa.placeholderString" = "Last name...";
 
 /* Class = "NSButtonCell"; title = "Add new contact"; ObjectID = "had-9Y-eza"; */
-"had-9Y-eza.title" = "Add new contact";
+"had-9Y-eza.title" = "新しい連絡先を追加";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "qZc-Z2-TpP"; */
 "qZc-Z2-TpP.title" = "作成";
 
 /* Class = "NSTextFieldCell"; title = "New Contact"; ObjectID = "v7b-de-MVd"; */
-"v7b-de-MVd.title" = "New Contact";
+"v7b-de-MVd.title" = "新しい連絡先";
 
 /* Class = "NSTextFieldCell"; placeholderString = "First name..."; ObjectID = "vyb-95-XaF"; */
 "vyb-95-XaF.placeholderString" = "First name...";
diff --git a/ui/ja.lproj/PreferencesWindow.strings b/ui/ja.lproj/PreferencesWindow.strings
index 30de1d0b1330d456c0ca1b4a78ecd75c4f238144..48be2249010878ed4504f04f322acaa3b6cbdfbc 100644
--- a/ui/ja.lproj/PreferencesWindow.strings
+++ b/ui/ja.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/ja.lproj/RegisterNameWindow.strings b/ui/ja.lproj/RegisterNameWindow.strings
index fd8827a8f695d7b94dbd89c1e4c6b891ad017d90..163a05d3dd13ba462fa8da41087e3f727ad98048 100644
--- a/ui/ja.lproj/RegisterNameWindow.strings
+++ b/ui/ja.lproj/RegisterNameWindow.strings
@@ -9,22 +9,22 @@
 "JWw-7m-ywL.title" = "ウィンドウ";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedIsNilPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedIsNilPlaceholder" = "パスワードを入力...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedMultipleValuesPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedMultipleValuesPlaceholder" = "パスワードを入力...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedNoSelectionPlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedNoSelectionPlaceholder" = "パスワードを入力...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
-"JkL-9W-ex1.ibShadowedNotApplicablePlaceholder" = "Enter password...";
+"JkL-9W-ex1.ibShadowedNotApplicablePlaceholder" = "パスワードを入力...";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "少しお待ちください...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Enter username...";
+"bdC-Uc-Qhs.placeholderString" = "ユーザー名を入力...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "キャンセル";
@@ -45,7 +45,7 @@
 "lo5-ei-wHM.title" = "ユーザー名";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Enter password..."; ObjectID = "nFA-uz-WjI"; */
-"nFA-uz-WjI.placeholderString" = "Enter password...";
+"nFA-uz-WjI.placeholderString" = "パスワードを入力...";
 
 /* Class = "NSTextFieldCell"; title = "Register a public username "; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register a public username ";
+"tje-EZ-ZPI.title" = "公開ユーザー名を登録";
diff --git a/ui/ja.lproj/RingWindow.strings b/ui/ja.lproj/RingWindow.strings
index b85bf3b7218472efc0730d480cd39921a2d6fc48..740d8576f370bc4558fbd69582dba43f41b2ac87 100644
--- a/ui/ja.lproj/RingWindow.strings
+++ b/ui/ja.lproj/RingWindow.strings
@@ -18,7 +18,7 @@
 "F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Accept Invitation"; ObjectID = "Fc5-KS-cim"; */
-"Fc5-KS-cim.ibShadowedToolTip" = "Accept Invitation";
+"Fc5-KS-cim.ibShadowedToolTip" = "招待を受け入れる";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Share account info"; ObjectID = "Oac-o7-2Ge"; */
 "Oac-o7-2Ge.ibShadowedToolTip" = "Share account info";
@@ -39,10 +39,10 @@
 "eVv-lu-T1Y.title" = "ボックス";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
-"eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
+"eXV-BT-B6J.ibShadowedToolTip" = "QRコードを表示";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Ignore invitation"; ObjectID = "ejM-H2-aJX"; */
-"ejM-H2-aJX.ibShadowedToolTip" = "Ignore invitation";
+"ejM-H2-aJX.ibShadowedToolTip" = "招待を無視する";
 
 /* 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は、世界中のユーザーと繋がることができるユーザーの自由とプライバシーを尊重したフリーソフトウェアです。";
@@ -57,4 +57,4 @@
 "vvE-nM-kSl.placeholderString" = "Search for new or existing contact";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Block contact"; ObjectID = "xP1-ZW-WZ8"; */
-"xP1-ZW-WZ8.ibShadowedToolTip" = "ブロックした連絡先";
+"xP1-ZW-WZ8.ibShadowedToolTip" = "連絡先をブロック";
diff --git a/ui/ja.lproj/RingWizardChoose.strings b/ui/ja.lproj/RingWizardChoose.strings
index 4a8db9639e24ccc734d112529c3efe329adb0da5..aec5375ec524c287fec421b5645ceeb20ee451c5 100644
--- a/ui/ja.lproj/RingWizardChoose.strings
+++ b/ui/ja.lproj/RingWizardChoose.strings
@@ -1,21 +1,21 @@
 
 /* Class = "NSButtonCell"; title = "Connect to account manager"; ObjectID = "HGQ-Kd-WIw"; */
-"HGQ-Kd-WIw.title" = "Connect to account manager";
+"HGQ-Kd-WIw.title" = "アカウントマネージャーに接続";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
 "YJ3-7G-cU1.title" = "キャンセル";
 
 /* Class = "NSButtonCell"; title = "Import from other device"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Import from other device";
+"Z9K-mD-ucr.title" = "別のデバイスからインポート";
 
 /* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
 "k1T-a7-yZD.title" = "Jamiアカウントを作成";
 
 /* Class = "NSButtonCell"; title = "Import from archive backup"; ObjectID = "rtw-Db-BWL"; */
-"rtw-Db-BWL.title" = "Import from archive backup";
+"rtw-Db-BWL.title" = "アーカイブバックアップからインポート";
 
 /* Class = "NSButtonCell"; title = "Advanced…"; ObjectID = "vCj-67-PGK"; */
-"vCj-67-PGK.title" = "Advanced…";
+"vCj-67-PGK.title" = "高度な設定…";
 
 /* Class = "NSButtonCell"; title = "Add a new SIP account"; ObjectID = "yBt-Bv-fi2"; */
-"yBt-Bv-fi2.title" = "Add a new SIP account";
+"yBt-Bv-fi2.title" = "新しくSIPアカウントを追加";
diff --git a/ui/ja.lproj/RingWizardLinkAccount.strings b/ui/ja.lproj/RingWizardLinkAccount.strings
index 83219a628f25adfadef6d5a82625e48a427eedc4..c9a58b972a5ca30db41d090fe9260f556a7f7302 100644
--- a/ui/ja.lproj/RingWizardLinkAccount.strings
+++ b/ui/ja.lproj/RingWizardLinkAccount.strings
@@ -33,7 +33,7 @@
 "XJE-cy-nfQ.title" = "Select file";
 
 /* 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.";
diff --git a/ui/ja.lproj/RingWizardNewAccount.strings b/ui/ja.lproj/RingWizardNewAccount.strings
index 9730b4333ceac59cbecc280fcace62afa26dec32..7e5407711f7cecb82ece9b7fe879dce18f806cb6 100644
--- a/ui/ja.lproj/RingWizardNewAccount.strings
+++ b/ui/ja.lproj/RingWizardNewAccount.strings
@@ -6,22 +6,22 @@
 "1TO-Ov-S8j.placeholderString" = "パスワード...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
-"93I-zf-xAk.ibShadowedIsNilPlaceholder" = "Repeat password...";
+"93I-zf-xAk.ibShadowedIsNilPlaceholder" = "パスワードの確認...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
-"93I-zf-xAk.ibShadowedMultipleValuesPlaceholder" = "Repeat password...";
+"93I-zf-xAk.ibShadowedMultipleValuesPlaceholder" = "パスワードの確認...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
-"93I-zf-xAk.ibShadowedNoSelectionPlaceholder" = "Repeat password...";
+"93I-zf-xAk.ibShadowedNoSelectionPlaceholder" = "パスワードの確認...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
-"93I-zf-xAk.ibShadowedNotApplicablePlaceholder" = "Repeat password...";
+"93I-zf-xAk.ibShadowedNotApplicablePlaceholder" = "パスワードの確認...";
 
 /* Class = "NSButtonCell"; title = "Register public username"; ObjectID = "AG5-GR-bii"; */
 "AG5-GR-bii.title" = "公開ユーザー名を登録";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Repeat password"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Repeat password";
+"BCg-5V-Ek4.placeholderString" = "パスワードの確認";
 
 /* Class = "NSButtonCell"; title = "Choose password for enhance security"; ObjectID = "Cnw-4p-3Uc"; */
 "Cnw-4p-3Uc.title" = "Choose password for enhance security";
diff --git a/ui/ko_KR.lproj/AccAdvancedRing.strings b/ui/ko_KR.lproj/AccAdvancedRing.strings
index eb9411406a8af7b0123db1a77b73cb4e44b5d299..c5be217527a514d653f7c237737b6e17b833245e 100644
--- a/ui/ko_KR.lproj/AccAdvancedRing.strings
+++ b/ui/ko_KR.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/ko_KR.lproj/Localizable.strings b/ui/ko_KR.lproj/Localizable.strings
index cf92e1e32a9c26bd33f8af5755bce2e9efd2cc37..3fe66e88f71fe13e053b85ea65bcfe152e0a0083 100644
--- a/ui/ko_KR.lproj/Localizable.strings
+++ b/ui/ko_KR.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "수락";
 
+/* Button Action */
+"Cancel" = "취소";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/lt.lproj/AccAdvancedRing.strings b/ui/lt.lproj/AccAdvancedRing.strings
index 6bcf445a2a42c76716a60a50d79d4d891f1358f4..5bb2c278882add0949e06ef3203237537d928ef3 100644
--- a/ui/lt.lproj/AccAdvancedRing.strings
+++ b/ui/lt.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/lt.lproj/Localizable.strings b/ui/lt.lproj/Localizable.strings
index 44017db2a9fc53cebd61f9f1c9cc88dcb1898b35..186c1f9412edff3366591279619cf606489ce1c3 100644
--- a/ui/lt.lproj/Localizable.strings
+++ b/ui/lt.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Priimti";
 
+/* Button Action */
+"Cancel" = "Atsisakyti";
+
 /* Welcome title */
 "Add a SIP account" = "Pridėti SIP paskyrą";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Pakeisti slaptažodį";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Atlikta";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Taisyti paskyrą";
+
diff --git a/ui/mr.lproj/PreferencesWindow.strings b/ui/mr.lproj/PreferencesWindow.strings
new file mode 100644
index 0000000000000000000000000000000000000000..8511750509590a554e207d0995cc30265df0fe07
--- /dev/null
+++ b/ui/mr.lproj/PreferencesWindow.strings
@@ -0,0 +1,27 @@
+
+/* Class = "NSWindow"; title = "Jami Preferences"; ObjectID = "C1T-wE-wxb"; */
+"C1T-wE-wxb.title" = "Jami Preferences";
+
+/* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.label" = "General";
+
+/* Class = "NSToolbarItem"; paletteLabel = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.paletteLabel" = "General";
+
+/* Class = "NSToolbarItem"; label = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.label" = "Advanced";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.paletteLabel" = "Advanced";
+
+/* Class = "NSToolbarItem"; label = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.label" = " \nऑडिओ";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.paletteLabel" = " \nऑडिओ";
+
+/* Class = "NSToolbarItem"; label = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.label" = "व्हिडिओ";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.paletteLabel" = "व्हिडिओ";
diff --git a/ui/mr.lproj/RingWindow.strings b/ui/mr.lproj/RingWindow.strings
new file mode 100644
index 0000000000000000000000000000000000000000..c681dfab93a5715f598201ed2f923cc22124526d
--- /dev/null
+++ b/ui/mr.lproj/RingWindow.strings
@@ -0,0 +1,60 @@
+
+/* Class = "NSTabViewItem"; label = "SmartView"; ObjectID = "0MO-4e-8mo"; */
+"0MO-4e-8mo.label" = "SmartView";
+
+/* Class = "NSSegmentedCell"; 6T7-ip-Pun.ibShadowedLabels[0] = "Conversations"; ObjectID = "6T7-ip-Pun"; */
+"6T7-ip-Pun.ibShadowedLabels[0]" = "Conversations";
+
+/* Class = "NSSegmentedCell"; 6T7-ip-Pun.ibShadowedLabels[1] = "Requests"; ObjectID = "6T7-ip-Pun"; */
+"6T7-ip-Pun.ibShadowedLabels[1]" = "Requests";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
+"Ap7-26-S6b.title" = "Text Cell";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "DPK-hh-Aq5"; */
+"DPK-hh-Aq5.title" = "Item 2";
+
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Accept Invitation"; ObjectID = "Fc5-KS-cim"; */
+"Fc5-KS-cim.ibShadowedToolTip" = "Accept Invitation";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Share account info"; ObjectID = "Oac-o7-2Ge"; */
+"Oac-o7-2Ge.ibShadowedToolTip" = "Share account info";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Oe5-Nj-cP3"; */
+"Oe5-Nj-cP3.title" = "Item 3";
+
+/* Class = "NSToolbarItem"; label = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.label" = "Toolbar Item";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.paletteLabel" = "Toolbar Item";
+
+/* Class = "NSTextFieldCell"; title = "This is your ID.\nCopy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID.\nCopy and share it with your friends!";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "eVv-lu-T1Y"; */
+"eVv-lu-T1Y.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
+"eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Ignore invitation"; ObjectID = "ejM-H2-aJX"; */
+"ejM-H2-aJX.ibShadowedToolTip" = "Ignore invitation";
+
+/* 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.";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
+"j0J-Xd-uth.placeholderString" = "Call name";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "mK5-kV-YOO"; */
+"mK5-kV-YOO.placeholderString" = "अधिक माहिती";
+
+/* Class = "NSSearchFieldCell"; placeholderString = "Search for new or existing contact"; ObjectID = "vvE-nM-kSl"; */
+"vvE-nM-kSl.placeholderString" = "Search for new or existing contact";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Block contact"; ObjectID = "xP1-ZW-WZ8"; */
+"xP1-ZW-WZ8.ibShadowedToolTip" = "Block contact";
diff --git a/ui/ms.lproj/AccAdvancedRing.strings b/ui/ms.lproj/AccAdvancedRing.strings
index 87eb0097c4db8d65d7c3ae4b94a8dc520785f07a..5d602a103183f03a16c33bf8fa05a03167eb3a84 100644
--- a/ui/ms.lproj/AccAdvancedRing.strings
+++ b/ui/ms.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/ms.lproj/Localizable.strings b/ui/ms.lproj/Localizable.strings
index feb27c7e52c3e0150195a802235db342b6f3b6d7..d18159eb574bdce7e9d9e243d2396362b5c8d1f2 100644
--- a/ui/ms.lproj/Localizable.strings
+++ b/ui/ms.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Terima";
 
+/* Button Action */
+"Cancel" = "Batal";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/nb.lproj/AccAdvancedRing.strings b/ui/nb.lproj/AccAdvancedRing.strings
index a372d46c7cf2327bbd50593191943ce12a1ee9ac..17a31a5d6f6ed5bde8b44d60f8d4411f73d2bb2b 100644
--- a/ui/nb.lproj/AccAdvancedRing.strings
+++ b/ui/nb.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Tillatt anrop fra klienter du ikke stoler på";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/nb.lproj/Localizable.strings b/ui/nb.lproj/Localizable.strings
index 7457cd11d9affd4a7ef6a28646b4afb3a71385f3..05903234fa6f2e4e9f8bc4147e7e77c22f81e48c 100644
--- a/ui/nb.lproj/Localizable.strings
+++ b/ui/nb.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Aksepter";
 
+/* Button Action */
+"Cancel" = "Avbryt";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Endre passord";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Ferdig";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Rediger konto";
+
diff --git a/ui/nl.lproj/AccAdvancedRing.strings b/ui/nl.lproj/AccAdvancedRing.strings
index 1ed8589ec32b3c673906c541b71704ad5572cc44..ab912bd8c0c1207322ca6ba18aca7bb2b4c87c7c 100644
--- a/ui/nl.lproj/AccAdvancedRing.strings
+++ b/ui/nl.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Oproepen van onvertrouwde gebruikers toestaan";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/nl.lproj/Localizable.strings b/ui/nl.lproj/Localizable.strings
index eb370ed6f4052e8c0bbdc61689cde5774be840ac..56106e14b408842ba2ab934d09076060ed4514d0 100644
--- a/ui/nl.lproj/Localizable.strings
+++ b/ui/nl.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accepteren";
 
+/* Button Action */
+"Cancel" = "Annuleren";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Wachtwoord wijzigen";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Klaar";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Account wijzigen";
+
diff --git a/ui/nl_BE.lproj/AccAdvancedRing.strings b/ui/nl_BE.lproj/AccAdvancedRing.strings
index 710e9172db94ab3b17e08ddb5e95175116538912..6b62f00c61e06b0f037d4f1351cb51d88ea5a5fb 100644
--- a/ui/nl_BE.lproj/AccAdvancedRing.strings
+++ b/ui/nl_BE.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Oproepen van onvertrouwde gebruikers toestaan";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/nl_BE.lproj/Localizable.strings b/ui/nl_BE.lproj/Localizable.strings
index 5065d8bfaadd3e562d687cb18e7341208d277357..5f995ae12d13a4a8e6f4e0cd8ef10682271f571f 100644
--- a/ui/nl_BE.lproj/Localizable.strings
+++ b/ui/nl_BE.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Aanvaarden";
 
+/* Button Action */
+"Cancel" = "Annuleren";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Paswoord wijzigen";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Klaar";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Account wijzigen";
+
diff --git a/ui/nl_NL.lproj/AccAdvancedRing.strings b/ui/nl_NL.lproj/AccAdvancedRing.strings
index d62ab8879f9b9d82e0dfbea3ec9475adbbd874d9..8a3b7d71b7a563e1e047cb099e6d36111032468e 100644
--- a/ui/nl_NL.lproj/AccAdvancedRing.strings
+++ b/ui/nl_NL.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/nl_NL.lproj/Localizable.strings b/ui/nl_NL.lproj/Localizable.strings
index b27cdeb796fb5b42c7eb835a536d8306567fe64c..034445adc67913902da74901ddd78a8443eac62c 100644
--- a/ui/nl_NL.lproj/Localizable.strings
+++ b/ui/nl_NL.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accept";
 
+/* Button Action */
+"Cancel" = "Cancel";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/oc.lproj/AccAdvancedRing.strings b/ui/oc.lproj/AccAdvancedRing.strings
new file mode 100644
index 0000000000000000000000000000000000000000..c848d9dbbbcfd4f0d0e0b6aae76be5835247da42
--- /dev/null
+++ b/ui/oc.lproj/AccAdvancedRing.strings
@@ -0,0 +1,105 @@
+
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
+
+/* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
+"25Q-c1-ld3.title" = "UPnP";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "538-we-FTp"; */
+"538-we-FTp.title" = "Box";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "7eU-EP-4br"; */
+"7eU-EP-4br.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "8mv-Ia-GM4"; */
+"8mv-Ia-GM4.title" = "TURN address";
+
+/* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "BIS-Ft-yJn"; */
+"BIS-Ft-yJn.title" = "Call settings";
+
+/* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "DSe-Cs-oD6"; */
+"DSe-Cs-oD6.title" = "Auto answer calls";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "EyV-Io-d3f"; */
+"EyV-Io-d3f.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Name server"; ObjectID = "ID3-Sv-gYY"; */
+"ID3-Sv-gYY.title" = "Name server";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "K0z-NH-3Cq"; */
+"K0z-NH-3Cq.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "User certificate"; ObjectID = "LWs-a2-E7f"; */
+"LWs-a2-E7f.title" = "User certificate";
+
+/* Class = "NSTextFieldCell"; title = "Audio codecs"; ObjectID = "Q4t-zo-brK"; */
+"Q4t-zo-brK.title" = "Audio codecs";
+
+/* Class = "NSTextFieldCell"; title = "Security"; ObjectID = "Qxp-I4-A7W"; */
+"Qxp-I4-A7W.title" = "Seguretat";
+
+/* Class = "NSButtonCell"; title = "Enable proxy"; ObjectID = "VyP-8T-aNA"; */
+"VyP-8T-aNA.title" = "Enable proxy";
+
+/* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "Wrh-zD-uh5"; */
+"Wrh-zD-uh5.title" = "Video codecs";
+
+/* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "XU0-bl-lDD"; */
+"XU0-bl-lDD.title" = "TURN realm";
+
+/* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "YE4-ry-u07"; */
+"YE4-ry-u07.title" = "STUN address";
+
+/* Class = "NSTextFieldCell"; title = "Bootstrap"; ObjectID = "YJM-iQ-0lE"; */
+"YJM-iQ-0lE.title" = "Bootstrap";
+
+/* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "YcX-lE-8ug"; */
+"YcX-lE-8ug.title" = "Private key password";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "Ywo-5x-8kh"; */
+"Ywo-5x-8kh.title" = "Box";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "ZNe-H0-dJk"; */
+"ZNe-H0-dJk.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "ZqB-gt-yFt"; */
+"ZqB-gt-yFt.title" = "Address";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "eGX-gk-Zxp"; */
+"eGX-gk-Zxp.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "eMG-uY-bpH"; */
+"eMG-uY-bpH.title" = "TURN username";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "g8T-u3-MS3"; */
+"g8T-u3-MS3.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "TURN password"; ObjectID = "gUl-Px-cIJ"; */
+"gUl-Px-cIJ.title" = "TURN password";
+
+/* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "k7i-pK-JXp"; */
+"k7i-pK-JXp.title" = "CA certificate";
+
+/* Class = "NSButtonCell"; title = "Use STUN"; ObjectID = "nqX-Vu-UuA"; */
+"nqX-Vu-UuA.title" = "Use STUN";
+
+/* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "qFq-Yh-2JL"; */
+"qFq-Yh-2JL.title" = "Custom ringtone";
+
+/* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "sVe-iG-OCw"; */
+"sVe-iG-OCw.title" = "Connectivitat";
+
+/* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "soR-nF-ybe"; */
+"soR-nF-ybe.title" = "Private key";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "sy5-OH-wyB"; */
+"sy5-OH-wyB.title" = "Box";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "vYi-gW-MrY"; */
+"vYi-gW-MrY.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "OpenDHT configuration"; ObjectID = "xJT-ij-69q"; */
+"xJT-ij-69q.title" = "OpenDHT configuration";
+
+/* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "zPJ-cO-neQ"; */
+"zPJ-cO-neQ.title" = "Use TURN";
diff --git a/ui/oc.lproj/AccAdvancedSip.strings b/ui/oc.lproj/AccAdvancedSip.strings
new file mode 100644
index 0000000000000000000000000000000000000000..5f993b3a7afe27e0cacf19354707100d11ffe699
--- /dev/null
+++ b/ui/oc.lproj/AccAdvancedSip.strings
@@ -0,0 +1,168 @@
+
+/* Class = "NSTextFieldCell"; title = "Min"; ObjectID = "0Fh-Sz-TMo"; */
+"0Fh-Sz-TMo.title" = "Min";
+
+/* Class = "NSTextFieldCell"; title = "Video RTP port Range"; ObjectID = "0cb-ib-oHd"; */
+"0cb-ib-oHd.title" = "Video RTP port Range";
+
+/* Class = "NSTextFieldCell"; title = "Security"; ObjectID = "24s-we-pkD"; */
+"24s-we-pkD.title" = "Seguretat";
+
+/* Class = "NSTextFieldCell"; title = "Registration expire timeout (seconds)"; ObjectID = "2rB-Bv-c9U"; */
+"2rB-Bv-c9U.title" = "Registration expire timeout (seconds)";
+
+/* Class = "NSTextFieldCell"; title = "Call settings"; ObjectID = "3Uq-Nb-J1A"; */
+"3Uq-Nb-J1A.title" = "Call settings";
+
+/* Class = "NSButtonCell"; title = "Fallback on RTP on encryption failure"; ObjectID = "3rM-KT-bNf"; */
+"3rM-KT-bNf.title" = "Fallback on RTP on encryption failure";
+
+/* Class = "NSButtonCell"; title = "Auto answer calls"; ObjectID = "3vs-TI-tkg"; */
+"3vs-TI-tkg.title" = "Auto answer calls";
+
+/* Class = "NSTextFieldCell"; title = "TURN realm"; ObjectID = "6eH-la-JbF"; */
+"6eH-la-JbF.title" = "TURN realm";
+
+/* Class = "NSTextFieldCell"; title = "Private key password"; ObjectID = "72p-GY-gu6"; */
+"72p-GY-gu6.title" = "Private key password";
+
+/* Class = "NSTextFieldCell"; title = "Outgoing TLS server name"; ObjectID = "8JD-11-wHZ"; */
+"8JD-11-wHZ.title" = "Outgoing TLS server name";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "8bw-iH-XGl"; */
+"8bw-iH-XGl.title" = "Item 1";
+
+/* Class = "NSTextFieldCell"; title = "Port"; ObjectID = "9p9-GR-XKU"; */
+"9p9-GR-XKU.title" = "Pòrt";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "A31-3Y-z4R"; */
+"A31-3Y-z4R.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "Published address"; ObjectID = "ELr-A7-mGE"; */
+"ELr-A7-mGE.title" = "Published address";
+
+/* Class = "NSButtonCell"; title = "Use TURN"; ObjectID = "Gwi-Mp-NpZ"; */
+"Gwi-Mp-NpZ.title" = "Use TURN";
+
+/* Class = "NSButtonCell"; title = "Use STUN"; ObjectID = "HRM-FR-1sH"; */
+"HRM-FR-1sH.title" = "Use STUN";
+
+/* Class = "NSTextFieldCell"; title = "STUN address"; ObjectID = "HYt-sW-yd0"; */
+"HYt-sW-yd0.title" = "STUN address";
+
+/* Class = "NSButtonCell"; title = "Require a certificate for incoming TLS connections"; ObjectID = "JV8-cY-6vR"; */
+"JV8-cY-6vR.title" = "Require a certificate for incoming TLS connections";
+
+/* Class = "NSTextFieldCell"; title = "SDP Session Negotiation (ICE Fallback)"; ObjectID = "Jfp-NE-ODd"; */
+"Jfp-NE-ODd.title" = "SDP Session Negotiation (ICE Fallback)";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "MBR-AC-HFq"; */
+"MBR-AC-HFq.title" = "Box";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Mho-w1-ZPJ"; */
+"Mho-w1-ZPJ.title" = "Item 3";
+
+/* Class = "NSButtonCell"; title = "Custom ringtone"; ObjectID = "Nqr-gj-dOH"; */
+"Nqr-gj-dOH.title" = "Custom ringtone";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "OEo-C7-vEh"; */
+"OEo-C7-vEh.title" = "Item 2";
+
+/* Class = "NSTextFieldCell"; title = "Audio RTP port Range"; ObjectID = "Ogj-NW-fZ9"; */
+"Ogj-NW-fZ9.title" = "Audio RTP port Range";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "Ppa-zn-w1X"; */
+"Ppa-zn-w1X.title" = "Box";
+
+/* Class = "NSButtonCell"; title = "Enable SDES for key exchange protocol"; ObjectID = "Qk8-tH-a0l"; */
+"Qk8-tH-a0l.title" = "Enable SDES for key exchange protocol";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "RIj-rT-gSd"; */
+"RIj-rT-gSd.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Audio codecs"; ObjectID = "Vke-hs-iXz"; */
+"Vke-hs-iXz.title" = "Audio codecs";
+
+/* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "W9F-Nf-ehp"; */
+"W9F-Nf-ehp.title" = "Private key";
+
+/* Class = "NSButtonCell"; title = "Verify answer certificates (client side)"; ObjectID = "WsS-1e-Epm"; */
+"WsS-1e-Epm.title" = "Verify answer certificates (client side)";
+
+/* Class = "NSTextFieldCell"; title = "User certificate"; ObjectID = "Xp3-bL-3Cs"; */
+"Xp3-bL-3Cs.title" = "User certificate";
+
+/* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "Xxr-gl-ukE"; */
+"Xxr-gl-ukE.title" = "Address";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "Zuz-jy-rLn"; */
+"Zuz-jy-rLn.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "TURN address"; ObjectID = "aYs-wh-Hpr"; */
+"aYs-wh-Hpr.title" = "TURN address";
+
+/* Class = "NSTextFieldCell"; title = "CA certificate"; ObjectID = "b2y-85-ZHK"; */
+"b2y-85-ZHK.title" = "CA certificate";
+
+/* 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";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "cwV-lc-jju"; */
+"cwV-lc-jju.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "Negotiation timeout (seconds)"; ObjectID = "dtf-uk-n1B"; */
+"dtf-uk-n1B.title" = "Negotiation timeout (seconds)";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "ekM-Cg-DEo"; */
+"ekM-Cg-DEo.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "Network interface"; ObjectID = "fjH-ej-gEr"; */
+"fjH-ej-gEr.title" = "Interfàcia ret";
+
+/* Class = "NSButtonCell"; title = "Verify incoming sertificates (server side)"; ObjectID = "fyT-bU-m54"; */
+"fyT-bU-m54.title" = "Verify incoming sertificates (server side)";
+
+/* Class = "NSTextFieldCell"; title = "Video codecs"; ObjectID = "gJs-aX-7Ox"; */
+"gJs-aX-7Ox.title" = "Video codecs";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "jgX-tQ-dIA"; */
+"jgX-tQ-dIA.title" = "Text Cell";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "l86-cH-pp8"; */
+"l86-cH-pp8.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "nh9-3y-CEI"; */
+"nh9-3y-CEI.title" = "Max";
+
+/* Class = "NSTextFieldCell"; title = "Min"; ObjectID = "nq0-Js-9Cr"; */
+"nq0-Js-9Cr.title" = "Min";
+
+/* Class = "NSButtonCell"; title = "Use custom address and port"; ObjectID = "nuq-Wl-sfd"; */
+"nuq-Wl-sfd.title" = "Use custom address and port";
+
+/* Class = "NSTextFieldCell"; title = "TURN username"; ObjectID = "rMN-Wf-tmp"; */
+"rMN-Wf-tmp.title" = "TURN username";
+
+/* Class = "NSButtonCell"; title = "Encrypt media streams(SRTP)"; ObjectID = "vCS-s8-mZI"; */
+"vCS-s8-mZI.title" = "Encrypt media streams(SRTP)";
+
+/* Class = "NSButtonCell"; title = "Encrypt negotiation (TLS)"; ObjectID = "vZH-42-mUi"; */
+"vZH-42-mUi.title" = "Encrypt negotiation (TLS)";
+
+/* Class = "NSTextFieldCell"; title = "Connectivity"; ObjectID = "vpo-fl-9TS"; */
+"vpo-fl-9TS.title" = "Connectivitat";
+
+/* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "wq6-KV-8X3"; */
+"wq6-KV-8X3.title" = "Max";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "wyZ-Hb-BNf"; */
+"wyZ-Hb-BNf.title" = "Box";
+
+/* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "x93-zk-hAW"; */
+"x93-zk-hAW.title" = "UPnP";
+
+/* Class = "NSTextFieldCell"; title = "TURN password"; ObjectID = "xjL-Wb-7VN"; */
+"xjL-Wb-7VN.title" = "TURN password";
+
+/* Class = "NSTextFieldCell"; title = "TLS protocol method"; ObjectID = "zBy-cW-KY3"; */
+"zBy-cW-KY3.title" = "TLS protocol method";
diff --git a/ui/oc.lproj/AccRingGeneral.strings b/ui/oc.lproj/AccRingGeneral.strings
new file mode 100644
index 0000000000000000000000000000000000000000..5ebb66b8a4bcf2897dd99366514c0192bee1a5da
--- /dev/null
+++ b/ui/oc.lproj/AccRingGeneral.strings
@@ -0,0 +1,60 @@
+
+/* Class = "NSButtonCell"; title = "Export Account"; ObjectID = "1aj-MG-mHp"; */
+"1aj-MG-mHp.title" = "Export Account";
+
+/* Class = "NSTextFieldCell"; title = "Banned Contacts"; ObjectID = "6fI-98-VvQ"; */
+"6fI-98-VvQ.title" = "Banned Contacts";
+
+/* Class = "NSButtonCell"; title = "Advanced"; ObjectID = "Hbq-nL-BhK"; */
+"Hbq-nL-BhK.title" = "Advanced";
+
+/* Class = "NSButtonCell"; title = "Enable"; ObjectID = "Op4-XO-WsE"; */
+"Op4-XO-WsE.title" = "Enable";
+
+/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "TYk-QK-iaT"; */
+"TYk-QK-iaT.title" = "Password:";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Edit name"; ObjectID = "WEo-a0-wVL"; */
+"WEo-a0-wVL.ibShadowedToolTip" = "Edit name";
+
+/* Class = "NSButtonCell"; title = "Remove Account"; ObjectID = "Yf6-8d-SNh"; */
+"Yf6-8d-SNh.title" = "Remove Account";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aQL-hX-CfA"; */
+"aQL-hX-CfA.title" = "Text Cell";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Unblock"; ObjectID = "bOY-mY-1Yo"; */
+"bOY-mY-1Yo.ibShadowedToolTip" = "Unblock";
+
+/* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "fPK-Zv-Uom"; */
+"fPK-Zv-Uom.title" = "Username:";
+
+/* Class = "NSButtonCell"; title = "Register"; ObjectID = "gLp-qz-XYs"; */
+"gLp-qz-XYs.title" = "Register";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "gTn-6p-Gtk"; */
+"gTn-6p-Gtk.title" = "Box";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "kt0-P6-fdQ"; */
+"kt0-P6-fdQ.placeholderString" = "Enter name";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Revoke"; ObjectID = "lrB-j5-Mvy"; */
+"lrB-j5-Mvy.ibShadowedToolTip" = "Revoke";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "oVO-wj-fwQ"; */
+"oVO-wj-fwQ.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "Linked devices"; ObjectID = "oga-WC-4gb"; */
+"oga-WC-4gb.title" = "Linked devices";
+
+/* Class = "NSTextFieldCell"; title = "Identifier:"; ObjectID = "qx7-i1-3Na"; */
+"qx7-i1-3Na.title" = "Identifier:";
+
+/* Class = "NSButtonCell"; title = "Link another device"; ObjectID = "tWk-Od-BEQ"; */
+"tWk-Od-BEQ.title" = "Link another device";
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "uLQ-MS-pZ7"; */
+"uLQ-MS-pZ7.title" = "Compte";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "yYf-Ei-lMG"; */
+"yYf-Ei-lMG.title" = "Text Cell";
diff --git a/ui/oc.lproj/AccSipGeneral.strings b/ui/oc.lproj/AccSipGeneral.strings
new file mode 100644
index 0000000000000000000000000000000000000000..a4bd9467280d5473ed2edf519bce1131d1b6dc02
--- /dev/null
+++ b/ui/oc.lproj/AccSipGeneral.strings
@@ -0,0 +1,39 @@
+
+/* Class = "NSTextFieldCell"; title = "Proxy"; ObjectID = "688-Sx-Gvr"; */
+"688-Sx-Gvr.title" = "Proxy";
+
+/* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Fj6-Q3-Gz3"; */
+"Fj6-Q3-Gz3.title" = "User Name";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "NlM-R9-ola"; */
+"NlM-R9-ola.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "Voicemail"; ObjectID = "R7s-DE-PiP"; */
+"R7s-DE-PiP.title" = "Voicemail";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YAG-qB-4wH"; */
+"YAG-qB-4wH.placeholderString" = "Enter name";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "Yof-e7-IBF"; */
+"Yof-e7-IBF.title" = "Senha";
+
+/* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ZKc-70-TFH"; */
+"ZKc-70-TFH.title" = "SIP Server";
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "eQt-bc-Eev"; */
+"eQt-bc-Eev.title" = "Compte";
+
+/* Class = "NSButtonCell"; title = "Advanced"; ObjectID = "iEr-fN-5vD"; */
+"iEr-fN-5vD.title" = "Advanced";
+
+/* Class = "NSButtonCell"; title = "Edit Account"; ObjectID = "jdU-uZ-Rfy"; */
+"jdU-uZ-Rfy.title" = "Edit Account";
+
+/* Class = "NSButtonCell"; title = "enable"; ObjectID = "nW8-pd-fNj"; */
+"nW8-pd-fNj.title" = "enable";
+
+/* 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";
diff --git a/ui/oc.lproj/AccountBackupVC.strings b/ui/oc.lproj/AccountBackupVC.strings
new file mode 100644
index 0000000000000000000000000000000000000000..ceeed4382dae6f31cd97bc1ffb81a65917dfe30c
--- /dev/null
+++ b/ui/oc.lproj/AccountBackupVC.strings
@@ -0,0 +1,18 @@
+
+/* Class = "NSButtonCell"; title = "Skip"; ObjectID = "73h-fa-4yX"; */
+"73h-fa-4yX.title" = "Saultar";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during the backup. Please check your credentials."; ObjectID = "7lU-Qy-WOb"; */
+"7lU-Qy-WOb.title" = "An error occured during the backup. Please check your credentials.";
+
+/* Class = "NSButtonCell"; title = "Never show me this again"; ObjectID = "PVF-bb-Yoi"; */
+"PVF-bb-Yoi.title" = "Never show me this again";
+
+/* Class = "NSTextFieldCell"; title = "This account only exists on this device. If you lost your device or uninstall the application, your account will be deleted. You can backup your account now or later."; ObjectID = "SUG-lC-TDL"; */
+"SUG-lC-TDL.title" = "This account only exists on this device. If you lost your device or uninstall the application, your account will be deleted. You can backup your account now or later.";
+
+/* Class = "NSButtonCell"; title = "Export account"; ObjectID = "cod-s7-SPd"; */
+"cod-s7-SPd.title" = "Export account";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "ruw-Kp-tCz"; */
+"ruw-Kp-tCz.title" = "OK";
diff --git a/ui/oc.lproj/AddSIPAccountVC.strings b/ui/oc.lproj/AddSIPAccountVC.strings
new file mode 100644
index 0000000000000000000000000000000000000000..0f29b6332457d47f003e2cf338013034878f1e04
--- /dev/null
+++ b/ui/oc.lproj/AddSIPAccountVC.strings
@@ -0,0 +1,33 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter SIP address"; ObjectID = "0UI-j5-0at"; */
+"0UI-j5-0at.placeholderString" = "Enter SIP address";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "Aem-zQ-Ya3"; */
+"Aem-zQ-Ya3.title" = "Senha";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter password"; ObjectID = "DBU-zJ-vj6"; */
+"DBU-zJ-vj6.placeholderString" = "Enter password";
+
+/* Class = "NSButtonCell"; title = "Done"; ObjectID = "DJz-do-CJo"; */
+"DJz-do-CJo.title" = "Done";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "O1S-KI-2LG"; */
+"O1S-KI-2LG.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter username"; ObjectID = "Rej-Yd-PDb"; */
+"Rej-Yd-PDb.placeholderString" = "Enter username";
+
+/* Class = "NSTextFieldCell"; title = "User Name"; ObjectID = "Srm-hv-9WR"; */
+"Srm-hv-9WR.title" = "User Name";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "YeS-R8-ZLT"; */
+"YeS-R8-ZLT.placeholderString" = "Enter name";
+
+/* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "fgN-nq-QdO"; */
+"fgN-nq-QdO.title" = "Perfil";
+
+/* Class = "NSTextFieldCell"; title = "SIP Server"; ObjectID = "ubR-HD-O15"; */
+"ubR-HD-O15.title" = "SIP Server";
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "zAN-HT-1oE"; */
+"zAN-HT-1oE.title" = "Compte";
diff --git a/ui/oc.lproj/Conversation.strings b/ui/oc.lproj/Conversation.strings
new file mode 100644
index 0000000000000000000000000000000000000000..f7e81585da335b5ff5707627e73225a21eab4b6b
--- /dev/null
+++ b/ui/oc.lproj/Conversation.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSButtonCell"; title = "🙂"; ObjectID = "8sX-aI-9OG"; */
+"8sX-aI-9OG.title" = "🙂";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record a video message"; ObjectID = "B6d-Sc-UTp"; */
+"B6d-Sc-UTp.ibShadowedToolTip" = "Record a video message";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FgV-iF-gGQ"; */
+"FgV-iF-gGQ.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "Ilz-7v-2fr"; */
+"Ilz-7v-2fr.placeholderString" = "Send a message";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Start audio call"; ObjectID = "RuH-fO-poy"; */
+"RuH-fO-poy.ibShadowedToolTip" = "Start audio call";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "UJf-cF-RAo"; */
+"UJf-cF-RAo.ibShadowedToolTip" = "Enviar";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Start video call"; ObjectID = "cFH-d7-Erh"; */
+"cFH-d7-Erh.ibShadowedToolTip" = "Start video call";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "ciI-CA-tly"; */
+"ciI-CA-tly.title" = "Box";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "fh9-Uo-8R1"; */
+"fh9-Uo-8R1.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "gwx-eT-PcN"; */
+"gwx-eT-PcN.ibShadowedToolTip" = "Send a file";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "hrX-ac-Quk"; */
+"hrX-ac-Quk.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Back"; ObjectID = "ooq-vs-Xt1"; */
+"ooq-vs-Xt1.ibShadowedToolTip" = "Back";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add contact"; ObjectID = "pGK-hO-X1Y"; */
+"pGK-hO-X1Y.ibShadowedToolTip" = "Add contact";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "pRL-vb-me9"; */
+"pRL-vb-me9.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record an audio message"; ObjectID = "wYE-S3-AzD"; */
+"wYE-S3-AzD.ibShadowedToolTip" = "Record an audio message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
+"zK1-Ee-EWS.ibShadowedIsNilPlaceholder" = "Send a message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
+"zK1-Ee-EWS.ibShadowedMultipleValuesPlaceholder" = "Send a message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
+"zK1-Ee-EWS.ibShadowedNoSelectionPlaceholder" = "Send a message";
diff --git a/ui/oc.lproj/CurrentCall.strings b/ui/oc.lproj/CurrentCall.strings
new file mode 100644
index 0000000000000000000000000000000000000000..dcdf3091cc5add0789750d5decfd509b0857e2f1
--- /dev/null
+++ b/ui/oc.lproj/CurrentCall.strings
@@ -0,0 +1,72 @@
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "2cB-dz-KYg"; */
+"2cB-dz-KYg.ibShadowedToolTip" = "Hang up";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "4xt-xs-LVn"; */
+"4xt-xs-LVn.title" = "Box";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "DSf-SJ-l6k"; */
+"DSf-SJ-l6k.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
+"GBy-HF-JeP.title" = "Label";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
+"KCp-bZ-69S.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "Kjq-iM-NBL"; */
+"Kjq-iM-NBL.ibShadowedToolTip" = "Hang up";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Mute Video"; ObjectID = "LVS-yZ-98V"; */
+"LVS-yZ-98V.ibShadowedToolTip" = "Mute Video";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedMultipleValuesPlaceholder" = "Send a message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedNoSelectionPlaceholder" = "Send a message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedNotApplicablePlaceholder" = "Send a message";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "QYT-0n-4sw"; */
+"QYT-0n-4sw.ibShadowedToolTip" = "Record";
+
+/* Class = "NSButton"; ibShadowedToolTip = "add contact to call"; ObjectID = "Vhk-fx-6RW"; */
+"Vhk-fx-6RW.ibShadowedToolTip" = "add contact to call";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "YGj-SP-ikj"; */
+"YGj-SP-ikj.title" = "Text Cell";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Hold"; ObjectID = "anb-Y8-JQi"; */
+"anb-Y8-JQi.ibShadowedToolTip" = "Hold";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "d4g-hS-EMn"; */
+"d4g-hS-EMn.placeholderString" = "Send a message";
+
+/* Class = "NSTextFieldCell"; placeholderString = "State"; ObjectID = "dPt-JY-yxV"; */
+"dPt-JY-yxV.placeholderString" = "State";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
+"fmp-x4-Pef.ibShadowedToolTip" = "Toggle chat";
+
+/* Class = "NSTextFieldCell"; title = "person Id"; ObjectID = "hKi-Ay-ex5"; */
+"hKi-Ay-ex5.title" = "person Id";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "hfc-s5-yWK"; */
+"hfc-s5-yWK.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "ngO-WV-cXD"; */
+"ngO-WV-cXD.ibShadowedToolTip" = "Send a file";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
+"qgD-3D-nD5.ibShadowedToolTip" = "Pick up";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "rqa-be-VIB"; */
+"rqa-be-VIB.ibShadowedToolTip" = "Enviar";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Mute Audio"; ObjectID = "tQl-cT-0Lb"; */
+"tQl-cT-0Lb.ibShadowedToolTip" = "Mute Audio";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "ues-20-34k"; */
+"ues-20-34k.placeholderString" = "Person name";
diff --git a/ui/oc.lproj/ExportPasswordWindow.strings b/ui/oc.lproj/ExportPasswordWindow.strings
new file mode 100644
index 0000000000000000000000000000000000000000..031a585d6cf6df0d11699a3470c7111f9a675749
--- /dev/null
+++ b/ui/oc.lproj/ExportPasswordWindow.strings
@@ -0,0 +1,42 @@
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
+
+/* Class = "NSTextFieldCell"; title = "Please provide your password to start"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "Please provide your password to start";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "OK";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
+"cSU-aD-OwX.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "dfD-AK-f3R"; */
+"dfD-AK-f3R.title" = "OK";
+
+/* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.placeholderString" = "error label";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "OK";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "Senha";
+
+/* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
+"wmv-sA-Mlh.title" = "Link another device to this account";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "Password...";
diff --git a/ui/oc.lproj/GeneralPrefs.strings b/ui/oc.lproj/GeneralPrefs.strings
new file mode 100644
index 0000000000000000000000000000000000000000..e2ee107046060b090addb3bed2b05df5c4618f0a
--- /dev/null
+++ b/ui/oc.lproj/GeneralPrefs.strings
@@ -0,0 +1,66 @@
+
+/* Class = "NSButtonCell"; title = "Enable notifications for incoming messages"; ObjectID = "0jV-Q4-232"; */
+"0jV-Q4-232.title" = "Enable notifications for incoming messages";
+
+/* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
+"42E-UY-qlP.title" = "Monthly";
+
+/* Class = "NSTextFieldCell"; title = "Download folder"; ObjectID = "6Ye-pe-9WV"; */
+"6Ye-pe-9WV.title" = "Download folder";
+
+/* Class = "NSButtonCell"; title = "Always record calls"; ObjectID = "6zp-rh-brb"; */
+"6zp-rh-brb.title" = "Always record calls";
+
+/* Class = "NSTextFieldCell"; title = "System"; ObjectID = "8xm-Tc-NMN"; */
+"8xm-Tc-NMN.title" = "Sistèma";
+
+/* Class = "NSTextFieldCell"; title = "  0"; ObjectID = "9sg-PF-ffw"; */
+"9sg-PF-ffw.title" = "  0";
+
+/* Class = "NSMenuItem"; title = "Weekly"; ObjectID = "AId-am-73Q"; */
+"AId-am-73Q.title" = "Weekly";
+
+/* Class = "NSTextFieldCell"; title = "Quality(Kbps)"; ObjectID = "AOr-Cq-w57"; */
+"AOr-Cq-w57.title" = "Quality(Kbps)";
+
+/* Class = "NSTextFieldCell"; title = "Notifications"; ObjectID = "I0d-mx-KhT"; */
+"I0d-mx-KhT.title" = "Notifications";
+
+/* Class = "NSTextFieldCell"; title = "6000"; ObjectID = "JGj-TS-Hxl"; */
+"JGj-TS-Hxl.title" = "6000";
+
+/* Class = "NSButtonCell"; title = "Enable notifications for invitations"; ObjectID = "Lww-Wb-yrf"; */
+"Lww-Wb-yrf.title" = "Enable notifications for invitations";
+
+/* Class = "NSButtonCell"; title = "Launch on Startup"; ObjectID = "O2C-xR-mHF"; */
+"O2C-xR-mHF.title" = "Launch on Startup";
+
+/* Class = "NSTextFieldCell"; title = "Call recording"; ObjectID = "Qb8-tb-vJd"; */
+"Qb8-tb-vJd.title" = "Call recording";
+
+/* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
+"T3a-yx-ZaW.title" = "Automatically check for updates";
+
+/* Class = "NSTextFieldCell"; title = "Conversations"; ObjectID = "ZCU-sa-SEk"; */
+"ZCU-sa-SEk.title" = "Discutidas";
+
+/* Class = "NSMenuItem"; title = "Daily"; ObjectID = "cB6-4m-9MU"; */
+"cB6-4m-9MU.title" = "Daily";
+
+/* Class = "NSTextFieldCell"; title = "Record folder"; ObjectID = "ep4-QU-rGl"; */
+"ep4-QU-rGl.title" = "Record folder";
+
+/* Class = "NSMenuItem"; title = "Hourly"; ObjectID = "mbu-TH-bs8"; */
+"mbu-TH-bs8.title" = "Hourly";
+
+/* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
+"r4u-t3-gBc.title" = "Update";
+
+/* Class = "NSButtonCell"; title = "Enable notifications for incoming calls"; ObjectID = "uCL-ye-tsv"; */
+"uCL-ye-tsv.title" = "Enable notifications for incoming calls";
+
+/* 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";
+
+/* Class = "NSButtonCell"; title = "Record local video"; ObjectID = "y5x-4d-E26"; */
+"y5x-4d-E26.title" = "Record local video";
diff --git a/ui/oc.lproj/Localizable.strings b/ui/oc.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..d60bba967ea0bc0a11e2b1f7508abe44baadc2b9
--- /dev/null
+++ b/ui/oc.lproj/Localizable.strings
@@ -0,0 +1,210 @@
+
+"A network error occured during the export" = "A network error occured during the export";
+
+/* Button Action */
+"Accept" = "Acceptar";
+
+/* Button Action */
+"Cancel" = "Cancel";
+
+/* Welcome title */
+"Add a SIP account" = "Add a SIP account";
+
+/* Contextual menu action */
+"Add to contacts" = "Add to contacts";
+
+/* Backup error */
+"An error occured during the backup" = "An error occured during the backup";
+
+/* Error shown to the user */
+"An error occured during the export" = "An error occured during the export";
+
+/* Peer busy message */
+"appears to be busy." = "appears to be busy.";
+
+/* Error audio permission */
+"Audio permission not granted" = "Audio permission not granted";
+
+/* Backup account */
+"Backup your account" = "Backup your account";
+
+/* Contextual menu action */
+"Block contact" = "Blocar contacte";
+
+/* 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.";
+
+/* File transfer canceled label */
+"Canceled" = "Canceled";
+
+/* Contextual menu entry */
+"Choose file" = "Choose file";
+
+/* Contextual menu action */
+"Clear conversation" = "Clear conversation";
+
+/* No comment provided by engineer. */
+"Copy" = "Copy";
+
+/* Recording view explanation label */
+"Could not record message during call" = "Could not record message during call";
+
+/* Welcome title */
+"Create a new account" = "Create a new account";
+
+/* Backup enter password */
+"Enter account password" = "Enter account password";
+
+/* File transfer failed label */
+"Failed" = "Failed";
+
+/* Error message shown to user when it is impossible to migrate account */
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+
+/* Text shown to user when an error occur at registration */
+"Failed to perform lookup" = "Failed to perform lookup";
+
+/* Text shown to the user */
+"ID: " = "ID: ";
+
+/* link account title */
+"Import from backup" = "Import from backup";
+
+/* link account title */
+"Import from other device" = "Import from other device";
+
+/* Incoming call from {Name} */
+"Incoming call from %@" = "Incoming call from %@";
+
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
+/* Text shown to user when his username is invalid to be registered */
+"Invalid username" = "Invalid username";
+
+/* Text shown to user when his username is invalid to be registered */
+"Invalid username." = "Invalid username.";
+
+/* Allert message when no accounts are available */
+"Navigate to preferences to create a new account" = "Navigate to preferences to create a new account";
+
+/* Displayed as RingID when no accounts are available for selection */
+"No account available" = "No account available";
+
+/* Text show to the user when password didn't match */
+"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+
+/* Indication for user */
+"Password is too short" = "Password is too short";
+
+/* Indication for user */
+"Passwords don't match" = "Passwords don't match";
+
+/* Contextual menu action */
+"Place audio call" = "Place audio call";
+
+/* Contextual menu action */
+"Place video call" = "Place video call";
+
+/* Recording view explanation label */
+"Press to start recording" = "Press to start recording";
+
+/* Record message title */
+"Record a message" = "Record a message";
+
+/* Button Action */
+"Refuse" = "Refusar";
+
+/* Text shown to the user */
+"Registered name: " = "Registered name: ";
+
+/* Remove account alert title */
+"Remove account" = "Remove account";
+
+/* export account button title */
+"Select archive" = "Select archive";
+
+/* Send button title */
+"Send" = "Enviar";
+
+/* Notification message */
+"Send you a contact request" = "Send you a contact request";
+
+/* No comment provided by engineer. */
+"Share" = "Share";
+
+/* Contextual menu entry */
+"Share screen" = "Share screen";
+
+/* Sign In */
+"Sign In" = "Sign In";
+
+/* Record message title */
+"Stop recording" = "Stop recording";
+
+/* File transfer successful label */
+"Success" = "Success";
+
+/* No comment provided by engineer. */
+"Text Actions" = "Text Actions";
+
+/* Text shown to user when his username is available to be registered */
+"The entered username is available" = "The entered username is available";
+
+/* Text shown to user when his username is already registered */
+"The entered username is not available" = "The entered username is not available";
+
+/* Error shown to the user */
+"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+
+/* Text shown to the user */
+"This account needs to be migrated" = "This account needs to be migrated";
+
+/* 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!";
+
+/* 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!";
+
+/* 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.";
+
+/* Text shown to the user */
+"To proceed with the migration, you need to enter a password that was used for this account." = "To proceed with the migration, you need to enter a password that was used for this account.";
+
+/* File transfer peer unjoinable label */
+"Unjoinable" = "Unjoinable";
+
+/* Error video permission */
+"Video permission not granted" = "Video permission not granted";
+
+/* Welcome title */
+"Welcome to Jami" = "Welcome to Jami";
+
+/* Peer busy message */
+"Would you like to leave a message?" = "Would you like to leave a message?";
+
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/oc.lproj/MessageCells.strings b/ui/oc.lproj/MessageCells.strings
new file mode 100644
index 0000000000000000000000000000000000000000..29be1577639fb00899064081c0148bb52ec0a036
--- /dev/null
+++ b/ui/oc.lproj/MessageCells.strings
@@ -0,0 +1,42 @@
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "1c6-BK-hfV"; */
+"1c6-BK-hfV.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "3i8-bi-EQN"; */
+"3i8-bi-EQN.title" = "Round Rect";
+
+/* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "8CE-a4-Ayu"; */
+"8CE-a4-Ayu.title" = "Round Rect";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "9Oq-TB-quZ"; */
+"9Oq-TB-quZ.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "DmW-13-1QZ"; */
+"DmW-13-1QZ.title" = "Round Rect";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "EAm-7Z-ubs"; */
+"EAm-7Z-ubs.title" = "Box";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "Ko5-2g-foK"; */
+"Ko5-2g-foK.title" = "Box";
+
+/* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "Oo1-gq-aPY"; */
+"Oo1-gq-aPY.title" = "Round Rect";
+
+/* Class = "NSButtonCell"; title = "Refuse"; ObjectID = "QGs-MO-mVi"; */
+"QGs-MO-mVi.title" = "Refusar";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "dDX-sZ-ylI"; */
+"dDX-sZ-ylI.title" = "Box";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "e0e-TK-qch"; */
+"e0e-TK-qch.title" = "Box";
+
+/* Class = "NSButtonCell"; title = "Round Rect"; ObjectID = "fu2-X7-GW8"; */
+"fu2-X7-GW8.title" = "Round Rect";
+
+/* Class = "NSButtonCell"; title = "Accept"; ObjectID = "tBq-Qe-bEm"; */
+"tBq-Qe-bEm.title" = "Acceptar";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "x2B-gu-YBe"; */
+"x2B-gu-YBe.title" = "Box";
diff --git a/ui/oc.lproj/MigrateRingAccountsWindow.strings b/ui/oc.lproj/MigrateRingAccountsWindow.strings
new file mode 100644
index 0000000000000000000000000000000000000000..d4a5fe9cede26acba86321709694f2311a7b262d
--- /dev/null
+++ b/ui/oc.lproj/MigrateRingAccountsWindow.strings
@@ -0,0 +1,51 @@
+
+/* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
+"1ob-x1-u74.title" = "Account migration completed";
+
+/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "RingID";
+
+/* Class = "NSTextFieldCell"; title = "To proceed with the migration, you need to enter a password that was used for this account."; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "To proceed with the migration, you need to enter a password that was used for this account.";
+
+/* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
+"8K3-9Z-MKH.title" = "Account migration error";
+
+/* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
+"C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
+
+/* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
+"ITE-yD-CTb.title" = "Delete this account";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
+"KuO-oT-zhY.placeholderString" = "Confirm your new password...";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
+"PT7-XI-WDR.title" = "OK";
+
+/* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "QkU-T8-Xi6"; */
+"QkU-T8-Xi6.title" = "Delete this account";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "OK";
+
+/* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
+"aOa-1q-AZe.title" = "Confirmation";
+
+/* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.placeholderString" = "error label";
+
+/* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "Migrate";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "Senha";
+
+/* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
+"wmv-sA-Mlh.title" = "Account migration required";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "Password...";
diff --git a/ui/oc.lproj/PasswordChange.strings b/ui/oc.lproj/PasswordChange.strings
new file mode 100644
index 0000000000000000000000000000000000000000..99929dc03f2fe1b32cff87505bea565491572005
--- /dev/null
+++ b/ui/oc.lproj/PasswordChange.strings
@@ -0,0 +1,30 @@
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat a new password"; ObjectID = "1Bs-Te-34p"; */
+"1Bs-Te-34p.placeholderString" = "Repeat a new password";
+
+/* Class = "NSTextFieldCell"; title = "Change Password"; ObjectID = "4Uf-yO-9X8"; */
+"4Uf-yO-9X8.title" = "Change Password";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter a new password"; ObjectID = "4aD-Xd-zHS"; */
+"4aD-Xd-zHS.placeholderString" = "Enter a new password";
+
+/* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
+"8KO-IO-ykP.title" = "Repeat";
+
+/* Class = "NSButtonCell"; title = "Accept"; ObjectID = "Ggu-EQ-cqC"; */
+"Ggu-EQ-cqC.title" = "Acceptar";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter your old password"; ObjectID = "Kwp-mD-Y94"; */
+"Kwp-mD-Y94.placeholderString" = "Enter your old password";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "MZw-ep-8aW"; */
+"MZw-ep-8aW.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "Password is incorrect"; ObjectID = "WyU-Dx-U1u"; */
+"WyU-Dx-U1u.title" = "Password is incorrect";
+
+/* Class = "NSTextFieldCell"; title = "Old password"; ObjectID = "gPw-Jf-0M7"; */
+"gPw-Jf-0M7.title" = "Old password";
+
+/* Class = "NSTextFieldCell"; title = "New password"; ObjectID = "pZe-DO-jWp"; */
+"pZe-DO-jWp.title" = "New password";
diff --git a/ui/oc.lproj/PreferencesWindow.strings b/ui/oc.lproj/PreferencesWindow.strings
new file mode 100644
index 0000000000000000000000000000000000000000..511e6afe85f6cde22851ee560d08bda3a8357015
--- /dev/null
+++ b/ui/oc.lproj/PreferencesWindow.strings
@@ -0,0 +1,27 @@
+
+/* Class = "NSWindow"; title = "Jami Preferences"; ObjectID = "C1T-wE-wxb"; */
+"C1T-wE-wxb.title" = "Jami Preferences";
+
+/* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.label" = "General";
+
+/* Class = "NSToolbarItem"; paletteLabel = "General"; ObjectID = "GQi-nL-0Ey"; */
+"GQi-nL-0Ey.paletteLabel" = "General";
+
+/* Class = "NSToolbarItem"; label = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.label" = "Advanced";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Advanced"; ObjectID = "Qza-fj-d45"; */
+"Qza-fj-d45.paletteLabel" = "Advanced";
+
+/* Class = "NSToolbarItem"; label = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.label" = "Audio";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Audio"; ObjectID = "iuJ-eu-b7f"; */
+"iuJ-eu-b7f.paletteLabel" = "Audio";
+
+/* Class = "NSToolbarItem"; label = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.label" = "Video";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Video"; ObjectID = "jLi-an-TR2"; */
+"jLi-an-TR2.paletteLabel" = "Video";
diff --git a/ui/oc.lproj/RegisterNameWindow.strings b/ui/oc.lproj/RegisterNameWindow.strings
new file mode 100644
index 0000000000000000000000000000000000000000..a3aa110826a083c3588dcc71439ce7e6b41b00f9
--- /dev/null
+++ b/ui/oc.lproj/RegisterNameWindow.strings
@@ -0,0 +1,51 @@
+
+/* 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";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
+"Aeh-tK-RjX.title" = "An error occured during your username registration";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
+"JWw-7m-ywL.title" = "Window";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedIsNilPlaceholder" = "Enter password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedMultipleValuesPlaceholder" = "Enter password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedNoSelectionPlaceholder" = "Enter password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Enter password..."; ObjectID = "JkL-9W-ex1"; */
+"JkL-9W-ex1.ibShadowedNotApplicablePlaceholder" = "Enter password...";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
+"YIN-YL-JBs.title" = "Just a moment...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "Enter username...";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
+"cbA-c2-LlV.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "egF-LJ-khJ"; */
+"egF-LJ-khJ.title" = "Senha";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "eoS-s7-b3w"; */
+"eoS-s7-b3w.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Ok"; ObjectID = "fOn-FV-2x8"; */
+"fOn-FV-2x8.title" = "Ok";
+
+/* Class = "NSButtonCell"; title = "Register"; ObjectID = "lT3-Bh-MnL"; */
+"lT3-Bh-MnL.title" = "Register";
+
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "lo5-ei-wHM"; */
+"lo5-ei-wHM.title" = "Username";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter password..."; ObjectID = "nFA-uz-WjI"; */
+"nFA-uz-WjI.placeholderString" = "Enter password...";
+
+/* Class = "NSTextFieldCell"; title = "Register a public username "; ObjectID = "tje-EZ-ZPI"; */
+"tje-EZ-ZPI.title" = "Register a public username ";
diff --git a/ui/oc.lproj/RingWindow.strings b/ui/oc.lproj/RingWindow.strings
new file mode 100644
index 0000000000000000000000000000000000000000..22c7d1deca26b11f43d0c61fca77bc48cc4436bd
--- /dev/null
+++ b/ui/oc.lproj/RingWindow.strings
@@ -0,0 +1,60 @@
+
+/* Class = "NSTabViewItem"; label = "SmartView"; ObjectID = "0MO-4e-8mo"; */
+"0MO-4e-8mo.label" = "SmartView";
+
+/* Class = "NSSegmentedCell"; 6T7-ip-Pun.ibShadowedLabels[0] = "Conversations"; ObjectID = "6T7-ip-Pun"; */
+"6T7-ip-Pun.ibShadowedLabels[0]" = "Discutidas";
+
+/* Class = "NSSegmentedCell"; 6T7-ip-Pun.ibShadowedLabels[1] = "Requests"; ObjectID = "6T7-ip-Pun"; */
+"6T7-ip-Pun.ibShadowedLabels[1]" = "Requests";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
+"Ap7-26-S6b.title" = "Text Cell";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "DPK-hh-Aq5"; */
+"DPK-hh-Aq5.title" = "Item 2";
+
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Accept Invitation"; ObjectID = "Fc5-KS-cim"; */
+"Fc5-KS-cim.ibShadowedToolTip" = "Accept Invitation";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Share account info"; ObjectID = "Oac-o7-2Ge"; */
+"Oac-o7-2Ge.ibShadowedToolTip" = "Share account info";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Oe5-Nj-cP3"; */
+"Oe5-Nj-cP3.title" = "Item 3";
+
+/* Class = "NSToolbarItem"; label = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.label" = "Toolbar Item";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.paletteLabel" = "Toolbar Item";
+
+/* Class = "NSTextFieldCell"; title = "This is your ID.\nCopy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID.\nCopy and share it with your friends!";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "eVv-lu-T1Y"; */
+"eVv-lu-T1Y.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
+"eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Ignore invitation"; ObjectID = "ejM-H2-aJX"; */
+"ejM-H2-aJX.ibShadowedToolTip" = "Ignore invitation";
+
+/* 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.";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
+"j0J-Xd-uth.placeholderString" = "Call name";
+
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "mK5-kV-YOO"; */
+"mK5-kV-YOO.placeholderString" = "details";
+
+/* Class = "NSSearchFieldCell"; placeholderString = "Search for new or existing contact"; ObjectID = "vvE-nM-kSl"; */
+"vvE-nM-kSl.placeholderString" = "Search for new or existing contact";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Block contact"; ObjectID = "xP1-ZW-WZ8"; */
+"xP1-ZW-WZ8.ibShadowedToolTip" = "Blocar contacte";
diff --git a/ui/oc.lproj/RingWizardChoose.strings b/ui/oc.lproj/RingWizardChoose.strings
new file mode 100644
index 0000000000000000000000000000000000000000..365b26f70262c0b31c92533f828c80c35cfd8238
--- /dev/null
+++ b/ui/oc.lproj/RingWizardChoose.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSButtonCell"; title = "Connect to account manager"; ObjectID = "HGQ-Kd-WIw"; */
+"HGQ-Kd-WIw.title" = "Connect to account manager";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
+"YJ3-7G-cU1.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Import from other device"; ObjectID = "Z9K-mD-ucr"; */
+"Z9K-mD-ucr.title" = "Import from other device";
+
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
+
+/* Class = "NSButtonCell"; title = "Import from archive backup"; ObjectID = "rtw-Db-BWL"; */
+"rtw-Db-BWL.title" = "Import from archive backup";
+
+/* Class = "NSButtonCell"; title = "Advanced…"; ObjectID = "vCj-67-PGK"; */
+"vCj-67-PGK.title" = "Avançat…";
+
+/* Class = "NSButtonCell"; title = "Add a new SIP account"; ObjectID = "yBt-Bv-fi2"; */
+"yBt-Bv-fi2.title" = "Add a new SIP account";
diff --git a/ui/oc.lproj/RingWizardLinkAccount.strings b/ui/oc.lproj/RingWizardLinkAccount.strings
new file mode 100644
index 0000000000000000000000000000000000000000..db1e4eb2f703a542466a82d4fb8708a09c31a683
--- /dev/null
+++ b/ui/oc.lproj/RingWizardLinkAccount.strings
@@ -0,0 +1,57 @@
+
+/* 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.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
+
+/* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
+"DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "WlR-QM-tK4"; */
+"WlR-QM-tK4.ibShadowedIsNilPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "WlR-QM-tK4"; */
+"WlR-QM-tK4.ibShadowedMultipleValuesPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "WlR-QM-tK4"; */
+"WlR-QM-tK4.ibShadowedNoSelectionPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "WlR-QM-tK4"; */
+"WlR-QM-tK4.ibShadowedNotApplicablePlaceholder" = "Password...";
+
+/* Class = "NSButtonCell"; title = "Select file"; ObjectID = "XJE-cy-nfQ"; */
+"XJE-cy-nfQ.title" = "Select file";
+
+/* Class = "NSTextFieldCell"; title = "Import archive file"; ObjectID = "kXa-FL-Enf"; */
+"kXa-FL-Enf.title" = "Import archive file";
+
+/* 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.";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "t12-O0-kcf"; */
+"t12-O0-kcf.title" = "OK";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
+"vVf-hg-sWk.ibShadowedIsNilPlaceholder" = "PIN";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
+"vVf-hg-sWk.ibShadowedMultipleValuesPlaceholder" = "PIN";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
+"vVf-hg-sWk.ibShadowedNoSelectionPlaceholder" = "PIN";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "PIN"; ObjectID = "vVf-hg-sWk"; */
+"vVf-hg-sWk.ibShadowedNotApplicablePlaceholder" = "PIN";
+
+/* Class = "NSTextFieldCell"; title = "Linking..."; ObjectID = "zWn-4H-ODH"; */
+"zWn-4H-ODH.title" = "Linking...";
diff --git a/ui/oc.lproj/RingWizardNewAccount.strings b/ui/oc.lproj/RingWizardNewAccount.strings
new file mode 100644
index 0000000000000000000000000000000000000000..82e3024cbc794d72452833d95a13490b8d38420f
--- /dev/null
+++ b/ui/oc.lproj/RingWizardNewAccount.strings
@@ -0,0 +1,75 @@
+
+/* 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 D 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 D which is 40 characters long.";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Password..."; ObjectID = "1TO-Ov-S8j"; */
+"1TO-Ov-S8j.placeholderString" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedIsNilPlaceholder" = "Repeat password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedMultipleValuesPlaceholder" = "Repeat password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedNoSelectionPlaceholder" = "Repeat password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Repeat password..."; ObjectID = "93I-zf-xAk"; */
+"93I-zf-xAk.ibShadowedNotApplicablePlaceholder" = "Repeat password...";
+
+/* Class = "NSButtonCell"; title = "Register public username"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Repeat password"; ObjectID = "BCg-5V-Ek4"; */
+"BCg-5V-Ek4.placeholderString" = "Repeat password";
+
+/* Class = "NSButtonCell"; title = "Choose password for enhance security"; ObjectID = "Cnw-4p-3Uc"; */
+"Cnw-4p-3Uc.title" = "Choose password for enhance security";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedIsNilPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedMultipleValuesPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedNoSelectionPlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedNotApplicablePlaceholder" = "Password...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedIsNilPlaceholder" = "Username...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedMultipleValuesPlaceholder" = "Username...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedNoSelectionPlaceholder" = "Username...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedNotApplicablePlaceholder" = "Username...";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
+"YIN-YL-JBs.title" = "Just a moment...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "Username...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "gEy-ak-Cgq"; */
+"gEy-ak-Cgq.placeholderString" = "Enter name";
+
+/* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Perfil";
+
+/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Compte";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
+"v7f-52-GJA.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "This password will be used to encrypt your account data and link new devices to your account. It is not mandatory but recommended to set one."; ObjectID = "zUH-kc-cik"; */
+"zUH-kc-cik.title" = "This password will be used to encrypt your account data and link new devices to your account. It is not mandatory but recommended to set one.";
+
+/* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
+"zfA-n9-V4X.title" = "Create";
diff --git a/ui/pa.lproj/AccAdvancedRing.strings b/ui/pa.lproj/AccAdvancedRing.strings
index db4be2ce2bb2e26af0094d2f49f62080f9782af6..772ccd24689c1eec6adf7636dad3b4a748767f36 100644
--- a/ui/pa.lproj/AccAdvancedRing.strings
+++ b/ui/pa.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/pa.lproj/Localizable.strings b/ui/pa.lproj/Localizable.strings
index a3ada6ed9a3191445a1c756c16c43d9d28ce0619..a851d324b90b695577b77ac14d69837cdc793cbc 100644
--- a/ui/pa.lproj/Localizable.strings
+++ b/ui/pa.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "ਮਨਜ਼ੂਰ ਕਰੋ";
 
+/* Button Action */
+"Cancel" = "ਰੱਦ ਕਰੋ";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "ਪਾਸਵਰਡ ਬਦਲੋ";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/pl.lproj/AccAdvancedRing.strings b/ui/pl.lproj/AccAdvancedRing.strings
index 34bdd3f6fccd5b6878fdd0e40713ed6659b313cc..6a45e76911c973ae83b19fcf54a040075d3a5e4d 100644
--- a/ui/pl.lproj/AccAdvancedRing.strings
+++ b/ui/pl.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Zezwól na połączenia od nieznanych użytkowników";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/pl.lproj/Localizable.strings b/ui/pl.lproj/Localizable.strings
index 937752c87227469b6add4ab175c0d1fa738c4bc3..d2fb8bc05b30425ef49328055934dbc2e28f2032 100644
--- a/ui/pl.lproj/Localizable.strings
+++ b/ui/pl.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Akceptuj";
 
+/* Button Action */
+"Cancel" = "Anuluj";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Zmień hasło";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Gotowe";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edytuj konto";
+
diff --git a/ui/pl_PL.lproj/AccAdvancedRing.strings b/ui/pl_PL.lproj/AccAdvancedRing.strings
index bd83485b79d010c51bef2cae5da0053edb0de320..5a7b80b86db5483b98a867178fa79f4c40db9227 100644
--- a/ui/pl_PL.lproj/AccAdvancedRing.strings
+++ b/ui/pl_PL.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Zezwól na połączenia od nieznanych użytkowników";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/pl_PL.lproj/Localizable.strings b/ui/pl_PL.lproj/Localizable.strings
index 4d329765eb794cf5fefe8a7f3dfb4fa1c37b5886..459680692e48475dc680efba0f4bff5ecf8cd077 100644
--- a/ui/pl_PL.lproj/Localizable.strings
+++ b/ui/pl_PL.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Akceptuj";
 
+/* Button Action */
+"Cancel" = "Anuluj";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Zmień hasło";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Gotowe";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edytuj konto";
+
diff --git a/ui/pt.lproj/AccAdvancedRing.strings b/ui/pt.lproj/AccAdvancedRing.strings
index 056dcf345eaffe0c1056f0d3b9a7d97775ec76f7..bea156579841b4bfe30acd420176d5dab8b3f724 100644
--- a/ui/pt.lproj/AccAdvancedRing.strings
+++ b/ui/pt.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Permitir chamadas de pessoas não confiáveis";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/pt.lproj/Localizable.strings b/ui/pt.lproj/Localizable.strings
index d9b641e11089c5f702a6d3546c87c727af1f1643..0933ead86269cb30ff25873dac7849b5b5bfffe5 100644
--- a/ui/pt.lproj/Localizable.strings
+++ b/ui/pt.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Aceitar";
 
+/* Button Action */
+"Cancel" = "Cancelar";
+
 /* Welcome title */
 "Add a SIP account" = "Adicionar uma conta SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Alterar palavra-chave";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Feito";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Editar Conta";
+
diff --git a/ui/pt_BR.lproj/AccAdvancedRing.strings b/ui/pt_BR.lproj/AccAdvancedRing.strings
index 89d153e19448e30e6644206db76d28c7e4b6a927..637829fdbc4fd4e57b20685e4b2325a9133c253f 100644
--- a/ui/pt_BR.lproj/AccAdvancedRing.strings
+++ b/ui/pt_BR.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Permitir chamadas de usuários desconhecidos";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/pt_BR.lproj/Localizable.strings b/ui/pt_BR.lproj/Localizable.strings
index 6afb11593a5e7e7b271ab27ac84ba4afb2fbfbac..92ac283423b4d23ef0b81a2195ee244fbe33b6d1 100644
--- a/ui/pt_BR.lproj/Localizable.strings
+++ b/ui/pt_BR.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Aceitar";
 
+/* Button Action */
+"Cancel" = "Cancelar";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Mudar senha";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Feito";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Editar Conta";
+
diff --git a/ui/pt_PT.lproj/AccAdvancedRing.strings b/ui/pt_PT.lproj/AccAdvancedRing.strings
index 995eae258283ceb10a6497556429f0afee744a27..64e9a490ba7346dafdbd511afc9dcd1587261a27 100644
--- a/ui/pt_PT.lproj/AccAdvancedRing.strings
+++ b/ui/pt_PT.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Permitir chamadas de utilizadores desconhecidos";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/pt_PT.lproj/Localizable.strings b/ui/pt_PT.lproj/Localizable.strings
index bbdcf55515cd30d371640a3cc3293bd7ec139e68..a175aa31c0d580289a65856a982ba503df503f8b 100644
--- a/ui/pt_PT.lproj/Localizable.strings
+++ b/ui/pt_PT.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Aceitar";
 
+/* Button Action */
+"Cancel" = "Cancelar";
+
 /* Welcome title */
 "Add a SIP account" = "Adicionar uma conta SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Gostaria de deixar uma mensagem?";
 
+/* Password button title */
+"Change password" = "Alterar palavra-chave";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Feito";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Editar Conta";
+
diff --git a/ui/ro.lproj/AccAdvancedRing.strings b/ui/ro.lproj/AccAdvancedRing.strings
index 22fe62d966f102aabdcabe08c7baa1cbe5743788..e1f4d42eec36b53c79cb15d5382585380dceaa17 100644
--- a/ui/ro.lproj/AccAdvancedRing.strings
+++ b/ui/ro.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/ro.lproj/Localizable.strings b/ui/ro.lproj/Localizable.strings
index d249dc0ed59d3e72554950c5d02f231b4412b5c3..f555207bb0f6647d38a0de05452c642680178023 100644
--- a/ui/ro.lproj/Localizable.strings
+++ b/ui/ro.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Acceptă";
 
+/* Button Action */
+"Cancel" = "Cancel";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/ru.lproj/AccAdvancedRing.strings b/ui/ru.lproj/AccAdvancedRing.strings
index 0b3a2395e43892bfb53d10777532b1da730819ef..eb77f8b4ecb8a479a63f44a6b9194e06b97843ef 100644
--- a/ui/ru.lproj/AccAdvancedRing.strings
+++ b/ui/ru.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Разрешить вызовы от недоверенных участников";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/ru.lproj/Localizable.strings b/ui/ru.lproj/Localizable.strings
index fddd49f77a6ca3c2968963108aac894200d4c1cd..29405c4ff75f78a86fa9542123852484cc15c8c1 100644
--- a/ui/ru.lproj/Localizable.strings
+++ b/ui/ru.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Принять";
 
+/* Button Action */
+"Cancel" = "Отмена";
+
 /* Welcome title */
 "Add a SIP account" = "Добавить аккаунт SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Хотите оставить сообщение?";
 
+/* Password button title */
+"Change password" = "Изменить пароль";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Готово";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Изменить аккаунт";
+
diff --git a/ui/ru_RU.lproj/AccAdvancedRing.strings b/ui/ru_RU.lproj/AccAdvancedRing.strings
index c8d19bac7fd2ecb8c6035261719b669411705284..a4ec6326113a84bb7b13be514c49bc87b2168f9f 100644
--- a/ui/ru_RU.lproj/AccAdvancedRing.strings
+++ b/ui/ru_RU.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Разрешить вызовы от недоверенных участников";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/ru_RU.lproj/Localizable.strings b/ui/ru_RU.lproj/Localizable.strings
index 81a84d8fb5ddd889dd181ab3e824590be7e1f657..7926fa7b5e85a603b12e5aee6f2f11125420e8e1 100644
--- a/ui/ru_RU.lproj/Localizable.strings
+++ b/ui/ru_RU.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Принять";
 
+/* Button Action */
+"Cancel" = "Отмена";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Изменить пароль";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Ок";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/sk_SK.lproj/AccAdvancedRing.strings b/ui/sk_SK.lproj/AccAdvancedRing.strings
index 46e9421bdc893b711d2b0615f306dc494923c30d..47cec2b9047aa58cd9a15699349d0506e16094ce 100644
--- a/ui/sk_SK.lproj/AccAdvancedRing.strings
+++ b/ui/sk_SK.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Povoliť hovor od nedôveryhodných peerov";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/sk_SK.lproj/Localizable.strings b/ui/sk_SK.lproj/Localizable.strings
index a687441168a60281629f1907e1b1a376ed2cdac0..fa8077a21b483cfbb171bac06cc9316e113e01e0 100644
--- a/ui/sk_SK.lproj/Localizable.strings
+++ b/ui/sk_SK.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Prijať";
 
+/* Button Action */
+"Cancel" = "Zrušiť";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Zmeniť heslo";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Hotovo";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Upraviť účet";
+
diff --git a/ui/sl.lproj/AccAdvancedRing.strings b/ui/sl.lproj/AccAdvancedRing.strings
index dc80dc71c40f5e65fd763c1a3fd59005b54cd637..3b2044ab00ee35d02222759bfe3c023d4d0adf6e 100644
--- a/ui/sl.lproj/AccAdvancedRing.strings
+++ b/ui/sl.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/sl.lproj/Localizable.strings b/ui/sl.lproj/Localizable.strings
index 8b089c73620a601a2ebf88ba85e98b2951aecb4d..e70ed1387bb53a46b47927aad2e5d7c41c01ba9b 100644
--- a/ui/sl.lproj/Localizable.strings
+++ b/ui/sl.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Sprejmi";
 
+/* Button Action */
+"Cancel" = "Prekliči";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Opravljeno";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Uredi račun";
+
diff --git a/ui/sq_AL.lproj/AccAdvancedRing.strings b/ui/sq_AL.lproj/AccAdvancedRing.strings
index 7770a7c52000b0f5c6d3d0a1bb5cf18835c82ca0..d1b00cca15cd0e96fb2df1b3d9122dd5e209986f 100644
--- a/ui/sq_AL.lproj/AccAdvancedRing.strings
+++ b/ui/sq_AL.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Lejo thirrje prej personash të pabesuar";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/sq_AL.lproj/Localizable.strings b/ui/sq_AL.lproj/Localizable.strings
index 9f29c9696ad9bfe33db104744a2b84bb9d80416b..a45ca553f26aa7341f423d19baf5c90862c074e4 100644
--- a/ui/sq_AL.lproj/Localizable.strings
+++ b/ui/sq_AL.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Pranoje";
 
+/* Button Action */
+"Cancel" = "Anuloje";
+
 /* Welcome title */
 "Add a SIP account" = "Shtoni një llogari SIP";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Do të donit të linit një mesazh?";
 
+/* Password button title */
+"Change password" = "Ndryshoni fjalëkalimin";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "U bë";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Përpunoni Llogari";
+
diff --git a/ui/sr@latin.lproj/Localizable.strings b/ui/sr@latin.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..14f58ae5cfa8406ee54d2f43cc7378fee5db25aa
--- /dev/null
+++ b/ui/sr@latin.lproj/Localizable.strings
@@ -0,0 +1,210 @@
+
+"A network error occured during the export" = "A network error occured during the export";
+
+/* Button Action */
+"Accept" = "Accept";
+
+/* Button Action */
+"Cancel" = "Otkaži";
+
+/* Welcome title */
+"Add a SIP account" = "Add a SIP account";
+
+/* Contextual menu action */
+"Add to contacts" = "Add to contacts";
+
+/* Backup error */
+"An error occured during the backup" = "An error occured during the backup";
+
+/* Error shown to the user */
+"An error occured during the export" = "An error occured during the export";
+
+/* Peer busy message */
+"appears to be busy." = "appears to be busy.";
+
+/* Error audio permission */
+"Audio permission not granted" = "Audio permission not granted";
+
+/* Backup account */
+"Backup your account" = "Backup your account";
+
+/* Contextual menu action */
+"Block contact" = "Block contact";
+
+/* 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.";
+
+/* File transfer canceled label */
+"Canceled" = "Canceled";
+
+/* Contextual menu entry */
+"Choose file" = "Choose file";
+
+/* Contextual menu action */
+"Clear conversation" = "Clear conversation";
+
+/* No comment provided by engineer. */
+"Copy" = "Copy";
+
+/* Recording view explanation label */
+"Could not record message during call" = "Could not record message during call";
+
+/* Welcome title */
+"Create a new account" = "Create a new account";
+
+/* Backup enter password */
+"Enter account password" = "Enter account password";
+
+/* File transfer failed label */
+"Failed" = "Failed";
+
+/* Error message shown to user when it is impossible to migrate account */
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
+
+/* Text shown to user when an error occur at registration */
+"Failed to perform lookup" = "Failed to perform lookup";
+
+/* Text shown to the user */
+"ID: " = "ID: ";
+
+/* link account title */
+"Import from backup" = "Import from backup";
+
+/* link account title */
+"Import from other device" = "Import from other device";
+
+/* Incoming call from {Name} */
+"Incoming call from %@" = "Incoming call from %@";
+
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
+/* Text shown to user when his username is invalid to be registered */
+"Invalid username" = "Invalid username";
+
+/* Text shown to user when his username is invalid to be registered */
+"Invalid username." = "Invalid username.";
+
+/* Allert message when no accounts are available */
+"Navigate to preferences to create a new account" = "Navigate to preferences to create a new account";
+
+/* Displayed as RingID when no accounts are available for selection */
+"No account available" = "No account available";
+
+/* Text show to the user when password didn't match */
+"Password and confirmation mismatch." = "Password and confirmation mismatch.";
+
+/* Indication for user */
+"Password is too short" = "Password is too short";
+
+/* Indication for user */
+"Passwords don't match" = "Passwords don't match";
+
+/* Contextual menu action */
+"Place audio call" = "Place audio call";
+
+/* Contextual menu action */
+"Place video call" = "Place video call";
+
+/* Recording view explanation label */
+"Press to start recording" = "Press to start recording";
+
+/* Record message title */
+"Record a message" = "Record a message";
+
+/* Button Action */
+"Refuse" = "Refuse";
+
+/* Text shown to the user */
+"Registered name: " = "Registered name: ";
+
+/* Remove account alert title */
+"Remove account" = "Remove account";
+
+/* export account button title */
+"Select archive" = "Select archive";
+
+/* Send button title */
+"Send" = "Send";
+
+/* Notification message */
+"Send you a contact request" = "Send you a contact request";
+
+/* No comment provided by engineer. */
+"Share" = "Share";
+
+/* Contextual menu entry */
+"Share screen" = "Share screen";
+
+/* Sign In */
+"Sign In" = "Sign In";
+
+/* Record message title */
+"Stop recording" = "Stop recording";
+
+/* File transfer successful label */
+"Success" = "Success";
+
+/* No comment provided by engineer. */
+"Text Actions" = "Text Actions";
+
+/* Text shown to user when his username is available to be registered */
+"The entered username is available" = "The entered username is available";
+
+/* Text shown to user when his username is already registered */
+"The entered username is not available" = "The entered username is not available";
+
+/* Error shown to the user */
+"The password you entered does not unlock this account" = "The password you entered does not unlock this account";
+
+/* Text shown to the user */
+"This account needs to be migrated" = "This account needs to be migrated";
+
+/* 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!";
+
+/* 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!";
+
+/* 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.";
+
+/* Text shown to the user */
+"To proceed with the migration, you need to enter a password that was used for this account." = "To proceed with the migration, you need to enter a password that was used for this account.";
+
+/* File transfer peer unjoinable label */
+"Unjoinable" = "Unjoinable";
+
+/* Error video permission */
+"Video permission not granted" = "Video permission not granted";
+
+/* Welcome title */
+"Welcome to Jami" = "Welcome to Jami";
+
+/* Peer busy message */
+"Would you like to leave a message?" = "Would you like to leave a message?";
+
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Done";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/sv.lproj/AccAdvancedRing.strings b/ui/sv.lproj/AccAdvancedRing.strings
index 22bc6cce4cdbedfb0e8741fdc5d9accf5546e9c3..1c0f84cbc8e66d20c1e7455dd3aefe72bb6790a1 100644
--- a/ui/sv.lproj/AccAdvancedRing.strings
+++ b/ui/sv.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Tillåt samtal från ej betrodda användare";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/sv.lproj/Localizable.strings b/ui/sv.lproj/Localizable.strings
index 5d7d8ac5cc4cfcafa10c1a77244b3a0d8c55ff50..f405a2161c47c1ff609f2e4e956552fd31972d30 100644
--- a/ui/sv.lproj/Localizable.strings
+++ b/ui/sv.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Acceptera";
 
+/* Button Action */
+"Cancel" = "Avbryt";
+
 /* Welcome title */
 "Add a SIP account" = "Lägg till ett SIP-konto";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Byt lösenord";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Klar";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Redigera konto";
+
diff --git a/ui/tr.lproj/AccAdvancedRing.strings b/ui/tr.lproj/AccAdvancedRing.strings
index d0bfa6ededcf8f9f6455400be36b9b191a6a4cd9..96278d70d2233060086bb0e128f99341368476e5 100644
--- a/ui/tr.lproj/AccAdvancedRing.strings
+++ b/ui/tr.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Güvenilmeyen Eşlerden Gelen Aramalara İzin Ver";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/tr.lproj/Localizable.strings b/ui/tr.lproj/Localizable.strings
index 2a535225a24053f9f0515b35eb879edb3de62e95..e4e351fcb00ad415d5c2dd4b06ab4dbcaee7fc46 100644
--- a/ui/tr.lproj/Localizable.strings
+++ b/ui/tr.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Kabul et";
 
+/* Button Action */
+"Cancel" = "İptal";
+
 /* Welcome title */
 "Add a SIP account" = "Bir SIP hesabı ekle";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Bir ileti bırakmak ister misiniz?";
 
+/* Password button title */
+"Change password" = "Parolayı değiştir";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Tamam";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Hesabı Düzenle";
+
diff --git a/ui/uk.lproj/AccAdvancedRing.strings b/ui/uk.lproj/AccAdvancedRing.strings
index 095eb889f373cea6ebd7e84e606ad45939c79e60..a0fc9dc8eeb59d3959e3a75b09b47c327b8fb962 100644
--- a/ui/uk.lproj/AccAdvancedRing.strings
+++ b/ui/uk.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Дозволити дзвінки від незнайомців";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/uk.lproj/Localizable.strings b/ui/uk.lproj/Localizable.strings
index 8e724409d644ffa942a123541a04b813059abdc9..f858c83ff60cd0a248338521e2a7ea636da7fe24 100644
--- a/ui/uk.lproj/Localizable.strings
+++ b/ui/uk.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Прийняти";
 
+/* Button Action */
+"Cancel" = "Відміна";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Змінити пароль";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "Готово";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Редагувати обліковий запис";
+
diff --git a/ui/zh.lproj/AccAdvancedRing.strings b/ui/zh.lproj/AccAdvancedRing.strings
index 2619e653963d1e7a9b04eae736ae3217e1e47de7..0b1221e53be10101e467c3c0e4746e51f1548adf 100644
--- a/ui/zh.lproj/AccAdvancedRing.strings
+++ b/ui/zh.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "Allow call from untrusted peers";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/zh.lproj/Localizable.strings b/ui/zh.lproj/Localizable.strings
index 75f24486d7bb58a9129a0db9f64695ec42cf449d..bc30edbfe269390c5dbdc9f380c9359d9a92c514 100644
--- a/ui/zh.lproj/Localizable.strings
+++ b/ui/zh.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "Accept";
 
+/* Button Action */
+"Cancel" = "取消";
+
 /* Welcome title */
 "Add a SIP account" = "Add a SIP account";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "Would you like to leave a message?";
 
+/* Password button title */
+"Change password" = "Change password";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "完成";
+
+/* Edit Sip Account Action */
+"Edit Account" = "Edit Account";
+
diff --git a/ui/zh_CN.lproj/AccAdvancedRing.strings b/ui/zh_CN.lproj/AccAdvancedRing.strings
index 8b6c6cd879871292a4f15b0a07385238f4487dfb..24038df7eeb4bfd01764c93065d9d60d73ae0840 100644
--- a/ui/zh_CN.lproj/AccAdvancedRing.strings
+++ b/ui/zh_CN.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "允许未被信任的用户来电";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/zh_CN.lproj/Localizable.strings b/ui/zh_CN.lproj/Localizable.strings
index 531634a04677456151a4fc0f1c4565ec99639f53..8e1a6296aaea0d46284f0a44314f5a4ffd00373e 100644
--- a/ui/zh_CN.lproj/Localizable.strings
+++ b/ui/zh_CN.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "接听";
 
+/* Button Action */
+"Cancel" = "取消";
+
 /* Welcome title */
 "Add a SIP account" = "添加 SIP 账户";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "您想要留言吗?";
 
+/* Password button title */
+"Change password" = "更改密码";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "已完成";
+
+/* Edit Sip Account Action */
+"Edit Account" = "编辑帐户";
+
diff --git a/ui/zh_TW.lproj/AccAdvancedRing.strings b/ui/zh_TW.lproj/AccAdvancedRing.strings
index 1cc6a44124e323421ba9453796385e4373bb1d55..8715b90bb3c0ba6202333f347ae9afba01c3b03f 100644
--- a/ui/zh_TW.lproj/AccAdvancedRing.strings
+++ b/ui/zh_TW.lproj/AccAdvancedRing.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSButtonCell"; title = "Allow call from untrusted peers"; ObjectID = "1Xr-BO-Pu3"; */
-"1Xr-BO-Pu3.title" = "允許從不被信任的他人而來的通話";
+/* Class = "NSButtonCell"; title = "Allow incoming calls from unknown contacts"; ObjectID = "1Xr-BO-Pu3"; */
+"1Xr-BO-Pu3.title" = "Allow incoming calls from unknown contacts";
 
 /* Class = "NSButtonCell"; title = "UPnP"; ObjectID = "25Q-c1-ld3"; */
 "25Q-c1-ld3.title" = "UPnP";
diff --git a/ui/zh_TW.lproj/Localizable.strings b/ui/zh_TW.lproj/Localizable.strings
index 41813702f1a92b01845e040f94c3d1e4a9918b6b..38b740a4f88c96fd52d3a80df9b655ff6d62c5c6 100644
--- a/ui/zh_TW.lproj/Localizable.strings
+++ b/ui/zh_TW.lproj/Localizable.strings
@@ -4,6 +4,9 @@
 /* Button Action */
 "Accept" = "接聽";
 
+/* Button Action */
+"Cancel" = "取消";
+
 /* Welcome title */
 "Add a SIP account" = "新增 SIP 帳號";
 
@@ -181,3 +184,27 @@
 /* Peer busy message */
 "Would you like to leave a message?" = "您想要留下訊息嗎?";
 
+/* Password button title */
+"Change password" = "變更密碼";
+
+/* Password button title */
+"Create password" = "Create password";
+
+/* Device revocation title */
+"Revoke Device" = "Revoke Device";
+
+/* Device revocation message */
+"Attention! This action could not be undone!" = "Attention! This action could not be undone!";
+
+/* Device revocation error */
+"Device revocation failed. Please check your password and try again." = "Device revocation failed. Please check your password and try again.";
+
+/* Device revocation error */
+"Device revocation failed" = "Device revocation failed";
+
+/* Edit Sip Account Action*/
+"Done" = "完成";
+
+/* Edit Sip Account Action */
+"Edit Account" = "編輯帳號";
+