diff --git a/ui/fr.lproj/AccountBackupVC.strings b/ui/fr.lproj/AccountBackupVC.strings
new file mode 100644
index 0000000..ac390f3
--- /dev/null
+++ b/ui/fr.lproj/AccountBackupVC.strings
@@ -0,0 +1,18 @@
+
+/* Class = "NSButtonCell"; title = "Skip"; ObjectID = "73h-fa-4yX"; */
+"73h-fa-4yX.title" = "Passer";
+
+/* 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" = "Ne plus afficher";
+
+/* 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" = "Ce compte n'existe que sur votre appareil. Si vous perdez votre appareil ou bien si vous désinstallez l'application, votre compte sera détruit. Vous pouvez sauvegarder votre compte maintenant ou plus tard.";
+
+/* Class = "NSButtonCell"; title = "Export account"; ObjectID = "cod-s7-SPd"; */
+"cod-s7-SPd.title" = "Exporter compte";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "ruw-Kp-tCz"; */
+"ruw-Kp-tCz.title" = "OK";
diff --git a/ui/fr.lproj/AccountMenuItemView.strings b/ui/fr.lproj/AccountMenuItemView.strings
new file mode 100644
index 0000000..52dd652
--- /dev/null
+++ b/ui/fr.lproj/AccountMenuItemView.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "7sc-IE-yuO"; */
+"7sc-IE-yuO.title" = "Label";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Create New Account"; ObjectID = "BkF-b3-tzE"; */
+"BkF-b3-tzE.ibShadowedToolTip" = "Créer un nouveau compte";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "ZIZ-jd-eLK"; */
+"ZIZ-jd-eLK.title" = "Boîte";
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "gOS-aC-TGo"; */
+"gOS-aC-TGo.title" = "Label";
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "uPR-fc-nOP"; */
+"uPR-fc-nOP.title" = "Label";
diff --git a/ui/fr.lproj/AudioPrefs.strings b/ui/fr.lproj/AudioPrefs.strings
index 8870506..7b11ac0 100644
--- a/ui/fr.lproj/AudioPrefs.strings
+++ b/ui/fr.lproj/AudioPrefs.strings
@@ -2,20 +2,5 @@
 /* Class = "NSTextFieldCell"; title = "Output"; ObjectID = "2gZ-Ab-XHf"; */
 "2gZ-Ab-XHf.title" = "Sortie";
 
-/* Class = "NSTextFieldCell"; title = "Recordings"; ObjectID = "9HH-Pa-4Aq"; */
-"9HH-Pa-4Aq.title" = "Enregistrements";
-
-/* Class = "NSTextFieldCell"; title = "Audio devices"; ObjectID = "B0r-wh-wc3"; */
-"B0r-wh-wc3.title" = "Périphériques audio";
-
-/* Class = "NSButtonCell"; title = "Always recording"; ObjectID = "jeD-Nk-KHA"; */
-"jeD-Nk-KHA.title" = "Toujours enregistrer";
-
-/* Class = "NSTextFieldCell"; title = "Save in"; ObjectID = "ksV-r2-EVJ"; */
-"ksV-r2-EVJ.title" = "Enregistrer dans";
-
-/* Class = "NSButtonCell"; title = "Mute DTMF"; ObjectID = "pAA-Iv-EmI"; */
-"pAA-Iv-EmI.title" = "Désactiver les DTMF";
-
 /* Class = "NSTextFieldCell"; title = "Input"; ObjectID = "x1o-rT-jy6"; */
 "x1o-rT-jy6.title" = "Entrée";
diff --git a/ui/fr.lproj/Conversation.strings b/ui/fr.lproj/Conversation.strings
index f1a5463..4adbfe6 100644
--- a/ui/fr.lproj/Conversation.strings
+++ b/ui/fr.lproj/Conversation.strings
@@ -1,24 +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" = "Cellule de texte";
 
-/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "HnC-1N-RmR"; */
-"HnC-1N-RmR.placeholderString" = "Titre";
-
 /* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "Ilz-7v-2fr"; */
 "Ilz-7v-2fr.placeholderString" = "Envoyer un message";
 
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "Envoyer un message";
+/* Class = "NSButton"; ibShadowedToolTip = "Start audio call"; ObjectID = "RuH-fO-poy"; */
+"RuH-fO-poy.ibShadowedToolTip" = "Démarrer un appel audio";
 
-/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "Envoyer un message";
+/* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "UJf-cF-RAo"; */
+"UJf-cF-RAo.ibShadowedToolTip" = "Envoyer";
 
-/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "Envoyer un message";
+/* Class = "NSButton"; ibShadowedToolTip = "Start video call"; ObjectID = "cFH-d7-Erh"; */
+"cFH-d7-Erh.ibShadowedToolTip" = "Démarrer un appel vidéo";
 
-/* Class = "NSTextFieldCell"; title = "Start the conversation!"; ObjectID = "bsl-nv-Wqq"; */
-"bsl-nv-Wqq.title" = "Démarrer une conversation";
+/* Class = "NSBox"; title = "Box"; ObjectID = "ciI-CA-tly"; */
+"ciI-CA-tly.title" = "Boîte";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "ooq-vs-Xt1"; */
-"ooq-vs-Xt1.ibShadowedToolTip" = "Enregistrer";
+/* Class = "NSBox"; title = "Box"; ObjectID = "fh9-Uo-8R1"; */
+"fh9-Uo-8R1.title" = "Boîte";
+
+/* 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" = "Boîte";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Back"; ObjectID = "ooq-vs-Xt1"; */
+"ooq-vs-Xt1.ibShadowedToolTip" = "Précédent";
+
+/* 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" = "Boîte";
+
+/* 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" = "Envoyer un message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
+"zK1-Ee-EWS.ibShadowedMultipleValuesPlaceholder" = "Envoyer un message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
+"zK1-Ee-EWS.ibShadowedNoSelectionPlaceholder" = "Envoyer un message";
diff --git a/ui/fr.lproj/CurrentCall.strings b/ui/fr.lproj/CurrentCall.strings
index 11df6fe..04fec00 100644
--- a/ui/fr.lproj/CurrentCall.strings
+++ b/ui/fr.lproj/CurrentCall.strings
@@ -2,26 +2,17 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "2cB-dz-KYg"; */
 "2cB-dz-KYg.ibShadowedToolTip" = "Raccrocher";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Join call"; ObjectID = "9e8-ji-QId"; */
-"9e8-ji-QId.ibShadowedToolTip" = "Rejoindre un appel";
+/* Class = "NSBox"; title = "Box"; ObjectID = "4xt-xs-LVn"; */
+"4xt-xs-LVn.title" = "Boîte";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Transfer"; ObjectID = "ChW-kg-Sja"; */
-"ChW-kg-Sja.ibShadowedToolTip" = "Transférer";
+/* Class = "NSBox"; title = "Box"; ObjectID = "DSf-SJ-l6k"; */
+"DSf-SJ-l6k.title" = "Boîte";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "D0G-XT-lhI"; */
-"D0G-XT-lhI.ibShadowedToolTip" = "Raccrocher";
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
+"GBy-HF-JeP.title" = "Label";
 
-/* Class = "NSTextFieldCell"; title = "URI"; ObjectID = "Dqv-um-UUk"; */
-"Dqv-um-UUk.title" = "URI";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Incoming Display Name"; ObjectID = "EA3-Q5-Dyj"; */
-"EA3-Q5-Dyj.placeholderString" = "Nom de l'appel entrant";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "G0w-c3-9pJ"; */
-"G0w-c3-9pJ.ibShadowedToolTip" = "Enregistrer";
-
-/* Class = "NSButtonCell"; title = "Answer"; ObjectID = "KPG-pB-gPm"; */
-"KPG-pB-gPm.title" = "Répondre";
+/* Class = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
+"KCp-bZ-69S.title" = "Boîte";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "Kjq-iM-NBL"; */
 "Kjq-iM-NBL.ibShadowedToolTip" = "Raccrocher";
@@ -29,53 +20,53 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Mute Video"; ObjectID = "LVS-yZ-98V"; */
 "LVS-yZ-98V.ibShadowedToolTip" = "Désactiver la vidéo";
 
-/* Class = "NSTextFieldCell"; title = "Cancel"; ObjectID = "TlL-HO-5Ey"; */
-"TlL-HO-5Ey.title" = "Annuler";
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedMultipleValuesPlaceholder" = "Envoyer un message";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "VVL-A4-r7n"; */
-"VVL-A4-r7n.ibShadowedToolTip" = "Enregistrer";
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedNoSelectionPlaceholder" = "Envoyer un message";
 
-/* Class = "NSTextFieldCell"; title = "wants to talk to you!"; ObjectID = "X0W-vv-xua"; */
-"X0W-vv-xua.title" = "veut vous parler !";
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedNotApplicablePlaceholder" = "Envoyer un message";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "QYT-0n-4sw"; */
+"QYT-0n-4sw.ibShadowedToolTip" = "Enregistrer";
+
+/* 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" = "Cellule de texte";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hold"; ObjectID = "anb-Y8-JQi"; */
 "anb-Y8-JQi.ibShadowedToolTip" = "Attente";
 
+/* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "d4g-hS-EMn"; */
+"d4g-hS-EMn.placeholderString" = "Envoyer un message";
+
+/* Class = "NSTextFieldCell"; placeholderString = "State"; ObjectID = "dPt-JY-yxV"; */
+"dPt-JY-yxV.placeholderString" = "État";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
 "fmp-x4-Pef.ibShadowedToolTip" = "Activer le clavardage";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Add participant"; ObjectID = "kIZ-mf-moM"; */
-"kIZ-mf-moM.ibShadowedToolTip" = "Ajouter un participant";
+/* Class = "NSTextFieldCell"; title = "person Id"; ObjectID = "hKi-Ay-ex5"; */
+"hKi-Ay-ex5.title" = "person Id";
 
-/* Class = "NSButtonCell"; title = "Button"; ObjectID = "kxH-yM-TLd"; */
-"kxH-yM-TLd.title" = "Bouton";
+/* Class = "NSBox"; title = "Box"; ObjectID = "hfc-s5-yWK"; */
+"hfc-s5-yWK.title" = "Boîte";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "mc3-HV-hek"; */
-"mc3-HV-hek.ibShadowedToolTip" = "Raccrocher";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "oRa-pS-HN2"; */
-"oRa-pS-HN2.ibShadowedToolTip" = "Enregistrer";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "osk-LS-0Qg"; */
-"osk-LS-0Qg.placeholderString" = "Nom de la personne";
+/* 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" = "Décrocher";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "rqa-be-VIB"; */
+"rqa-be-VIB.ibShadowedToolTip" = "Envoyer";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Mute Audio"; ObjectID = "tQl-cT-0Lb"; */
 "tQl-cT-0Lb.ibShadowedToolTip" = "Désactiver l'audio";
 
-/* Class = "NSTextFieldCell"; title = "Ignore"; ObjectID = "tjM-py-p4V"; */
-"tjM-py-p4V.title" = "Ignorer";
-
-/* Class = "NSTextFieldCell"; placeholderString = "State"; ObjectID = "ugy-uK-901"; */
-"ugy-uK-901.placeholderString" = "État";
-
-/* Class = "NSTextFieldCell"; title = "Answer"; ObjectID = "wRO-X4-7IU"; */
-"wRO-X4-7IU.title" = "Répondre";
-
-/* Class = "NSTextFieldCell"; title = "wants to talk with you!"; ObjectID = "yZ6-1A-ZLT"; */
-"yZ6-1A-ZLT.title" = "veut parler avec vous !";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Time"; ObjectID = "zsO-T7-9yi"; */
-"zsO-T7-9yi.placeholderString" = "Durée";
+/* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "ues-20-34k"; */
+"ues-20-34k.placeholderString" = "Nom de la personne";
diff --git a/ui/fr.lproj/GeneralPrefs.strings b/ui/fr.lproj/GeneralPrefs.strings
index 06da5fd..359953a 100644
--- a/ui/fr.lproj/GeneralPrefs.strings
+++ b/ui/fr.lproj/GeneralPrefs.strings
@@ -1,42 +1,54 @@
 
-/* Class = "NSButtonCell"; title = "Keep my history for"; ObjectID = "3Pb-Ec-zl5"; */
-"3Pb-Ec-zl5.title" = "Garder mon historique pendant";
+/* 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" = "Chaque mois";
 
+/* Class = "NSTextFieldCell"; title = "Download folder"; ObjectID = "6Ye-pe-9WV"; */
+"6Ye-pe-9WV.title" = "Répertoire de téléchargement";
+
+/* Class = "NSButtonCell"; title = "Always record calls"; ObjectID = "6zp-rh-brb"; */
+"6zp-rh-brb.title" = "Toujours enregistrer les appels";
+
+/* Class = "NSTextFieldCell"; title = "System"; ObjectID = "8xm-Tc-NMN"; */
+"8xm-Tc-NMN.title" = "Système";
+
+/* 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" = "Chaque semaine";
 
-/* Class = "NSTextFieldCell"; title = "30"; ObjectID = "JvS-c4-OeT"; */
-"JvS-c4-OeT.title" = "30";
+/* Class = "NSTextFieldCell"; title = "Quality(Kbps)"; ObjectID = "AOr-Cq-w57"; */
+"AOr-Cq-w57.title" = "Quality(Kbps)";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Profile"; ObjectID = "MV1-AC-qE7"; */
-"MV1-AC-qE7.ibShadowedToolTip" = "Profil";
+/* 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" = "Lancer Ring au démarrage";
 
-/* Class = "NSTextFieldCell"; title = "(Applied on application restart)"; ObjectID = "OTl-vx-S43"; */
-"OTl-vx-S43.title" = "(vous devez redémarrer l'application)";
-
-/* Class = "NSTextFieldCell"; title = "Behaviours"; ObjectID = "Rzy-Gh-3wQ"; */
-"Rzy-Gh-3wQ.title" = "Comportements";
+/* 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" = "Vérifier automatiquement les mises à jour";
 
-/* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "Thg-oC-5Qw"; */
-"Thg-oC-5Qw.title" = "Profil";
+/* Class = "NSTextFieldCell"; title = "Conversations"; ObjectID = "ZCU-sa-SEk"; */
+"ZCU-sa-SEk.title" = "Conversations";
 
 /* Class = "NSMenuItem"; title = "Daily"; ObjectID = "cB6-4m-9MU"; */
 "cB6-4m-9MU.title" = "Chaque jour";
 
-/* Class = "NSButtonCell"; title = "Clear History"; ObjectID = "cd5-9L-Bbb"; */
-"cd5-9L-Bbb.title" = "Vider l'historique";
-
-/* Class = "NSTextFieldCell"; title = "days"; ObjectID = "e5K-l0-Nfw"; */
-"e5K-l0-Nfw.title" = "jours";
+/* Class = "NSTextFieldCell"; title = "Record folder"; ObjectID = "ep4-QU-rGl"; */
+"ep4-QU-rGl.title" = "Répertoire des fichiers d'enregistrements";
 
 /* Class = "NSMenuItem"; title = "Hourly"; ObjectID = "mbu-TH-bs8"; */
 "mbu-TH-bs8.title" = "Toutes les heures";
@@ -50,5 +62,5 @@
 /* Class = "NSButtonCell"; title = "Bring Jami to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
 "uYI-hA-JHk.title" = "Afficher Jami en avant plan en cas d'appels entrants";
 
-/* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
-"vbU-2S-O58.title" = "Ceci est partagé avec vos contacts";
+/* Class = "NSButtonCell"; title = "Record local video"; ObjectID = "y5x-4d-E26"; */
+"y5x-4d-E26.title" = "Enregistrer la vidéo locale";
diff --git a/ui/fr.lproj/LeaveMessageVC.strings b/ui/fr.lproj/LeaveMessageVC.strings
index 5362c65..c9f2995 100644
--- a/ui/fr.lproj/LeaveMessageVC.strings
+++ b/ui/fr.lproj/LeaveMessageVC.strings
@@ -2,20 +2,26 @@
 /* Class = "NSTextFieldCell"; title = "00:00"; ObjectID = "78U-cA-2f2"; */
 "78U-cA-2f2.title" = "00:00";
 
-/* Class = "NSBox"; title = "Box"; ObjectID = "MxH-aj-EXO"; */
-"MxH-aj-EXO.title" = "Boîte";
+/* Class = "NSButtonCell"; title = "Send message"; ObjectID = "Bjm-hd-lQU"; */
+"Bjm-hd-lQU.title" = "Envoyer le message";
+
+/* Class = "NSButtonCell"; title = "Go back to conversations"; ObjectID = "M07-cf-bjZ"; */
+"M07-cf-bjZ.title" = "Go back to conversations";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "TwL-yO-BXI"; */
 "TwL-yO-BXI.title" = "Boîte";
 
-/* Class = "NSBox"; title = "Box"; ObjectID = "Zlv-nH-Y9y"; */
-"Zlv-nH-Y9y.title" = "Boîte";
-
-/* Class = "NSTextFieldCell"; title = "Contact appears to be busy. Leave a message?"; ObjectID = "hnr-x5-xnb"; */
-"hnr-x5-xnb.title" = "Votre interlocuteur semble occupé. Souhaitez-vous lui laisser une message ?";
+/* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "dEq-nq-Ae8"; */
+"dEq-nq-Ae8.ibShadowedToolTip" = "Record message";
 
 /* Class = "NSTextFieldCell"; title = "Recording"; ObjectID = "kIq-PG-Ymw"; */
 "kIq-PG-Ymw.title" = "Enregistrement";
 
-/* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "uol-7p-Y2J"; */
-"uol-7p-Y2J.title" = "Nom";
+/* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "oFb-RQ-trc"; */
+"oFb-RQ-trc.ibShadowedToolTip" = "Record message";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Go to conversations"; ObjectID = "tf8-hV-8xd"; */
+"tf8-hV-8xd.ibShadowedToolTip" = "Go to conversations";
+
+/* Class = "NSButtonCell"; title = "Record a message"; ObjectID = "zTC-Gf-lAV"; */
+"zTC-Gf-lAV.title" = "Record a message";
diff --git a/ui/fr.lproj/Localizable.strings b/ui/fr.lproj/Localizable.strings
index 39874ad..c5fb124 100644
--- a/ui/fr.lproj/Localizable.strings
+++ b/ui/fr.lproj/Localizable.strings
@@ -1,77 +1,56 @@
 
 "A network error occured during the export" = "Une erreur réseau est survenue pendant l'exportation";
 
-/* No password on this account text field placeholder */
-"Account has no password" = "Compte n'ayant pas de mot de passe";
+/* Button Action */
+"Accept" = "Accepter";
+
+/* Welcome title */
+"Add a SIP account" = "Ajouter un compte SIP";
 
 /* Contextual menu action */
 "Add to contacts" = "Ajouter aux contacts";
 
-/* Contextual menu action */
-"Place video call" = "Faire un appel vidéo";
-
-/* Contextual menu action */
-"Place audio call" = "Faire un appel audio";
-
-/* Contextual menu action */
-"Clear conversation" = "Effacer la conversation";
-
-/* Contextual menu action */
-"Block contact" = "Bloquer le contact";
-
-/* Text shown to the user */
-"Alias : " = "Identifiant :";
+/* Backup error */
+"An error occured during the backup" = "Une erreur est survenue pendant la sauvegarde.";
 
 /* Error shown to the user */
 "An error occured during the export" = "Une erreur s'est produite lors de l'export";
 
-/* Contextual menu entry */
-"Backup account" = "Sauvegarder le compte";
+/* 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 */
-"Call number" = "Appeler un numéro";
+"Block contact" = "Bloquer le 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." = "EN cliquant OK vous supprimerez ce compte sur l'appareil !\nCette action est irréversible et vous pourriez perdre votre nom d'enregistrement.";
 
 /* File transfer canceled label */
 "Canceled" = "Annulé";
 
-/* Open panel title */
-"Choose a CA list" = "Choisir une liste de CA";
-
-/* Open panel title */
-"Choose a certificate" = "Choisir un certificat";
-
-/* Open panel title */
-"Choose a directory" = "Choisir un répertoire";
-
-/* Open panel title */
-"Choose a private key file" = "Choisir un fichier de clé privée";
-
-/* Open panel prompt for 'Choose a file' */
-"Choose CA" = "Choisir l'autorité de certification";
-
-/* Open panel prompt for 'Choose a directory' */
-"Choose directory" = "Choisir un répertoire";
-
 /* Contextual menu entry */
 "Choose file" = "Choisir le fichier";
 
-/* Contextual menu entry */
-"Share screen" = "Partager votre écran";
+/* Contextual menu action */
+"Clear conversation" = "Effacer la conversation";
 
 /* No comment provided by engineer. */
 "Copy" = "Copier";
 
-/* Contextual menu action */
-"Copy name" = "Copier le nom";
+/* Recording view explanation label */
+"Could not record message during call" = "Could not record message during call";
 
-/* Contextual menu action */
-"Copy number" = "Copier le numéro ou identifiant Ring";
+/* Welcome title */
+"Create a new account" = "Créer un nouveau compte";
 
-/* Contextual menu entry */
-"Create Jami Account" = "Créer un compte Jami";
-
-/* Contextual menu entry */
-"Create SIP Account" = "Créer un compte SIP";
+/* Backup enter password */
+"Enter account password" = "Enter account password";
 
 /* File transfer failed label */
 "Failed" = "Échec";
@@ -82,24 +61,33 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Échec de la recherche";
 
+/* Text shown to the user */
+"ID: " = "ID: ";
+
+/* link account title */
+"Import from backup" = "Importer à partir d'une sauvegarde.";
+
+/* link account title */
+"Import from other device" = "Import from other device";
+
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Appel entrant de %@";
 
 /* Incoming message from {Name} */
 "Incoming message from %@" = "Message entrant de %@";
 
-/* Message from {Name} */
-"Message from %@" = "Message de %@";
+/* Text shown to user when his username is invalid to be registered */
+"Invalid username" = "Nom d'utilisateur incorrect";
 
-/* User label */
-"New SIP account" = "Nouveau compte SIP";
-
-/* Displayed as RingID when no accounts are available for selection */
-"No account available" = "Pas de compte disponible";
+/* 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" = "Se rendre dans les préférences afin de créer un nouveau compte";
 
+/* Displayed as RingID when no accounts are available for selection */
+"No account available" = "Pas de compte disponible";
+
 /* Text show to the user when password didn't match */
 "Password and confirmation mismatch." = "Le mot de passe et sa confirmation ne correspondent pas.";
 
@@ -109,34 +97,48 @@
 /* Indication for user */
 "Passwords don't match" = "Les mots de passes ne correspondent pas";
 
-/* Button label */
-"Pause" = "Pause";
+/* Contextual menu action */
+"Place audio call" = "Faire un appel audio";
 
-/* Button label */
-"Play" = "Lire";
+/* Contextual menu action */
+"Place video call" = "Faire un appel vidéo";
+
+/* Recording view explanation label */
+"Press to start recording" = "Appuyer pour démarrer l'enregistrement";
+
+/* Record message title */
+"Record a message" = "Record a message";
 
 /* Button Action */
 "Refuse" = "Refuser";
-"Accept" = "Accepter";
-
-/* Contextual menu entry */
-"Remove value" = "Supprimer la valeur";
-
-/* Show advice to user */
-"Reopen account to see your hash" = "Ré-ouvrir le compte pour voir votre identifiant Ring";
-
-/* Contextual menu entry */
-"Restore account" = "Restaurer un compte";
-
-/* Button title */
-"Revise Input" = "Modifier l'entrée";
 
 /* Text shown to the user */
-"ID : " = "Identifiant :";
+"Registered name: " = "Registered name: ";
+
+/* Remove account alert title */
+"Remove account" = "Supprimer le compte";
+
+/* export account button title */
+"Select archive" = "Sélectionner un fichier archive";
+
+/* Send button title */
+"Send" = "Envoyer";
+
+/* Notification message */
+"Send you a contact request" = "Nouvelle demande de contact  ";
 
 /* No comment provided by engineer. */
 "Share" = "Partager";
 
+/* Contextual menu entry */
+"Share screen" = "Partager votre écran";
+
+/* Sign In */
+"Sign In" = "Sign In";
+
+/* Record message title */
+"Stop recording" = "Arrêter l'enregistrement ";
+
 /* File transfer successful label */
 "Success" = "Succès";
 
@@ -146,55 +148,36 @@
 /* Text shown to user when his username is available to be registered */
 "The entered username is available" = "Le nom choisi est disponible";
 
-/* Text shown to user when his username is invalid to be registered */
-"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "Le nom d'utilisateur entré est invalide. Il doit contenir au moins 3 caractères alphanumériques en minuscules seulement.";
-
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "Le nom choisi n'est pas disponible";
 
-/* Text shown to the user */
-"The following account needs to be migrated to the new Jami account format:" = "Le compte suivant doit être migré vers le nouveau format Jami";
-
 /* Error shown to the user */
 "The password you entered does not unlock this account" = "Le mot de passe fourni ne déverouille pas ce compte";
 
+/* 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!" = "Ceci est votre identifiant Jami. Conservez et partagez-le avec vos amis !";
+
+/* Explanation label when user have Jami username */
+"This is your Jami username. \nCopy and share it with your friends!" = "Ceci est votre nom d'utilisateur Jami. Conservez et partagez-le avec vos amis !";
+
 /* 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." = "Pour compléter le processus, ouvrer Ring sur le nouvel appareil, et choisir l'option \"Lier cet appareil à un compte\". Le NIP est valide pendant 10 minutes.";
 
 /* Text shown to the user */
-"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later." = "Pour continuer, choisissez un mot de passe pour ce compte. Ce mot de passe sera utilisé pour encrypter votre compte. Il sera requis pour lier de nouveaux appareils à ce compte Jami.\nSi vous n'êtes pas prêt à choisir un mot de passe, vous pouvez fermer Jami et reprendre la migration plus tard.";
+"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.";
 
-/* Name used when user leave field empty */
-"Unknown" = "Inconnu";
+/* File transfer peer unjoinable label */
+"Unjoinable" = "Unjoinable";
 
-/* Error shown to user */
-"You have to migrate your account before exporting" = "Migrer votre compte avec de l'exporter";
-
-/* Remove account alert title */
-"Remove account" = "Supprimer le compte";
-
-/* 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." = "EN cliquant OK vous supprimerez ce compte sur l'appareil !\nCette action est irréversible et vous pourriez perdre votre nom d'enregistrement.";
-
-/* export account button title */
-"Select archive" = "Sélectionner un fichier archive";
-
-/* link account title */
-"Link to an account" = "Lier à un compte existant";
+/* Error video permission */
+"Video permission not granted" = "Video permission not granted";
 
 /* Welcome title */
-"Welcome to Ring" = "Bienvenu sur Jami";
-"Create a new account" = "Créer un nouveau compte";
-"Add a SIP account" = "Ajouter un compte SIP";
+"Welcome to Jami" = "Bienvenu sur Jami";
 
-/* Notification message */
-"Send you a contact request" = "Nouvelle demande de contact  ";
+/* Peer busy message */
+"Would you like to leave a message?" = "Would you like to leave a message?";
 
-/* Explanation label when user have Jami username */
-"This is your Jami username. \nCopy and share it with your friends!" = "Ceci est votre nom d'utilisateur Jami. Conservez et partagez-le avec vos amis !";
-
-/* Explanation label when user have just ID */
-"This is your ID. \nCopy and share it with your friends!" = "Ceci est votre identifiant Jami. Conservez et partagez-le avec vos amis !";
-
-/* Backup error */
-"An error occured during the backup" = "Une erreur est survenue pendant la sauvegarde.";
diff --git a/ui/fr.lproj/MainMenu.strings b/ui/fr.lproj/MainMenu.strings
index a9aa91d..454f96e 100644
--- a/ui/fr.lproj/MainMenu.strings
+++ b/ui/fr.lproj/MainMenu.strings
@@ -196,18 +196,3 @@
 
 /* Class = "NSMenuItem"; title = "Check for Update..."; ObjectID = "593"; */
 "593.title" = "Vérifier les mises-à-jour…";
-
-/* Class = "NSMenuItem"; title = "Show"; ObjectID = "12w-Fz-Scs"; */
-"12w-Fz-Scs.title" = "Afficher";
-
-/* Class = "NSMenu"; title = "Show"; ObjectID = "1fJ-em-1ww"; */
-"1fJ-em-1ww.title" = "Afficher";
-
-/* Class = "NSMenuItem"; title = "Show recent"; ObjectID = "GTY-d8-NBf"; */
-"GTY-d8-NBf.title" = "Afficher les récents";
-
-/* Class = "NSMenuItem"; title = "Show contacts"; ObjectID = "GU3-tt-2de"; */
-"GU3-tt-2de.title" = "Afficher les contacts";
-
-/* Class = "NSMenuItem"; title = "Show call history"; ObjectID = "Oco-m7-LtS"; */
-"Oco-m7-LtS.title" = "Voir le journal des appels";
diff --git a/ui/fr.lproj/MigrateRingAccountsWindow.strings b/ui/fr.lproj/MigrateRingAccountsWindow.strings
index e3520c4..5d3ec10 100644
--- a/ui/fr.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/fr.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Migration du compte terminée";
 
-/* Class = "NSTextFieldCell"; placeholderString = "ID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "ID";
+/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "RingID";
 
-/* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Le compte suivant doit être migré vers le nouveau format de compte Jami :\nIdentifiant :\nID :\nPour continuer, choisissez un mot de passe pour ce compte. Ce mot de passe sera utilisé pour encrypter votre compte. Il sera requis pour lier de nouveaux appareils à ce compte Jami.\nSi vous n'êtes pas prêt à choisir un mot de passe, vous pouvez fermer Jami et reprendre la migration plus tard.";
+/* 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" = "Erreur durant la migration du compte";
@@ -23,6 +23,9 @@
 /* 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" = "Supprimer ce compte";
+
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Fenêtre";
 
diff --git a/ui/fr.lproj/PasswordChange.strings b/ui/fr.lproj/PasswordChange.strings
index 0c8862a..ac607c2 100644
--- a/ui/fr.lproj/PasswordChange.strings
+++ b/ui/fr.lproj/PasswordChange.strings
@@ -1,10 +1,22 @@
 
+/* 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" = "Changer le mot de passe";
+
+/* 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" = "Répéter";
 
 /* Class = "NSButtonCell"; title = "Accept"; ObjectID = "Ggu-EQ-cqC"; */
 "Ggu-EQ-cqC.title" = "Accepter";
 
+/* 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" = "Annuler";
 
diff --git a/ui/fr.lproj/PreferencesWindow.strings b/ui/fr.lproj/PreferencesWindow.strings
index 65afb36..99b7487 100644
--- a/ui/fr.lproj/PreferencesWindow.strings
+++ b/ui/fr.lproj/PreferencesWindow.strings
@@ -14,12 +14,6 @@
 /* Class = "NSToolbarItem"; paletteLabel = "Advanced"; ObjectID = "Qza-fj-d45"; */
 "Qza-fj-d45.paletteLabel" = "Options avancées";
 
-/* Class = "NSToolbarItem"; label = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
-"bRw-gW-tRJ.label" = "Comptes";
-
-/* Class = "NSToolbarItem"; paletteLabel = "Accounts"; ObjectID = "bRw-gW-tRJ"; */
-"bRw-gW-tRJ.paletteLabel" = "Comptes";
-
 /* Class = "NSToolbarItem"; label = "Audio"; ObjectID = "iuJ-eu-b7f"; */
 "iuJ-eu-b7f.label" = "Audio";
 
diff --git a/ui/fr.lproj/RegisterNameWindow.strings b/ui/fr.lproj/RegisterNameWindow.strings
index 85914aa..2ea558c 100644
--- a/ui/fr.lproj/RegisterNameWindow.strings
+++ b/ui/fr.lproj/RegisterNameWindow.strings
@@ -1,28 +1,37 @@
 
-/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Obligatoire*";
-
 /* Class = "NSTextFieldCell"; title = "Other users can use it instead of your ID"; ObjectID = "9gi-0u-67t"; */
 "9gi-0u-67t.title" = "Vos interlocuteurs peuvent l'utiliser à la place de votre ID.";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
 "Aeh-tK-RjX.title" = "Une erreur est survenue pendant l'enregistrement de votre nom d'utilisateur ";
 
-/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Entrer votre mot de passe";
-
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Fenêtre";
 
+/* 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" = "Veuillez patienter...";
 
-/* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Nom d'utilisateur...";
+/* 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" = "Annuler";
 
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "egF-LJ-khJ"; */
+"egF-LJ-khJ.title" = "Mot de passe";
+
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "eoS-s7-b3w"; */
 "eoS-s7-b3w.title" = "Annuler";
 
@@ -32,5 +41,11 @@
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "lT3-Bh-MnL"; */
 "lT3-Bh-MnL.title" = "Enregistrer";
 
-/* Class = "NSTextFieldCell"; title = "Register a public username"; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Enregistrer un nom d'utilisateur publique";
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "lo5-ei-wHM"; */
+"lo5-ei-wHM.title" = "Nom d'utilisateur";
+
+/* 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/fr.lproj/RingWindow.strings b/ui/fr.lproj/RingWindow.strings
index a754b08..3fb717a 100644
--- a/ui/fr.lproj/RingWindow.strings
+++ b/ui/fr.lproj/RingWindow.strings
@@ -2,68 +2,59 @@
 /* Class = "NSTabViewItem"; label = "SmartView"; ObjectID = "0MO-4e-8mo"; */
 "0MO-4e-8mo.label" = "Liste intelligente";
 
-/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "3Bh-xR-4Vn"; */
-"3Bh-xR-4Vn.title" = "Texte";
+/* 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]" = "Sollicitations";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
 "Ap7-26-S6b.title" = "Cellule de texte";
 
-/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
-"BfK-c5-B1l.placeholderString" = "détails";
+/* 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 = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
-"FlQ-Th-nfO.placeholderString" = "Méthode de contact";
+/* Class = "NSButton"; ibShadowedToolTip = "Accept Invitation"; ObjectID = "Fc5-KS-cim"; */
+"Fc5-KS-cim.ibShadowedToolTip" = "Accept Invitation";
 
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "GAa-pQ-t4g"; */
-"GAa-pQ-t4g.title" = "Cellule de texte";
+/* Class = "NSButton"; ibShadowedToolTip = "Share account info"; ObjectID = "Oac-o7-2Ge"; */
+"Oac-o7-2Ge.ibShadowedToolTip" = "Share account info";
 
-/* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
-"Pav-Bw-GgK.title" = "Titre";
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Oe5-Nj-cP3"; */
+"Oe5-Nj-cP3.title" = "Item 3";
 
-/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
-"Q1F-xo-N3e.placeholderString" = "Afficher le rôle";
+/* Class = "NSToolbarItem"; label = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.label" = "Toolbar Item";
 
-/* Class = "NSTextFieldCell"; placeholderString = "date"; ObjectID = "UKP-Et-CT0"; */
-"UKP-Et-CT0.placeholderString" = "date";
+/* Class = "NSToolbarItem"; paletteLabel = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.paletteLabel" = "Toolbar Item";
 
-/* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
-"Wi9-Zd-O1N.label" = "Historique";
+/* Class = "NSTextFieldCell"; title = "This is your ID.\nCopy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "Ceci est votre identifiant Jami. Conservez et partagez-le avec vos amis !";
 
-/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Ceci est votre identifiant Jami.\nCopiez et partagez-le avec vos amis!";
+/* Class = "NSBox"; title = "Box"; ObjectID = "eVv-lu-T1Y"; */
+"eVv-lu-T1Y.title" = "Boîte";
 
-/* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
-"Zbi-X6-DLT.label" = "Contacts";
+/* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
+"eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
 
-/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "bgk-oz-u7n"; */
-"bgk-oz-u7n.placeholderString" = "Nom";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
-"d5o-nL-fRP.placeholderString" = "Catégorie";
+/* 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 est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs.";
 
-/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
-"gaf-Za-tuc.placeholderString" = "Catégorie";
-
-/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "isD-c6-X5Q"; */
-"isD-c6-X5Q.placeholderString" = "détails";
-
 /* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
 "j0J-Xd-uth.placeholderString" = "Nom d'appel";
 
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "mK5-kV-YOO"; */
 "mK5-kV-YOO.placeholderString" = "détails";
 
-/* Class = "NSTextFieldCell"; placeholderString = "n"; ObjectID = "sGB-x7-gig"; */
-"sGB-x7-gig.placeholderString" = "n";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "uSw-g5-kte"; */
-"uSw-g5-kte.placeholderString" = "Afficher le rôle";
-
 /* Class = "NSSearchFieldCell"; placeholderString = "Search for new or existing contact"; ObjectID = "vvE-nM-kSl"; */
 "vvE-nM-kSl.placeholderString" = "Recherche de contacts nouveaux ou existants";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Block contact"; ObjectID = "xP1-ZW-WZ8"; */
+"xP1-ZW-WZ8.ibShadowedToolTip" = "Bloquer le contact";
diff --git a/ui/fr.lproj/RingWizard.strings b/ui/fr.lproj/RingWizard.strings
index 339205e..44e762d 100644
--- a/ui/fr.lproj/RingWizard.strings
+++ b/ui/fr.lproj/RingWizard.strings
@@ -1,3 +1,6 @@
 
 /* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
 "2mM-yx-BfM.title" = "Bienvenu sur Jami";
+
+/* Class = "NSWindow"; title = "Ring"; ObjectID = "4LP-GX-BkH"; */
+"4LP-GX-BkH.title" = "Jami";
diff --git a/ui/fr.lproj/RingWizardChoose.strings b/ui/fr.lproj/RingWizardChoose.strings
index dfb99b9..5189a34 100644
--- a/ui/fr.lproj/RingWizardChoose.strings
+++ b/ui/fr.lproj/RingWizardChoose.strings
@@ -1,9 +1,21 @@
 
+/* Class = "NSButtonCell"; title = "Connect to account manager"; ObjectID = "HGQ-Kd-WIw"; */
+"HGQ-Kd-WIw.title" = "Se connecter à partir d'un serveur d'entreprise";
+
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
 "YJ3-7G-cU1.title" = "Annuler";
 
-/* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
-"Z9K-mD-ucr.title" = "Lier cet appareil à un compte";
+/* 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" = "Créer un compte Jami";
+
+/* Class = "NSButtonCell"; title = "Import from archive backup"; ObjectID = "rtw-Db-BWL"; */
+"rtw-Db-BWL.title" = "Importer à partir d'une sauvegarde";
+
+/* Class = "NSButtonCell"; title = "Advanced..."; ObjectID = "vCj-67-PGK"; */
+"vCj-67-PGK.title" = "Avancé...";
+
+/* Class = "NSButtonCell"; title = "Add a new SIP account"; ObjectID = "yBt-Bv-fi2"; */
+"yBt-Bv-fi2.title" = "Ajouter un nouveau compte SIP";
diff --git a/ui/fr.lproj/RingWizardLinkAccount.strings b/ui/fr.lproj/RingWizardLinkAccount.strings
index 98d59eb..0a8f41f 100644
--- a/ui/fr.lproj/RingWizardLinkAccount.strings
+++ b/ui/fr.lproj/RingWizardLinkAccount.strings
@@ -1,10 +1,4 @@
 
-/* Class = "NSTextFieldCell"; title = "To link this device to another account, you have two possibilities:"; ObjectID = "06g-zM-5Qz"; */
-"06g-zM-5Qz.title" = "Pour associer cet appareil à un compte, vous avez deux possibilités:";
-
-/* Class = "NSTextFieldCell"; title = "OR"; ObjectID = "1NY-Yu-wH1"; */
-"1NY-Yu-wH1.title" = "ou";
-
 /* Class = "NSTextFieldCell"; title = "\tYou can import your account from the another device, but first, you need to obtain a PIN code. \n\tTo generate the PIN code, go to the account management setting of a previous device, choose the Jami account to use and select \"Link another device to this account\". You will get the necessary PIN to complete this form. The PIN is only valid for 10 minutes."; ObjectID = "2uK-1s-tk7"; */
 "2uK-1s-tk7.title" = "Pour lier cet appareil à un compte, vous devez obtenir votre NIP.\nPour générer ce NIP, allez dans les paramètres du compte Jami à utiliser sur un appareil déjà lié et sélectionner \"Lier un autre appareil avec ce compte\".\nVous obtiendrez un NIP nécessaire.\nLe NIP est valide pendant 10 minutes.";
 
diff --git a/ui/fr.lproj/RingWizardNewAccount.strings b/ui/fr.lproj/RingWizardNewAccount.strings
index 190acfa..e785482 100644
--- a/ui/fr.lproj/RingWizardNewAccount.strings
+++ b/ui/fr.lproj/RingWizardNewAccount.strings
@@ -1,42 +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 ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "En cochant cette case, vous enregistrez un nom d'utilisateur unique sur le réseau Jami. Les personnes peuvent l'utiliser pour vous contacter au lieu d'utiliser votre ID de 40 caractères.";
+/* 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 = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Obligatoire*";
+/* Class = "NSTextFieldCell"; placeholderString = "Password..."; ObjectID = "1TO-Ov-S8j"; */
+"1TO-Ov-S8j.placeholderString" = "Mot de passe ...";
+
+/* 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" = "Enregistrer un nom d'utilisateur public";
 
-/* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choisir un mot de passe";
+/* Class = "NSTextFieldCell"; placeholderString = "Repeat password"; ObjectID = "BCg-5V-Ek4"; */
+"BCg-5V-Ek4.placeholderString" = "Confirmez le mot de passe";
 
-/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Obligatoire*";
+/* 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" = "Mot de passe ...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedMultipleValuesPlaceholder" = "Mot de passe ...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedNoSelectionPlaceholder" = "Mot de passe ...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "JCg-IP-8cg"; */
+"JCg-IP-8cg.ibShadowedNotApplicablePlaceholder" = "Mot de passe ...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedIsNilPlaceholder" = "Nom d'utilisateur...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedMultipleValuesPlaceholder" = "Nom d'utilisateur...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedNoSelectionPlaceholder" = "Nom d'utilisateur...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Username..."; ObjectID = "UgM-Zo-2Dy"; */
+"UgM-Zo-2Dy.ibShadowedNotApplicablePlaceholder" = "Nom d'utilisateur...";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Veuillez patienter ...";
 
-/* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
-"fEY-eO-HwI.title" = "Confirmez le mot de passe";
+/* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "Nom d'utilisateur...";
 
-/* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
+/* Class = "NSTextFieldCell"; placeholderString = "Enter name"; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "Entrer un nom";
 
-/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
-"gki-BR-jc3.title" = "Créez votre profil";
+/* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Profil";
 
-/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
-"qQl-Xn-c88.title" = "Créez votre compte";
-
-/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Entrez votre nom complet";
+/* 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" = "Annuler";
 
-/* Class = "NSTextFieldCell"; title = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account."; ObjectID = "zUH-kc-cik"; */
-"zUH-kc-cik.title" = "Votre mot de passe doit contenir au moins 6 caractères. Il sera utilisé pour chiffrer les données de votre compte et pour lier de nouveaux appareils à ce compte";
+/* 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" = "Créer";
diff --git a/ui/fr.lproj/VideoPrefs.strings b/ui/fr.lproj/VideoPrefs.strings
index ffe2b01..94e21fe 100644
--- a/ui/fr.lproj/VideoPrefs.strings
+++ b/ui/fr.lproj/VideoPrefs.strings
@@ -8,8 +8,5 @@
 /* Class = "NSTextFieldCell"; title = "Rate"; ObjectID = "5Im-df-jdd"; */
 "5Im-df-jdd.title" = "Débit";
 
-/* Class = "NSTextFieldCell"; title = "Selection"; ObjectID = "VqO-Gm-CbB"; */
-"VqO-Gm-CbB.title" = "Sélection";
-
-/* Class = "NSTextFieldCell"; title = "Camera"; ObjectID = "YCM-JC-jin"; */
-"YCM-JC-jin.title" = "Caméra";
+/* Class = "NSButtonCell"; title = "Enable hardware acceleration"; ObjectID = "e7y-eV-Gsz"; */
+"e7y-eV-Gsz.title" = "Enable hardware acceleration";