diff --git a/translations/fr.qm b/translations/fr.qm
index cba6869e9..fb2d8221c 100644
Binary files a/translations/fr.qm and b/translations/fr.qm differ
diff --git a/translations/fr.ts b/translations/fr.ts
index d18f9b982..80fcc4b29 100644
--- a/translations/fr.ts
+++ b/translations/fr.ts
@@ -44,47 +44,47 @@
         <translation>qTox</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="38"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="78"/>
         <source>Video Settings</source>
         <translation>Options vidéo</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="49"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="89"/>
         <source>Resolution</source>
         <translation>Résolution</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="148"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="41"/>
         <source>Volume Settings (Stubs)</source>
         <translation>Options du volume (Fictif)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="154"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="54"/>
         <source>Playback</source>
         <translation>Haut-parleurs</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="168"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="47"/>
         <source>Microphone</source>
         <translation>Microphone</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="66"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="106"/>
         <source>Hue</source>
         <translation>Teinte</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="80"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="120"/>
         <source>Brightness</source>
         <translation>Luminosité</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="94"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="134"/>
         <source>Saturation</source>
         <translation>Saturation</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="108"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="148"/>
         <source>Contrast</source>
         <translation>Contraste</translation>
     </message>
@@ -187,7 +187,12 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="106"/>
+        <location filename="../src/widget/form/chatform.cpp" line="62"/>
+        <source>Load History...</source>
+        <translation>Charger l&apos;historique...</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/chatform.cpp" line="113"/>
         <source>Send a file</source>
         <translation>Envoyer un fichier</translation>
     </message>
@@ -206,25 +211,103 @@
 <context>
     <name>Core</name>
     <message>
-        <location filename="../src/core.cpp" line="231"/>
+        <location filename="../src/core.cpp" line="239"/>
         <source>Toxing on qTox</source>
         <translation>Toxer avec qTox</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="232"/>
+        <location filename="../src/core.cpp" line="240"/>
         <source>qTox User</source>
         <translation>Utilisateur de qTox</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1106"/>
-        <source>Encrypted profile</source>
-        <translation>Profil chiffré</translation>
+        <location filename="../src/core.cpp" line="1107"/>
+        <location filename="../src/core.cpp" line="1127"/>
+        <source>Tox datafile decryption password</source>
+        <translation>Mot de passe des données Tox</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1109"/>
+        <location filename="../src/core.cpp" line="1129"/>
+        <location filename="../src/core.cpp" line="1142"/>
+        <location filename="../src/core.cpp" line="1178"/>
+        <source>Password error</source>
+        <translation>Mod de passe invalide</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1109"/>
+        <location filename="../src/core.cpp" line="1129"/>
+        <location filename="../src/core.cpp" line="1178"/>
+        <source>Failed to setup password.
+Empty password.</source>
+        <translation>Impossible de mettre ne place le mot de passe.
+Le mot de passe est vide.</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1138"/>
+        <source>Try Again</source>
+        <translation>Réessayer</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1139"/>
+        <source>Change profile</source>
+        <translation>Changer de profil</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1140"/>
+        <source>Reinit current profile</source>
+        <translation>Réinitialiser le profil courant</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1143"/>
+        <source>Wrong password has been entered</source>
+        <translation>Un mauvais mot de passe à été entré</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1176"/>
+        <source>History Log decpytion password</source>
+        <translation>Mot de passe de l&apos;historique</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1183"/>
+        <source>Encrypted log</source>
+        <translation>Historique chiffré</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1184"/>
+        <source>Your history encrypted with different password
+Do you want to try another password?</source>
+        <translation>Votre historique est chiffré avec un mot de passe différent
+Voulez-vous essayer un autre mot de passe?</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1192"/>
+        <source>Loggin</source>
+        <translation>Historique</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1192"/>
+        <source>Due to incorret password logging will be disabled</source>
+        <translation>À cause d&apos;un mauvais mot de passe, l&apos;historique sera désactivé</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1279"/>
+        <source>NO Password</source>
+        <translation>PAS de mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1279"/>
+        <source>Will be saved without encryption!</source>
+        <translation>L&apos;historique sera sauvegardé sans être chiffré!</translation>
+    </message>
+    <message>
+        <source>Encrypted profile</source>
+        <translation type="vanished">Profil chiffré</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1107"/>
         <source>Your tox profile seems to be encrypted, qTox can&apos;t open it
 Do you want to erase this profile ?</source>
-        <translation>Votre profil tox semble être chiffré, qTox ne peut pas l&apos;ouvrir
+        <translation type="vanished">Votre profil tox semble être chiffré, qTox ne peut pas l&apos;ouvrir
 Voulez-vous effacer ce profil ?</translation>
     </message>
 </context>
@@ -424,7 +507,7 @@ Voulez-vous effacer ce profil ?</translation>
         <translation>qTox</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="29"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="53"/>
         <source>General Settings</source>
         <translation>Options Générales</translation>
     </message>
@@ -434,95 +517,105 @@ Voulez-vous effacer ce profil ?</translation>
         <translation type="obsolete">Utiliser les traductions</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="37"/>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="53"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="61"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="77"/>
         <source>The translation may not load until qTox restarts.</source>
         <translation>La translation peut ne pas se charger jusqu&apos;à ce que qTox redémarre.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="40"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="64"/>
         <source>Translation:</source>
         <translation>Traduction:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="62"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="86"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <extracomment>describes makeToxPortable checkbox</extracomment>
         <translation>Sauvegarde les options dans le dossier courant au lieu du dossier de configuration habituel</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="65"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="89"/>
         <source>Make Tox portable</source>
         <translation>Rendre Tox portable</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="72"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="96"/>
         <source>Start in tray</source>
         <translation>Démarrer dans la barre d&apos;état</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="79"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="103"/>
+        <source>Close to tray</source>
+        <translation>Fermer dans la barre d&apos;état</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="110"/>
+        <source>Minimize to tray</source>
+        <translation>Minimizer dans la barre d&apos;état</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="117"/>
         <source>Show contacts&apos; status changes</source>
         <translation>Montrer les changements de status des contacts</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="88"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="126"/>
         <source>Provided in minutes</source>
         <translation>En minutes</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="94"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="132"/>
         <source>Auto away after (0 to disable):</source>
         <translation>Auto-absent après (0 pour désactiver):</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="107"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="145"/>
         <source>Set to 0 to disable</source>
         <translation>Mettre à 0 pour désactiver</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="113"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="151"/>
         <source> minutes</source>
         <translation> minutes</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="131"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="169"/>
         <source>Theme</source>
         <translation>Thème</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="139"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="177"/>
         <source>Smiley Pack:</source>
         <extracomment>Text on smiley pack label</extracomment>
         <translation>Pack de smileys:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="160"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="201"/>
         <source>:)</source>
         <translation>:)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="170"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="211"/>
         <source>;)</source>
         <translation>:)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="180"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="221"/>
         <source>:p</source>
         <translation>:p</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="190"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="231"/>
         <source>:O</source>
         <translation>:O</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="200"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="241"/>
         <source>:&apos;(</source>
         <translation>:&apos;(</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="214"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="255"/>
         <source>Style:</source>
         <translation>Style:</translation>
     </message>
@@ -532,41 +625,41 @@ Voulez-vous effacer ce profil ?</translation>
         <translation type="obsolete">Pack de smileys</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="236"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="277"/>
         <source>Connection Settings</source>
         <translation>Options de réseau</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="242"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="289"/>
         <source>Enable IPv6 (recommended)</source>
         <extracomment>Text on a checkbox to enable IPv6</extracomment>
         <translation>Activer IPv6 (recommandé)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="249"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="296"/>
         <source>This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</source>
         <extracomment>force tcp checkbox tooltip</extracomment>
         <translation>Permet par exemple d&apos;utiliser Tox à travers Tor, mais ce n&apos;est à utiliser que si nécessaire, car cela ralenti le réseau Tox.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="252"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="299"/>
         <source>Disable UDP (not recommended)</source>
         <extracomment>Text on checkbox to disable UDP</extracomment>
         <translation>Désactiver UDP (non recommandé)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="259"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="306"/>
         <source>Use proxy (SOCKS5)</source>
         <translation>Utiliser un proxy (SOCKS5)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="268"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="318"/>
         <source>Address</source>
         <extracomment>Text on proxy addr label</extracomment>
         <translation>Addresse</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="278"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="328"/>
         <source>Port</source>
         <extracomment>Text on proxy port label</extracomment>
         <translation>Port</translation>
@@ -575,16 +668,61 @@ Voulez-vous effacer ce profil ?</translation>
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="150"/>
-        <location filename="../src/widget/form/genericchatform.cpp" line="156"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="56"/>
+        <source>Send message</source>
+        <translation>Envoyer un message</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="58"/>
+        <source>Smileys</source>
+        <translation>Emoticones</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="62"/>
+        <source>Send a file</source>
+        <translation>Envoyer un fichier</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="65"/>
+        <source>Audio call</source>
+        <translation>Appel audio</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="68"/>
+        <source>Video call</source>
+        <translation>Appel vidéo</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="71"/>
+        <source>Toggle speakers volume</source>
+        <translation>Couper les haut parleurs</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="74"/>
+        <source>Toggle microphone</source>
+        <translation>Couper le microphone</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="133"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="173"/>
         <source>Save chat log</source>
         <translation>Sauvegarder l&apos;historique de conversation</translation>
     </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="134"/>
+        <source>Clear displayed messages</source>
+        <translation>Effacer les messages affichés</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="253"/>
+        <source>Cleared</source>
+        <translation>Effacé</translation>
+    </message>
 </context>
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../src/widget/form/groupchatform.cpp" line="45"/>
+        <location filename="../src/widget/form/groupchatform.cpp" line="49"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 personnes</translation>
@@ -594,7 +732,7 @@ Voulez-vous effacer ce profil ?</translation>
         <translation type="vanished">&lt;Inconnu&gt;</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/groupchatform.cpp" line="77"/>
+        <location filename="../src/widget/form/groupchatform.cpp" line="85"/>
         <source>%1 users in chat</source>
         <translation>%1 personnes</translation>
     </message>
@@ -627,108 +765,108 @@ Voulez-vous effacer ce profil ?</translation>
 <context>
     <name>IdentityForm</name>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="34"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="35"/>
         <source>Identity</source>
         <translation>Identité</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="112"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="113"/>
         <source>Call active</source>
         <comment>popup title</comment>
         <translation>Appel en cours</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="113"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="114"/>
         <source>You can&apos;t switch profiles while a call is active!</source>
         <comment>popup text</comment>
         <translation>Vous ne pouvez pas changer de profil quand un appel est en cours!</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="123"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="124"/>
         <source>Rename &quot;%1&quot;</source>
         <comment>renaming a profile</comment>
         <translation>Renommer &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="131"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="132"/>
         <source>Profile already exists</source>
         <comment>rename confirm title</comment>
         <translation>Ce profil existe déjà</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="132"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="133"/>
         <source>A profile named &quot;%1&quot; already exists. Do you want to erase it?</source>
         <comment>rename confirm text</comment>
         <translation>Un profil appelé &quot;%1&quot; existe déjà. Voulez-vous le supprimer ?</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="145"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="147"/>
         <source>Export profile</source>
         <comment>save dialog title</comment>
         <translation>Exporter le profil</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="147"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="149"/>
         <source>Tox save file (*.tox)</source>
         <comment>save dialog filter</comment>
         <translation>Fichier sauvegarde Tox (*.tox)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="156"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="158"/>
         <source>Profile currently loaded</source>
         <comment>current profile deletion warning title</comment>
         <translation>Profil en cours d&apos;utilisation</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="156"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="158"/>
         <source>This profile is currently in use. Please load a different profile before deleting this one.</source>
         <comment>current profile deletion warning text</comment>
         <translation>Ce profil est en cours d&apos;utilisation. Merci de choisir un autre profil avant de supprimer celui-ci.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="160"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="162"/>
         <source>Deletion imminent!</source>
         <comment>deletion confirmation title</comment>
         <translation>Suppression imminente!</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="161"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="163"/>
         <source>Are you sure you want to delete this profile?</source>
         <comment>deletion confirmation text</comment>
         <translation>Êtes-vous sur de vouloir supprimer ce profil ?</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="172"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="174"/>
         <source>Import profile</source>
         <comment>import dialog title</comment>
         <translation>Importer un profil</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="172"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="174"/>
         <source>Tox save file (*.tox)</source>
         <comment>import dialog filter</comment>
         <translation>Fichier sauvegarde Tox (*.tox)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="181"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="183"/>
         <source>Ignoring non-Tox file</source>
         <comment>popup title</comment>
         <translation>Fichier non-Tox ignoré</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="181"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="183"/>
         <source>Warning: you&apos;ve chosen a file that is not a Tox save file; ignoring.</source>
         <comment>popup text</comment>
         <translation>Attention: Vous avez sélectionné un fichier qui n&apos;est pas une sauvegarde Tox: il sera ignoré.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="185"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="187"/>
         <source>Profile already exists</source>
         <comment>import confirm title</comment>
         <translation>Ce profil existe déjà</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="186"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="188"/>
         <source>A profile named &quot;%1&quot; already exists. Do you want to erase it?</source>
         <comment>import confirm text</comment>
         <translation>Un profil appelé &quot;%1&quot; existe déjà. Voulez-vous le supprimer ?</translation>
@@ -767,83 +905,109 @@ Voulez-vous effacer ce profil ?</translation>
         <translation>qTox</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="20"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="41"/>
         <source>Public Information</source>
         <translation>Informations Publiques</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="26"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="47"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="36"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="57"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="49"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="70"/>
         <source>Tox ID</source>
         <translation>ID Tox</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="55"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="76"/>
         <source>Your Tox ID (click to copy)</source>
         <translation>Votre ID Tox (cliquez pour copier)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="65"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="86"/>
         <source>Profiles</source>
         <translation>Profils</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="73"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="94"/>
         <source>Available profiles:</source>
         <translation>Profils disponibles:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="94"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="115"/>
         <source>Load</source>
         <comment>load profile button</comment>
         <translation>Charger</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="101"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="122"/>
         <source>Rename</source>
         <comment>rename profile button</comment>
         <translation>Renommer</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="108"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="129"/>
         <source>Export</source>
         <comment>export profile button</comment>
         <translation>Exporter</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="115"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="139"/>
         <source>Delete</source>
         <comment>delete profile button</comment>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="118"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="136"/>
         <source>This is useful to remain safe on public computers</source>
         <comment>delete profile button tooltip</comment>
         <translation>Util pour sécuriser sur un ordinateur public</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="129"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="150"/>
         <source>Import a profile</source>
         <comment>import profile button</comment>
         <translation>Importer un profil</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="136"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="157"/>
         <source>New Tox ID</source>
         <comment>new profile button</comment>
         <translation>Nouvel ID Tox</translation>
     </message>
 </context>
+<context>
+    <name>InputPasswordDialog</name>
+    <message>
+        <location filename="../src/widget/form/inputpassworddialog.ui" line="14"/>
+        <source>Password Dialog</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/inputpassworddialog.ui" line="23"/>
+        <source>Input password:</source>
+        <translation>Entrez le mot de passe:</translation>
+    </message>
+</context>
+<context>
+    <name>LoadHistoryDialog</name>
+    <message>
+        <location filename="../src/widget/form/loadhistorydialog.ui" line="14"/>
+        <source>Load History Dialog</source>
+        <translation>Historique</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/loadhistorydialog.ui" line="23"/>
+        <source>Load history from:</source>
+        <translation>Charger l&apos;historique du:</translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -895,10 +1059,55 @@ Voulez-vous effacer ce profil ?</translation>
 <context>
     <name>PrivacyForm</name>
     <message>
-        <location filename="../src/widget/form/settings/privacyform.cpp" line="21"/>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="28"/>
         <source>Privacy</source>
         <translation>Vie privée</translation>
     </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="88"/>
+        <source>Encrypted log</source>
+        <translation>Historique chiffré</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="89"/>
+        <source>You already have history log file encrypted with different password
+Do you want to delete old history file?</source>
+        <translation>Vous avez déjà un historique chiffré avec un autre mot de passe
+Voulez vous supprimer l&apos;ancien historique?</translation>
+    </message>
+</context>
+<context>
+    <name>PrivacySettings</name>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>qTox</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="23"/>
+        <source>Typing Notification</source>
+        <translation>Notifications d&apos;écriture</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="33"/>
+        <source>Keep History (unstable)</source>
+        <translation>Conserver l&apos;historique (instable)</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="43"/>
+        <source>Encryption</source>
+        <translation>Chiffrement</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="52"/>
+        <source>Encrypt Tox datafile</source>
+        <translation>Chiffrer les données Tox</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="62"/>
+        <source>Encrypt History</source>
+        <translation>Chiffrer l&apos;historique</translation>
+    </message>
 </context>
 <context>
     <name>SelfCamView</name>
@@ -908,6 +1117,24 @@ Voulez-vous effacer ce profil ?</translation>
         <translation type="vanished">Test vidéo Tox</translation>
     </message>
 </context>
+<context>
+    <name>SetPasswordDialog</name>
+    <message>
+        <location filename="../src/widget/form/setpassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>qTox</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/setpassworddialog.ui" line="23"/>
+        <source>Type Password</source>
+        <translation>Entrez un mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/setpassworddialog.ui" line="37"/>
+        <source>Repeat Password</source>
+        <translation>Répetez le mot de passe</translation>
+    </message>
+</context>
 <context>
     <name>SettingsDialog</name>
     <message>
@@ -994,103 +1221,128 @@ Voulez-vous effacer ce profil ?</translation>
         <translation type="vanished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="109"/>
+        <location filename="../src/widget/widget.cpp" line="74"/>
+        <source>online</source>
+        <translation>connecté</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="77"/>
+        <source>away</source>
+        <translation>indisponnible</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="80"/>
+        <source>busy</source>
+        <translation>occupé</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="83"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Quitter</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="86"/>
+        <source>Change status to:</source>
+        <translation>Changer le status en:</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="153"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation>Connecté</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="111"/>
+        <location filename="../src/widget/widget.cpp" line="155"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation>Indisponible</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="113"/>
+        <location filename="../src/widget/widget.cpp" line="157"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation>Occupé</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="310"/>
+        <location filename="../src/widget/widget.cpp" line="383"/>
         <source>Choose a profile</source>
         <translation>Choisir un profil</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="311"/>
+        <location filename="../src/widget/widget.cpp" line="384"/>
         <source>Please choose which identity to use</source>
         <translation>Merci de choisir l&apos;identité à utiliser</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="337"/>
+        <location filename="../src/widget/widget.cpp" line="410"/>
         <source>Choose a profile picture</source>
         <translation>Choisissez une image de profil</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="344"/>
-        <location filename="../src/widget/widget.cpp" line="351"/>
-        <location filename="../src/widget/widget.cpp" line="372"/>
+        <location filename="../src/widget/widget.cpp" line="417"/>
+        <location filename="../src/widget/widget.cpp" line="424"/>
+        <location filename="../src/widget/widget.cpp" line="445"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="344"/>
+        <location filename="../src/widget/widget.cpp" line="417"/>
         <source>Unable to open this file</source>
         <translation>Impossible d&apos;ouvrir ce fichier</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="351"/>
+        <location filename="../src/widget/widget.cpp" line="424"/>
         <source>Unable to read this image</source>
         <translation>Impossible de lire cette image</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="372"/>
+        <location filename="../src/widget/widget.cpp" line="445"/>
         <source>This image is too big</source>
         <translation>Cette image est trop volumineuse</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="399"/>
+        <location filename="../src/widget/widget.cpp" line="472"/>
         <source>Toxcore failed to start, the application will terminate after you close this message.</source>
         <translation>Toxcore n&apos;as pas pu démarrer correctement, l&apos;application va quitter quand vous fermerez ce message.</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="408"/>
+        <location filename="../src/widget/widget.cpp" line="481"/>
         <source>toxcore failed to start with your proxy settings. qTox cannot run; please modify your settings and restart.</source>
         <comment>popup text</comment>
         <translation>Toxcore n&apos;as pas pu démarrer avec ces paramètres de proxy, qTox ne peut pas continuer; merci de modifier vos paramètres et redémarrer.</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="579"/>
+        <location filename="../src/widget/widget.cpp" line="661"/>
         <source>away</source>
         <comment>contact status</comment>
         <translation>indisponnible</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="581"/>
+        <location filename="../src/widget/widget.cpp" line="663"/>
         <source>busy</source>
         <comment>contact status</comment>
         <translation>occupé</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="583"/>
+        <location filename="../src/widget/widget.cpp" line="665"/>
         <source>offline</source>
         <comment>contact status</comment>
         <translation>déconnecté</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="585"/>
+        <location filename="../src/widget/widget.cpp" line="667"/>
         <source>online</source>
         <comment>contact status</comment>
         <translation>connecté</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="587"/>
+        <location filename="../src/widget/widget.cpp" line="669"/>
         <source>%1 is now %2</source>
         <comment>e.g. &quot;Dubslow is now online&quot;</comment>
         <translation>%1 est maintenant %2</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="780"/>
+        <location filename="../src/widget/widget.cpp" line="873"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
         <translation>&lt;Inconnu&gt;</translation>