diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index be2037af..c33937fe 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -723,6 +723,7 @@
 		6021FEA018E1651E00C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
 		6021FEA218E1652000C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/DatabaseSettingsWindow.strings"; sourceTree = "<group>"; };
 		6E719715172058BA00E4C5FC /* MPDatabaseVersion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPDatabaseVersion.h; sourceTree = "<group>"; };
+		713F9B481C95CEA000605880 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/PluginSettings.strings; sourceTree = "<group>"; };
 		BD6C365619484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
 		BD6C365719484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/PasswordEditWindow.strings; sourceTree = "<group>"; };
 		BD6C365819484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/GeneralSettings.strings; sourceTree = "<group>"; };
@@ -1786,6 +1787,7 @@
 				4C0DBEF61BF508DE00F9B287 /* Base */,
 				FA638D151C39BFCC00B10CC6 /* ru */,
 				4825CC881C414D57003E37E9 /* it */,
+				713F9B481C95CEA000605880 /* fr */,
 			);
 			name = PluginSettings.xib;
 			sourceTree = "<group>";
diff --git a/MacPass/fr.lproj/DatabaseSettingsWindow.strings b/MacPass/fr.lproj/DatabaseSettingsWindow.strings
index 28d21eb7..561c9efe 100644
--- a/MacPass/fr.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/fr.lproj/DatabaseSettingsWindow.strings
@@ -3,82 +3,82 @@
 "1.title" = "Window";
 
 /* Class = "NSTextFieldCell"; title = "Database name:"; ObjectID = "190"; */
-"190.title" = "Database name:";
+"190.title" = "Nom de la base de données :";
 
 /* Class = "NSTextFieldCell"; title = "Description:"; ObjectID = "257"; */
-"257.title" = "Description:";
+"257.title" = "Description :";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "289"; */
 "289.title" = "OK";
 
 /* Class = "NSTabViewItem"; label = "General"; ObjectID = "358"; */
-"358.label" = "General";
+"358.label" = "Général";
 
 /* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "368"; */
-"368.label" = "Advanced";
+"368.label" = "Avancé";
 
 /* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
-"370.label" = "Security";
+"370.label" = "Sécurité";
 
 /* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
-"464.title" = "Protect Title";
+"464.title" = "Protéger le titre";
 
 /* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
-"477.title" = "Protect Username";
+"477.title" = "Protéger le nom d'utilisateur";
 
 /* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
-"505.title" = "Protect Password";
+"505.title" = "Protéger le mot de passe";
 
 /* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
-"510.title" = "Protect URL";
+"510.title" = "Protéger l'URL";
 
 /* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
-"514.title" = "Protect Notes";
+"514.title" = "Protéger les notes";
 
 /* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
-"532.title" = "Enable Entry History";
+"532.title" = "Activer l'historique des entrées";
 
 /* Class = "NSButtonCell"; title = "Enable Recycle Bin"; ObjectID = "536"; */
-"536.title" = "Enable Recycle Bin";
+"536.title" = "Activer la corbeille";
 
 /* Class = "NSButtonCell"; title = "Empty Recycle Bin on Quit"; ObjectID = "540"; */
-"540.title" = "Empty Recycle Bin on Quit";
+"540.title" = "Vider la corbeille à la fermeture";
 
 /* Class = "NSTextFieldCell"; title = "Maximum Items:"; ObjectID = "558"; */
-"558.title" = "Maximum Items:";
+"558.title" = "Nombre maximum d'items :";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "680"; */
 "680.title" = "OtherViews";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "957"; */
-"957.title" = "Cancel";
+"957.title" = "Annuler";
 
 /* Class = "NSTextFieldCell"; title = "Maximum Size:"; ObjectID = "1269"; */
-"1269.title" = "Maximum Size:";
+"1269.title" = "Taille maximum :";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1396"; */
 "1396.title" = "OtherViews";
 
 /* Class = "NSMenuItem"; title = "None"; ObjectID = "1397"; */
-"1397.title" = "None";
+"1397.title" = "Aucune";
 
 /* Class = "NSMenuItem"; title = "GZip"; ObjectID = "1398"; */
 "1398.title" = "GZip";
 
 /* Class = "NSTextFieldCell"; title = "Compression:"; ObjectID = "1405"; */
-"1405.title" = "Compression:";
+"1405.title" = "Compression :";
 
 /* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "1435"; */
-"1435.title" = "Color:";
+"1435.title" = "Couleur :";
 
 /* Class = "NSTextFieldCell"; title = "Template Group:"; ObjectID = "1588"; */
-"1588.title" = "Template Group:";
+"1588.title" = "Groupe de modèles :";
 
 /* Class = "NSTextFieldCell"; title = "Default Username:"; ObjectID = "1591"; */
-"1591.title" = "Default Username:";
+"1591.title" = "Nom d'utilisateur par défaut :";
 
 /* Class = "NSTextFieldCell"; title = "Key encryption rounds:"; ObjectID = "1644"; */
-"1644.title" = "Key encryption rounds:";
+"1644.title" = "Tours de chiffrement :";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
 "1740.title" = "OtherViews";
@@ -94,3 +94,18 @@
 
 /* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
 "1775.title" = "Benchmark";
+
+/* Class = "NSButtonCell"; title = "Recommend key change every:"; ObjectID = "CtU-Eq-dgy"; */
+"CtU-Eq-dgy.title" = "Recommander le changement de la clé tous les :";
+
+/* Class = "NSTextFieldCell"; placeholderString = "days"; ObjectID = "M9G-Yy-1s4"; */
+"M9G-Yy-1s4.placeholderString" = "jours";
+
+/* Class = "NSTextFieldCell"; placeholderString = "days"; ObjectID = "Nca-aw-6rR"; */
+"Nca-aw-6rR.placeholderString" = "jours";
+
+/* Class = "NSTextFieldCell"; title = "Disabling password protection will remove unallowed characters in passwords. This will cause data loss after saving."; ObjectID = "iZR-sj-MHg"; */
+"iZR-sj-MHg.title" = "Désactiver la protection du mot de passe va supprimer les caractères non autorisés dans les mots de passe. Ceci va causer une perte de données après la sauvegarde.";
+
+/* Class = "NSButtonCell"; title = "Force key change every:"; ObjectID = "z6u-YT-7LE"; */
+"z6u-YT-7LE.title" = "Forcer le changement de la clé tous les :";
diff --git a/MacPass/fr.lproj/DatePickingView.strings b/MacPass/fr.lproj/DatePickingView.strings
index 04bc932e..f49ac1a7 100644
--- a/MacPass/fr.lproj/DatePickingView.strings
+++ b/MacPass/fr.lproj/DatePickingView.strings
@@ -3,7 +3,7 @@
 "17.title" = "OtherViews";
 
 /* Class = "NSButtonCell"; title = "Use Date"; ObjectID = "26"; */
-"26.title" = "Use Date";
+"26.title" = "Utiliser cette date";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "30"; */
-"30.title" = "Cancel";
+"30.title" = "Annuler";
diff --git a/MacPass/fr.lproj/EntryInspectorView.strings b/MacPass/fr.lproj/EntryInspectorView.strings
index f3febdd5..242f4f2c 100644
--- a/MacPass/fr.lproj/EntryInspectorView.strings
+++ b/MacPass/fr.lproj/EntryInspectorView.strings
@@ -1,36 +1,36 @@
 
 /* Class = "NSButtonCell"; title = "Generate"; ObjectID = "64"; */
-"64.title" = "Generate";
+"64.title" = "Générer";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "65"; */
-"65.title" = "Password";
+"65.title" = "Mot de passe";
 
 /* Class = "NSTextFieldCell"; title = "URL"; ObjectID = "66"; */
 "66.title" = "URL";
 
 /* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "69"; */
-"69.title" = "Username";
+"69.title" = "Nom d'utilisateur";
 
 /* Class = "NSTextFieldCell"; title = "Title"; ObjectID = "71"; */
-"71.title" = "Title";
+"71.title" = "Titre";
 
 /* Class = "NSButtonCell"; title = "Expires"; ObjectID = "78"; */
-"78.title" = "Expires";
+"78.title" = "Expiration";
 
 /* Class = "NSTextFieldCell"; title = "Tags"; ObjectID = "79"; */
 "79.title" = "Tags";
 
 /* Class = "NSTabViewItem"; label = "Fields"; ObjectID = "108"; */
-"108.label" = "Fields";
+"108.label" = "Champs";
 
 /* Class = "NSTabViewItem"; label = "Attachments"; ObjectID = "109"; */
-"109.label" = "Attachments";
+"109.label" = "Fichiers joints";
 
 /* Class = "NSTabViewItem"; label = "General"; ObjectID = "110"; */
-"110.label" = "General";
+"110.label" = "Général";
 
 /* Class = "NSTextFieldCell"; title = "Attachments"; ObjectID = "135"; */
-"135.title" = "Attachments";
+"135.title" = "Fichiers joints";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "142"; */
 "142.title" = "Text Cell";
@@ -42,58 +42,58 @@
 "171.title" = "Table View Cell";
 
 /* Class = "NSTextFieldCell"; title = "Custom Fields"; ObjectID = "190"; */
-"190.title" = "Custom Fields";
+"190.title" = "Champs personnalisés";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "197"; */
 "197.title" = "Text Cell";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "211"; */
-"211.placeholderString" = "Title";
+"211.placeholderString" = "Titre";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "214"; */
-"214.placeholderString" = "Value";
+"214.placeholderString" = "Valeur";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "225"; */
-"225.placeholderString" = "Value";
+"225.placeholderString" = "Valeur";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "228"; */
-"228.placeholderString" = "Title";
+"228.placeholderString" = "Titre";
 
 /* Class = "NSSegmentedCell"; 238.ibShadowedLabels[0] = "General"; ObjectID = "238"; */
-"238.ibShadowedLabels[0]" = "General";
+"238.ibShadowedLabels[0]" = "Général";
 
 /* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
-"238.ibShadowedLabels[1]" = "Files";
+"238.ibShadowedLabels[1]" = "Fichiers";
 
 /* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
-"238.ibShadowedLabels[2]" = "Custom";
+"238.ibShadowedLabels[2]" = "Personnalisé";
 
 /* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
-"238.ibShadowedLabels[3]" = "Autotype";
+"238.ibShadowedLabels[3]" = "Saisie automatique";
 
 /* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
-"0ok-MC-QMP.title" = "Save";
+"0ok-MC-QMP.title" = "Sauvegarder";
 
 /* Class = "NSButtonCell"; title = "Enable Autotype"; ObjectID = "9Nx-mE-DK3"; */
-"9Nx-mE-DK3.title" = "Enable Autotype";
+"9Nx-mE-DK3.title" = "Activer la saisie automatique";
 
 /* Class = "NSMenuItem"; title = "Quicklook"; ObjectID = "NtM-y3-l4D"; */
-"NtM-y3-l4D.title" = "Quicklook";
+"NtM-y3-l4D.title" = "Coup d'œil";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Custom Entry Sequence"; ObjectID = "R2X-Ex-c6q"; */
-"R2X-Ex-c6q.placeholderString" = "Custom Entry Sequence";
+"R2X-Ex-c6q.placeholderString" = "Séquence personnalisée";
 
 /* Class = "NSTextFieldCell"; title = "Window Sequence"; ObjectID = "RQB-bR-MC0"; */
-"RQB-bR-MC0.title" = "Window Sequence";
+"RQB-bR-MC0.title" = "Séquence personnalisée pour cette fenêtre";
 
 /* Class = "NSTextFieldCell"; title = "Autotype Sequence"; ObjectID = "bQ5-0E-h3O"; */
-"bQ5-0E-h3O.title" = "Autotype Sequence";
+"bQ5-0E-h3O.title" = "Séquence de saisie automatique";
 
 /* Class = "NSTextFieldCell"; title = "Window Title"; ObjectID = "bkO-Bk-AuX"; */
-"bkO-Bk-AuX.title" = "Window Title";
+"bkO-Bk-AuX.title" = "Titre de la fenêtre";
 
 /* Class = "NSMenuItem"; title = "Delete"; ObjectID = "bke-G2-oEf"; */
-"bke-G2-oEf.title" = "Delete";
+"bke-G2-oEf.title" = "Supprimer";
 
 /* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "dyA-lo-PGa"; */
 "dyA-lo-PGa.title" = "Table View Cell";
@@ -102,13 +102,16 @@
 "ep5-bQ-cfZ.title" = "Text Cell";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Custom Window Sequence"; ObjectID = "fW9-9p-wwR"; */
-"fW9-9p-wwR.placeholderString" = "Custom Window Sequence";
+"fW9-9p-wwR.placeholderString" = "Séquence personnalisée pour cette fenêtre";
 
 /* Class = "NSTabViewItem"; label = "Autotype"; ObjectID = "hK7-Dx-yjH"; */
-"hK7-Dx-yjH.label" = "Autotype";
+"hK7-Dx-yjH.label" = "Saisie automatique";
 
 /* Class = "NSTextFieldCell"; title = "Window Associations"; ObjectID = "ned-1Q-FXA"; */
-"ned-1Q-FXA.title" = "Window Associations";
+"ned-1Q-FXA.title" = "Séquences personnalisées";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "sNS-o1-pD7"; */
 "sNS-o1-pD7.title" = "OtherViews";
+
+/* Class = "NSButtonCell"; title = "Obfuscate Autotype"; ObjectID = "oNq-kB-3eb"; */
+"oNq-kB-3eb.title" = "Dissimuler la saisie automatique (simule une saisie humaine)";
diff --git a/MacPass/fr.lproj/GeneralSettings.strings b/MacPass/fr.lproj/GeneralSettings.strings
index 165a6e3c..d6d97a05 100644
--- a/MacPass/fr.lproj/GeneralSettings.strings
+++ b/MacPass/fr.lproj/GeneralSettings.strings
@@ -52,3 +52,15 @@
 
 /* Class = "NSTextFieldCell"; title = "Lock while idle"; ObjectID = "806"; */
 "806.title" = "Verrouillage si inactif";
+
+/* Class = "NSButtonCell"; title = "Create new Database if activated"; ObjectID = "880"; */
+"880.title" = "Créer une nouvelle base de données si activé";
+
+/* Class = "NSTextFieldCell"; title = "Enabling this compromises security. If enabled, your preferences will contain mappings from database to keyfile. Key locations for databases without a password will not be saved."; ObjectID = "ACh-7H-42N"; */
+"ACh-7H-42N.title" = "Cocher cette case compromet la sécurité. Si activé, les associations base de données / fichiers clé seront enregistrées. La localisation des clés pour les bases de données sans mot de passe n'est pas sauvegardée.";
+
+/* Class = "NSButtonCell"; title = "Remember Keyfile for Databases"; ObjectID = "r6q-He-nYU"; */
+"r6q-He-nYU.title" = "Enregistrer la localisation des fichiers clé";
+
+/* Class = "NSButtonCell"; title = "Clear all stored locations"; ObjectID = "8Ri-2s-c39"; */
+"8Ri-2s-c39.title" = "Effacer les localisations stockées";
diff --git a/MacPass/fr.lproj/GroupInspectorView.strings b/MacPass/fr.lproj/GroupInspectorView.strings
index eb3898e5..c67661a7 100644
--- a/MacPass/fr.lproj/GroupInspectorView.strings
+++ b/MacPass/fr.lproj/GroupInspectorView.strings
@@ -1,9 +1,9 @@
 
 /* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "25"; */
-"25.title" = "Name";
+"25.title" = "Nom";
 
 /* Class = "NSButtonCell"; title = "Expires"; ObjectID = "32"; */
-"32.title" = "Expires";
+"32.title" = "Expiration";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "231"; */
 "231.title" = "OtherViews";
@@ -12,7 +12,7 @@
 "243.title" = "OtherViews";
 
 /* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
-"265.title" = "Search";
+"265.title" = "Rechercher";
 
 /* Class = "NSTextFieldCell"; title = "Autotype"; ObjectID = "277"; */
-"277.title" = "Autotype";
+"277.title" = "Saisie automatique";
diff --git a/MacPass/fr.lproj/IconSelection.strings b/MacPass/fr.lproj/IconSelection.strings
index 42b0eae2..b209734a 100644
--- a/MacPass/fr.lproj/IconSelection.strings
+++ b/MacPass/fr.lproj/IconSelection.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Use Default Icon"; ObjectID = "102"; */
-"102.title" = "Use Default Icon";
+"102.title" = "Utiliser l'icône par défaut";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "1kM-cI-P1o"; */
-"1kM-cI-P1o.title" = "Cancel";
+"1kM-cI-P1o.title" = "Annuler";
diff --git a/MacPass/fr.lproj/InspectorView.strings b/MacPass/fr.lproj/InspectorView.strings
index 7797fb19..01ba097f 100644
--- a/MacPass/fr.lproj/InspectorView.strings
+++ b/MacPass/fr.lproj/InspectorView.strings
@@ -67,3 +67,9 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "2049"; */
 "2049.placeholderString" = "Titre";
+
+/* Class = "NSTabViewItem"; label = "NoSelection"; ObjectID = "2974"; */
+"2974.label" = "Pas de sélection";
+
+/* Class = "NSTextFieldCell"; title = "No Selection"; ObjectID = "2986"; */
+"2986.title" = "Pas de sélection";
diff --git a/MacPass/fr.lproj/IntegrationSettings.strings b/MacPass/fr.lproj/IntegrationSettings.strings
index 33d259d6..d6ad534b 100644
--- a/MacPass/fr.lproj/IntegrationSettings.strings
+++ b/MacPass/fr.lproj/IntegrationSettings.strings
@@ -3,22 +3,40 @@
 "3.title" = "Enable KeePassHttp server";
 
 /* Class = "NSButtonCell"; title = "Enable global Autotype"; ObjectID = "1qb-Rd-jYu"; */
-"1qb-Rd-jYu.title" = "Enable global Autotype";
+"1qb-Rd-jYu.title" = "Activer la saisie automatique";
 
 /* Class = "NSTextFieldCell"; title = "Shortcut"; ObjectID = "6oN-CH-T0O"; */
-"6oN-CH-T0O.title" = "Shortcut";
+"6oN-CH-T0O.title" = "Raccourci";
 
 /* Class = "NSButtonCell"; title = "Enabel Quicklook Preview"; ObjectID = "ERs-ct-Eyx"; */
-"ERs-ct-Eyx.title" = "Enable Quicklook Preview";
+"ERs-ct-Eyx.title" = "Autoriser la prévisualisation coup d'œil";
 
 /* Class = "NSBox"; title = "Keepass HTTP"; ObjectID = "KbH-0Q-5Tw"; */
 "KbH-0Q-5Tw.title" = "Keepass HTTP";
 
 /* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
-"P9N-HM-wER.title" = "Autotype";
+"P9N-HM-wER.title" = "Saisie automatique";
 
 /* Class = "NSBox"; title = "Preview"; ObjectID = "VVs-b5-cX9"; */
-"VVs-b5-cX9.title" = "Preview";
+"VVs-b5-cX9.title" = "Prévisualisation";
 
-/* Class = "NSTextFieldCell"; title = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed."; ObjectID = "WmI-IB-Aso"; */
-"WmI-IB-Aso.title" = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed.";
+/* Class = "NSTextFieldCell"; title = "If enabled attached files will be copied to a temporary location for preview and deleted after the preview is closed."; ObjectID = "WmI-IB-Aso"; */
+"WmI-IB-Aso.title" = "Si activé les fichiers joints seront copiés dans une localisation temporaire pour la prévisualisation puis supprimés quand la fenêtre sera fermée. Il s'agit d'un risque de sécurité potentiel !";
+
+/* Class = "NSButtonCell"; title = "Interpret ⌃ as ⌘"; ObjectID = "QfO-yG-l3F"; */
+"QfO-yG-l3F.title" = "Interpréter ⌃ en ⌘";
+
+/* Class = "NSTextFieldCell"; title = "If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to."; ObjectID = "QRy-CY-ENC"; */
+"QRy-CY-ENC.title" = "Si activé, chaque commande {CONTROL} sera envoyée comme ⌘. Ne décochez que si vous êtes sûr d'en avoir besoin.";
+
+/* Class = "NSButtonCell"; title = "Include Host for matches"; ObjectID = "B1D-j9-L8x"; */
+"B1D-j9-L8x.title" = "Inclure l'hôte pour la correspondance";
+
+/* Class = "NSButtonCell"; title = "Include URL for matches"; ObjectID = "TzR-00-Vp3"; */
+"TzR-00-Vp3.title" = "Inclure l'URL pour la correspondance";
+
+/* Class = "NSButtonCell"; title = "Include Tags for matches"; ObjectID = "rbu-G7-MT8"; */
+"rbu-G7-MT8.title" = "Inclure les Tags pour la correspondance";
+
+/* Class = "NSButtonCell"; title = "Include Title for matches"; ObjectID = "tmL-dT-D0G"; */
+"tmL-dT-D0G.title" = "Inclure le titre pour la correspondance";
diff --git a/MacPass/fr.lproj/KPKLocalizable.strings b/MacPass/fr.lproj/KPKLocalizable.strings
index c928e4fe..37926e2c 100644
--- a/MacPass/fr.lproj/KPKLocalizable.strings
+++ b/MacPass/fr.lproj/KPKLocalizable.strings
@@ -1,4 +1,4 @@
-/* 
+/*
   KPKLocalizable.strings
   MacPass
 
@@ -11,27 +11,27 @@
 "KPK_ENTRY_COPY_%@" = "%@ copy";
 
 /* Validation Errors */
-"ERROR_WINDOW_TITLE_VALIDATION_FAILED" = "The Format of the Window Title is not valid!";
-"ERROR_ATTRIBUTE_KEY_VALIDATION_FAILED" = "The Attribute Key is not unique!";
-"ERROR_AUTOTYPE_SEQUENCE_VALIDATION_FAILED" = "Tht Autotype Sequence is not valid!";
+"ERROR_WINDOW_TITLE_VALIDATION_FAILED" = "Le format du titre de la fenêtre n'est pas valide !";
+"ERROR_ATTRIBUTE_KEY_VALIDATION_FAILED" = "La clé d'attribut n'est pas unique";
+"ERROR_AUTOTYPE_SEQUENCE_VALIDATION_FAILED" = "La séquence de saisie automatique n'est pas valide !";
 
 /* Errors */
-"ERROR_KEYFILE_NO_KEY_XML_ELEMENT" = "Fichier de clef XML ne contenant pas d'élément Clef";
-"ERROR_UNSUPPORTED_DATABASER_VERSION" = "Version de la base de données non pris en charge";
-"ERROR_INVALID_FIELD_TYPE" = "Unknown data field. Password wrong?";
-"ERROR_UNSUPPORTED_CHIPHER" = "ID de chiffrement non pris en charge";
-"ERROR_UNSUPPORTED_CHIPHER" = "Unsupported chipher algorithm";
+"ERROR_CORRUPT_TREE" = "La structure interne du fichier est corrompue !";
+"ERROR_INVALID_FIELD_SIZE" = "Taille incorrecte dans le champ. Mauvais mot de passe ?";
+"ERROR_INVALID_FIELD_TYPE" = "Champ inconnu. Mauvais mot de passe ?";
+"ERROR_UNSUPPORTED_DATABASER_VERSION" = "Version de la base de données non prise en charge";
+"ERROR_UNSUPPORTED_CHIPHER" = "Algorithme de chiffrement non pris en charge";
 "ERROR_UNKNOWN_FILE_FORMAT" = "Format de fichier inconnu";
-"ERROR_HEADER_CORRUPTED" = "En-tête de fichier corrompu";
+"ERROR_HEADER_CORRUPTED" = "En-tête de fichier corrompue";
 "ERROR_UNSUPPORTED_KDBX_COMPRESSION_ALGORITHM" = "Algorithme de compression non pris en charge";
 "ERROR_UNSUPPORTED_KDBX_RANDOM_STREAM" = "Type de flux aléatoire non pris en charge";
-"ERROR_INTEGRITY_CHECK_FAILED" = "L'intégrité de la base de données n'est pas assurée. Vous pouvez essayer de réparer la base.";
-"ERROR_PASSWORD_OR_KEYFILE_WRONG" = "Muavis mot de passe et/ou fichier de clef";
+"ERROR_INTEGRITY_CHECK_FAILED" = "L'intégrité de la base de données n'est pas assurée";
+"ERROR_PASSWORD_OR_KEYFILE_WRONG" = "Mauvais mot de passe et/ou fichier clé";
 "ERROR_KEEPASSFILE_ELEMENT_MISSING" = "Le fichier XML ne contient pas d'élément KeePassFile";
 "ERROR_ROOT_ELEMENT_MISSING" = "Le fichier XML ne contient pas de node root";
 "ERROR_GROUP_ELEMENT_MISSING" = "Le fichier XML ne contient pas de node Groupe";
-"ERROR_HEADER_HASH_MISSMATCH" = "La table de hashage de l'en-tête ne corresponds pas. Fichier corrompu";
-"ERROR_XML_KEYFILE_WITHOUT_KEY_ELEMENT" = "Le fichier XML ne contient pas d'élément clef";
-"ERROR_XML_KEYFILE_WITHOUT_DATA_ELEMENT" = "Le champ XML de clef ne contient pas d'élément de données";
-"ERROR_XML_KEYFILE_DATA_PARSING_ERROR" = "Impossible de lire les données du fichier XML de clef";
-"ERROR_HEADER_HASH_VERIFICATION_FAILED" = "The database header hash is wrong. Data integritiy might be broken!";
+"ERROR_HEADER_HASH_MISSMATCH" = "Le hash de l'en-tête ne correspond pas. Fichier corrompu";
+"ERROR_XML_KEYFILE_WITHOUT_KEY_ELEMENT" = "Le fichier XML ne contient pas d'élément clé";
+"ERROR_XML_KEYFILE_WITHOUT_DATA_ELEMENT" = "Le fichier clé XML ne contient pas d'élément de données";
+"ERROR_XML_KEYFILE_DATA_PARSING_ERROR" = "Impossible de lire les données du fichier clé XML";
+"ERROR_HEADER_HASH_VERIFICATION_FAILED" = "Le hash de l'en-tête n'est pas bon. Les données peuvent être corrompues !";
diff --git a/MacPass/fr.lproj/Localizable.strings b/MacPass/fr.lproj/Localizable.strings
index da027159..776412b5 100644
Binary files a/MacPass/fr.lproj/Localizable.strings and b/MacPass/fr.lproj/Localizable.strings differ
diff --git a/MacPass/fr.lproj/MainMenu.strings b/MacPass/fr.lproj/MainMenu.strings
index 892cceed..9ba4b332 100644
--- a/MacPass/fr.lproj/MainMenu.strings
+++ b/MacPass/fr.lproj/MainMenu.strings
@@ -129,7 +129,7 @@
 "492.title" = "Aide de MacPass";
 
 /* Class = "NSMenuItem"; title = "Toggle Inspector"; ObjectID = "1181"; */
-"1181.title" = "Afficher Inspecteur";
+"1181.title" = "Afficher l'inspecteur";
 
 /* Class = "NSMenuItem"; title = "Show Password Creator"; ObjectID = "1200"; */
 "1200.title" = "Afficher créateur de mot de passe";
@@ -139,3 +139,33 @@
 
 /* Class = "NSMenuItem"; title = "Database Settings…"; ObjectID = "1231"; */
 "1231.title" = "Paramètres de la base de données…";
+
+/* Class = "NSMenuItem"; title = "Save As…"; ObjectID = "1243"; */
+"1243.title" = "Sauvegarder sous…";
+
+/* Class = "NSMenuItem"; title = "Export As XML…"; ObjectID = "1259"; */
+"1259.title" = "Exporter en XML…";
+
+/* Class = "NSMenuItem"; title = "Lock"; ObjectID = "1261"; */
+"1261.title" = "Verrouiller";
+
+/* Class = "NSMenuItem"; title = "Focus Entries"; ObjectID = "2VP-vB-IeX"; */
+"2VP-vB-IeX.title" = "Sélectionner les entrées";
+
+/* Class = "NSMenuItem"; title = "Focus Groups"; ObjectID = "HxM-dV-LIH"; */
+"HxM-dV-LIH.title" = "Sélectionner les groupes";
+
+/* Class = "NSMenuItem"; title = "Focus Inspector"; ObjectID = "Zje-Me-5c8"; */
+"Zje-Me-5c8.title" = "Sélectionner l'inspecteur";
+
+/* Class = "NSMenuItem"; title = "Quicklook"; ObjectID = "aVO-9F-Lwc"; */
+"aVO-9F-Lwc.title" = "Coup d'œil";
+
+/* Class = "NSMenuItem"; title = "Fix Autotype…"; ObjectID = "nx7-Vf-LiD"; */
+"nx7-Vf-LiD.title" = "Réparer la saisie automatique…";
+
+/* Class = "NSMenuItem"; title = "Import XML…"; ObjectID = "rW0-r1-QYL"; */
+"rW0-r1-QYL.title" = "Importer un fichier XML…";
+
+/* Class = "NSMenuItem"; title = "Check for Updates…"; ObjectID = "zMO-8r-g5v"; */
+"zMO-8r-g5v.title" = "Vérifier les mises à jour…";
diff --git a/MacPass/fr.lproj/PasswordCreatorView.strings b/MacPass/fr.lproj/PasswordCreatorView.strings
index 0c97735e..104273b9 100644
--- a/MacPass/fr.lproj/PasswordCreatorView.strings
+++ b/MacPass/fr.lproj/PasswordCreatorView.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "149"; */
-"149.title" = "Password:";
+"149.title" = "Mot de passe :";
 
 /* Class = "NSTextFieldCell"; title = "Length:"; ObjectID = "179"; */
-"179.title" = "Length:";
+"179.title" = "Longueur :";
 
 /* Class = "NSBox"; title = "Allowed Characters"; ObjectID = "332"; */
-"332.title" = "Allowed Characters";
+"332.title" = "Cacactères autorisés";
 
 /* Class = "NSButtonCell"; title = "A-Z"; ObjectID = "453"; */
 "453.title" = "A-Z";
@@ -21,19 +21,25 @@
 "465.title" = "#!?";
 
 /* Class = "NSButtonCell"; title = "Custom"; ObjectID = "469"; */
-"469.title" = "Custom";
+"469.title" = "Personnalisé";
 
 /* Class = "NSButtonCell"; title = "Use Password"; ObjectID = "495"; */
-"495.title" = "Use Password";
+"495.title" = "Utiliser le mot de passe";
 
 /* Class = "NSButtonCell"; title = "Copy password to pasteboard"; ObjectID = "501"; */
-"501.title" = "Copy password to pasteboard";
+"501.title" = "Copier le mot de passe";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "614"; */
-"614.title" = "Cancel";
+"614.title" = "Annuler";
 
 /* Class = "NSTextFieldCell"; title = "Entropy:"; ObjectID = "647"; */
-"647.title" = "Entropy:";
+"647.title" = "Entropie :";
 
 /* Class = "NSTextFieldCell"; title = "25000 bit"; ObjectID = "653"; */
 "653.title" = "25000 bit";
+
+/* Class = "NSButtonCell"; title = "Set Default"; ObjectID = "Wvs-Md-Ob8"; */
+"Wvs-Md-Ob8.title" = "Utiliser par défaut";
+
+/* Class = "NSButtonCell"; title = "Use default only for selected entry"; ObjectID = "cfZ-5F-Nge"; */
+"cfZ-5F-Nge.title" = "Utiliser par défaut uniquement pour l'entrée sélectionnée";
diff --git a/MacPass/fr.lproj/PasswordEditWindow.strings b/MacPass/fr.lproj/PasswordEditWindow.strings
index 17b9aeda..1f97ddea 100644
--- a/MacPass/fr.lproj/PasswordEditWindow.strings
+++ b/MacPass/fr.lproj/PasswordEditWindow.strings
@@ -3,28 +3,28 @@
 "1.title" = "Window";
 
 /* Class = "NSTextFieldCell"; title = "Missmatching Passwords"; ObjectID = "14"; */
-"14.title" = "Missmatching Passwords";
+"14.title" = "Les mots de passe ne correspondent pas";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat Password"; ObjectID = "15"; */
-"15.placeholderString" = "Repeat Password";
+"15.placeholderString" = "Répéter le mot de passe";
 
 /* Class = "NSTextFieldCell"; title = "Repeat:"; ObjectID = "16"; */
-"16.title" = "Repeat:";
+"16.title" = "Répétition :";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Enter Password"; ObjectID = "18"; */
-"18.placeholderString" = "Enter Password";
+"18.placeholderString" = "Entrer le mot de passe";
 
 /* Class = "NSButtonCell"; title = "Generate Keyfile"; ObjectID = "21"; */
-"21.title" = "Generate Keyfile";
+"21.title" = "Générer fichier clé";
 
 /* Class = "NSTextFieldCell"; title = "Keyfile:"; ObjectID = "22"; */
-"22.title" = "Keyfile:";
+"22.title" = "Fichier clé :";
 
 /* Class = "NSButtonCell"; title = "Change Password"; ObjectID = "69"; */
-"69.title" = "Change Password";
+"69.title" = "Modifier mot de passe";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "73"; */
-"73.title" = "Cancel";
+"73.title" = "Annuler";
 
 /* Class = "NSButtonCell"; title = "Password:"; ObjectID = "OQz-DA-SoY"; */
-"OQz-DA-SoY.title" = "Password:";
+"OQz-DA-SoY.title" = "Mot de passe :";
diff --git a/MacPass/fr.lproj/PasswordInputView.strings b/MacPass/fr.lproj/PasswordInputView.strings
index 859ad233..cc291a4a 100644
--- a/MacPass/fr.lproj/PasswordInputView.strings
+++ b/MacPass/fr.lproj/PasswordInputView.strings
@@ -3,7 +3,7 @@
 "3.title" = "Déverrouiller";
 
 /* Class = "NSTextFieldCell"; title = "Keyfile"; ObjectID = "18"; */
-"18.title" = "Clef";
+"18.title" = "Clé";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "IU9-5u-jn9"; */
 "IU9-5u-jn9.title" = "Mot de passe";
diff --git a/MacPass/fr.lproj/PluginSettings.strings b/MacPass/fr.lproj/PluginSettings.strings
new file mode 100644
index 00000000..c536c89d
--- /dev/null
+++ b/MacPass/fr.lproj/PluginSettings.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSTextFieldCell"; title = "If enabled, only properly signed Plugins will be loaded. Keep in mind, that Plugins have full access to your data! Changes take affect on restart."; ObjectID = "2bX-8S-9XM"; */
+"2bX-8S-9XM.title" = "Si activé, seul les plugins signés correctement seront chargés. Souvenez-vous que les plugins ont un accès complet à vos données ! Les changements prendront effet après un redémarrage.";
+
+/* Class = "NSButtonCell"; title = "Load unsecure Plugins"; ObjectID = "C4B-6z-ZqX"; */
+"C4B-6z-ZqX.title" = "Charger les plugins non sécurisés";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "STt-PQ-Szr"; */
+"STt-PQ-Szr.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "fug-79-n9g"; */
+"fug-79-n9g.title" = "Table View Cell";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "vBs-Ga-aq0"; */
+"vBs-Ga-aq0.title" = "Box";
diff --git a/MacPass/fr.lproj/UpdateSettings.strings b/MacPass/fr.lproj/UpdateSettings.strings
index 66a60c59..96183ea4 100644
--- a/MacPass/fr.lproj/UpdateSettings.strings
+++ b/MacPass/fr.lproj/UpdateSettings.strings
@@ -1,21 +1,21 @@
 
 /* Class = "NSMenuItem"; title = "every Week"; ObjectID = "3FR-Va-iau"; */
-"3FR-Va-iau.title" = "every Week";
+"3FR-Va-iau.title" = "toutes les semaines";
 
 /* Class = "NSTextFieldCell"; title = "Check for Updates"; ObjectID = "9tL-CA-Vdg"; */
-"9tL-CA-Vdg.title" = "Check for Updates";
+"9tL-CA-Vdg.title" = "Vérifier les mises à jour";
 
 /* Class = "NSMenuItem"; title = "every Hour"; ObjectID = "DjF-1I-6Nq"; */
-"DjF-1I-6Nq.title" = "every Hour";
+"DjF-1I-6Nq.title" = "toutes les heures";
 
 /* Class = "NSButtonCell"; title = "Automatically Check for Updates"; ObjectID = "RFg-q1-AwJ"; */
-"RFg-q1-AwJ.title" = "Automatically Check for Updates";
+"RFg-q1-AwJ.title" = "Vérifier automatiquement les mises à jour";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "RKd-H8-eCF"; */
 "RKd-H8-eCF.title" = "OtherViews";
 
 /* Class = "NSMenuItem"; title = "every Month"; ObjectID = "Uo3-kv-1ro"; */
-"Uo3-kv-1ro.title" = "every Month";
+"Uo3-kv-1ro.title" = "tous les mois";
 
 /* Class = "NSMenuItem"; title = "every Day"; ObjectID = "o9E-hk-H1T"; */
-"o9E-hk-H1T.title" = "every Day";
+"o9E-hk-H1T.title" = "tous les jours";
diff --git a/MacPass/fr.lproj/WelcomeWindow.strings b/MacPass/fr.lproj/WelcomeWindow.strings
index ab104467..01d9171c 100644
--- a/MacPass/fr.lproj/WelcomeWindow.strings
+++ b/MacPass/fr.lproj/WelcomeWindow.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSWindow"; title = "Welcome"; ObjectID = "1"; */
-"1.title" = "Welcome";
+"1.title" = "Bienvenue";
 
 /* Class = "NSTextFieldCell"; title = "Welcome to MacPass"; ObjectID = "24"; */
-"24.title" = "Welcome to MacPass";
+"24.title" = "Bienvenue dans MacPass";
 
 /* Class = "NSButtonCell"; title = "Open Database…"; ObjectID = "44"; */
-"44.title" = "Open Database…";
+"44.title" = "Ouvrir une base de données…";
 
 /* Class = "NSButtonCell"; title = "Create new Database"; ObjectID = "48"; */
-"48.title" = "Create new Database";
+"48.title" = "Créer une nouvelle base de données";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "70"; */
-"70.title" = "Cancel";
+"70.title" = "Annuler";
diff --git a/MacPass/fr.lproj/WorkflowSettings.strings b/MacPass/fr.lproj/WorkflowSettings.strings
index 56e8924f..cf6e6753 100644
--- a/MacPass/fr.lproj/WorkflowSettings.strings
+++ b/MacPass/fr.lproj/WorkflowSettings.strings
@@ -1,33 +1,33 @@
 
 /* Class = "NSBox"; title = "Entry Table"; ObjectID = "2"; */
-"2.title" = "Entry Table";
+"2.title" = "Liste des entrées";
 
 /* Class = "NSTextFieldCell"; title = "Double-click on URL:"; ObjectID = "10"; */
-"10.title" = "Double-click on URL:";
+"10.title" = "Double clic sur l'URL :";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "15"; */
 "15.title" = "OtherViews";
 
 /* Class = "NSMenuItem"; title = "Copies URL"; ObjectID = "16"; */
-"16.title" = "Copies URL";
+"16.title" = "Copie l'URL";
 
 /* Class = "NSMenuItem"; title = "Opens URL"; ObjectID = "17"; */
-"17.title" = "Opens URL";
+"17.title" = "Ouvre l'URL";
 
 /* Class = "NSTextFieldCell"; title = "Double-click on Title:"; ObjectID = "37"; */
-"37.title" = "Double-click on Title:";
+"37.title" = "Double clic sur le titre :";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "42"; */
 "42.title" = "OtherViews";
 
 /* Class = "NSMenuItem"; title = "Is Ignored"; ObjectID = "43"; */
-"43.title" = "Is Ignored";
+"43.title" = "Est ignoré";
 
 /* Class = "NSMenuItem"; title = "Opens Inspector"; ObjectID = "44"; */
-"44.title" = "Opens Inspector";
+"44.title" = "Ouvre l'inspecteur";
 
 /* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
-"7YX-EA-9KA.title" = "Default Browser";
+"7YX-EA-9KA.title" = "Navigateur par défaut";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
 "XgO-Tj-QjO.title" = "OtherViews";
@@ -36,7 +36,7 @@
 "gej-kA-GzQ.title" = "Item 2";
 
 /* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
-"soD-wI-YOH.title" = "Open URLs in:";
+"soD-wI-YOH.title" = "Ouvrir les URLs dans :";
 
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
 "zC2-cM-KDv.title" = "Item 3";