diff --git a/main.cpp b/main.cpp
index 26e43905e..999b49a5f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,7 @@
 #include "widget/widget.h"
 #include <QApplication>
 #include <QFontDatabase>
+#include <QTranslator>
 
 int main(int argc, char *argv[])
 {
@@ -8,7 +9,16 @@ int main(int argc, char *argv[])
     a.setApplicationName("Toxgui");
     a.setOrganizationName("Tox");
 
-    // install Unicode 6.1 supporting font
+    // Load translations
+    QString locale = QLocale::system().name().section('_', 0, 0);
+    QTranslator translator;
+    if (translator.load(locale,":translations/"))
+        qDebug() << "Loaded translation "+locale;
+    else
+        qDebug() << "Error loading translation "+locale;
+    a.installTranslator(&translator);
+
+    // Install Unicode 6.1 supporting font
     QFontDatabase::addApplicationFont("://DejaVuSans.ttf");
 
     Widget* w = Widget::getInstance();
diff --git a/res.qrc b/res.qrc
index 5fa97da39..996f3c531 100644
--- a/res.qrc
+++ b/res.qrc
@@ -100,5 +100,6 @@
         <file>img/status/dot_busy.png</file>
         <file>img/status/dot_busy_2x.png</file>
         <file>img/status/dot_busy_notification.png</file>
+        <file>translations/fr.qm</file>
     </qresource>
 </RCC>
diff --git a/translations/fr.qm b/translations/fr.qm
index 6897fd9a8..e3d68b2e1 100644
Binary files a/translations/fr.qm and b/translations/fr.qm differ
diff --git a/translations/fr.ts b/translations/fr.ts
index 892557696..2ba83d433 100644
--- a/translations/fr.ts
+++ b/translations/fr.ts
@@ -23,19 +23,19 @@
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="20"/>
         <source>Send friend request</source>
-        <translation>Envoyer une demande d&apos;ami</translation>
+        <translation>Envoyer la demande d&apos;ami</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="67"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
-        <translation>Je souhaiterais vous ajouter en tant qu&apos;ami</translation>
+        <translation>Je souhaiterais vous ajouter à mes contacts</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="75"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
-        <translation>Merci d&apos;écrire un ID Tox valide</translation>
+        <translation>Merci de remplir un ID Tox valide</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="90"/>
@@ -53,20 +53,20 @@
         <location filename="../widget/form/addfriendform.cpp" line="102"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
-        <translation>Nombre d&apos;entrées numétiques innetendues dans l&apos;entrée texte</translation>
+        <translation>Nombre d&apos;entrées numériques dans l&apos;entrée texte innatendu</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="109"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
-        <translation>La requête DNS ne contient aucun ID Tox</translation>
+        <translation>La réponse DNS ne contient aucun ID Tox</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="115"/>
         <location filename="../widget/form/addfriendform.cpp" line="121"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
-        <translation>La requête DNS ne contient pas d&apos;ID Tox valide</translation>
+        <translation>La réponse DNS ne contient pas d&apos;ID Tox valide</translation>
     </message>
 </context>
 <context>
@@ -79,7 +79,7 @@
     <message>
         <location filename="../widget/camera.cpp" line="146"/>
         <source>Camera format %1 not supported, can&apos;t use the camera</source>
-        <translation>Format de caméra %1 non supporté, impossible d&apos;utiliser la caméra</translation>
+        <translation>Format %1 de la caméra non supporté, impossible de l&apos;utiliser</translation>
     </message>
 </context>
 <context>
@@ -110,7 +110,7 @@
         <location filename="../widget/filetransfertwidget.cpp" line="231"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
-        <translation>Sauvegarder le fichier</translation>
+        <translation>Sauvegarder un fichier</translation>
     </message>
 </context>
 <context>
@@ -134,7 +134,7 @@
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
         <source>Friend request message:</source>
-        <translation>Message de la demande: </translation>
+        <translation>Message de demande d&apos;ami:</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
@@ -172,6 +172,12 @@
 </context>
 <context>
     <name>GroupChatForm</name>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="32"/>
+        <source>%1 users in chat</source>
+        <comment>Number of users in chat</comment>
+        <translation>%1 personnes</translation>
+    </message>
     <message>
         <location filename="../widget/form/groupchatform.cpp" line="155"/>
         <source>&lt;Unknown&gt;</source>
@@ -191,21 +197,32 @@
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="68"/>
-        <source>Quit group</source>
-        <comment>Menu to quit a groupchat</comment>
-        <translation>Quitter le groupe</translation>
-    </message>
-    <message>
+        <location filename="../widget/groupwidget.cpp" line="38"/>
         <location filename="../widget/groupwidget.cpp" line="126"/>
         <source>%1 users in chat</source>
         <translation>%1 personnes</translation>
     </message>
     <message>
+        <location filename="../widget/groupwidget.cpp" line="40"/>
         <location filename="../widget/groupwidget.cpp" line="128"/>
         <source>0 users in chat</source>
         <translation>0 personnes</translation>
     </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="68"/>
+        <source>Quit group</source>
+        <comment>Menu to quit a groupchat</comment>
+        <translation>Quitter le groupe</translation>
+    </message>
+</context>
+<context>
+    <name>SelfCamView</name>
+    <message>
+        <location filename="../widget/selfcamview.cpp" line="16"/>
+        <source>Tox video test</source>
+        <comment>Title of the window to test the video/webcam</comment>
+        <translation>Test vidéo Tox</translation>
+    </message>
 </context>
 <context>
     <name>SettingsForm</name>
@@ -237,7 +254,7 @@
         <location filename="../widget/form/settingsform.cpp" line="23"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation>Activé l&apos;IPv6 (recommandé)</translation>
+        <translation>Activer IPv6 (recommandé)</translation>
     </message>
 </context>
 <context>
@@ -277,7 +294,7 @@
         <location filename="../widget/widget.cpp" line="1113"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
-        <translation>Absent</translation>
+        <translation>Indisponnible</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="1114"/>
diff --git a/widget/tool/clickablelabel.cpp b/widget/tool/clickablelabel.cpp
index 760122edb..1e1b61f9d 100644
--- a/widget/tool/clickablelabel.cpp
+++ b/widget/tool/clickablelabel.cpp
@@ -5,7 +5,7 @@ ClickableLabel::ClickableLabel(QWidget *parent) :
 {
 }
 
-void ClickableLabel::mousePressEvent(QMouseEvent* event)
+void ClickableLabel::mousePressEvent(QMouseEvent*)
 {
     emit clicked();
 }