diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 0af17f99cb39be7a306ab8cd2d3c2c4433681b50..6463538c5b7008c010a5e0909b57e8968708bf9c 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -77,6 +77,7 @@
 #if USE_QT_GUI
 #   include <QtGui/QApplication>
 #   include <QtGui/QImage>
+#   include <QtGui/QRegion>
 #   include <QtGui/QPixmap>
 #   include <QtGui/QWidget>
 #   include <QtGui/QFont>
@@ -478,6 +479,7 @@ struct QDumper
     void putHash(const char *name, QChar value);
     void putHash(const char *name, float value);
     void putHash(const char *name, double value);
+    void putStringValue(const QString &value);
 
     void beginHash(); // start of data hash output
     void endHash(); // start of data hash output
@@ -710,6 +712,16 @@ void QDumper::putBase64Encoded(const char *buf, int n)
     }
 }
 
+void QDumper::putStringValue(const QString &str)
+{
+    if (str.isNull()) {
+        putItem("value", "\"\" (null)");
+    } else {
+        putItem("value", str);
+        putItem("valueencoded", "2");
+    }
+}
+
 void QDumper::disarm()
 {
     success = true;
@@ -784,10 +796,9 @@ void QDumper::putHash(const char *name, const QString &value)
 {
     beginHash();
     putItem("name", name);
-    putItem("value", value);
+    putStringValue(value);
     putItem("type", NS"QString");
     putItem("numchild", "0");
-    putItem("valueencoded", "2");
     endHash();
 }
 
@@ -859,9 +870,8 @@ void QDumper::putHash(const char *name, QChar value)
 {
     beginHash();
     putItem("name", name);
-    putItem("value", QString(QLatin1String("'%1' (%2, 0x%3)"))
+    putStringValue(QString(QLatin1String("'%1' (%2, 0x%3)"))
         .arg(value).arg(value.unicode()).arg(value.unicode(), 0, 16));
-    putItem("valueencoded", "2");
     putItem("type", NS"QChar");
     putItem("numchild", "0");
     endHash();
@@ -2850,8 +2860,7 @@ static void qDumpQString(QDumper &d)
             return;
     }
 
-    d.putItem("value", str);
-    d.putItem("valueencoded", "2");
+    d.putStringValue(str);
     d.putItem("type", NS"QString");
     //d.putItem("editvalue", str);  // handled generically below
     d.putItem("numchild", "0");
@@ -2880,8 +2889,7 @@ static void qDumpQStringList(QDumper &d)
         d.beginChildren(n ? NS"QString" : 0);
         for (int i = 0; i != n; ++i) {
             d.beginHash();
-            d.putItem("value", list[i]);
-            d.putItem("valueencoded", "2");
+            d.putStringValue(list.at(i));
             d.endHash();
         }
         if (n < list.size())
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 77c63fb7c7a75f2bf9c31ed3b6545bd47a7ae1b2..18d3d3f50e9a0cb8c7bdc52b71de21a6f7dd61ba 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -1512,7 +1512,7 @@ Sollen sie überschrieben werden?</translation>
     <message>
         <location line="+8"/>
         <source>Could not set permissions to writable.</source>
-        <translation>Die Datei konnte schreibbar gemacht werden.</translation>
+        <translation>Die Datei konnte nicht schreibbar gemacht werden.</translation>
     </message>
     <message>
         <location line="+92"/>
@@ -14657,7 +14657,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;Zeilennummer&gt;</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts
index 06a78c52d7c9076905ffb2e037e7e74a1bc37e1e..8dddfe5d7997cdafa98f4715699175b39d93d3a2 100644
--- a/share/qtcreator/translations/qtcreator_es.ts
+++ b/share/qtcreator/translations/qtcreator_es.ts
@@ -13301,7 +13301,7 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;número de línea&gt;</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 9144b67c1e46cc27e24eaa61569ca205dd30eb74..eb5dd7e035d9e247fde20d0f1ea2420560f65b1b 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -6,8 +6,7 @@
     <message>
         <location filename="../../../src/app/main.cpp" line="+129"/>
         <source>Failed to load core: %1</source>
-        <translatorcomment>traduire core ?</translatorcomment>
-        <translation type="unfinished">Échec dans le chargement du core : %1</translation>
+        <translation>Échec dans le chargement du core : %1</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -17,13 +16,12 @@
     <message>
         <location line="+135"/>
         <source>Could not find &apos;Core.pluginspec&apos; in %1</source>
-        <translation type="unfinished">&apos;Core.pluginspec&apos; introuvable dans %1</translation>
+        <translation>&apos;Core.pluginspec&apos; introuvable dans %1</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Qt Creator - Plugin loader messages</source>
-        <translatorcomment>Un s à plugin ?</translatorcomment>
-        <translation type="unfinished">Qt Creator - Messages du chargeur de plugin</translation>
+        <translation>Qt Creator - Messages du chargeur de plugin</translation>
     </message>
     <message>
         <source>Couldn&apos;t find &apos;Core.pluginspec&apos; in %1</source>
@@ -45,8 +43,7 @@
     <message>
         <location/>
         <source>Core File:</source>
-        <translatorcomment>&apos;core&apos; encore...</translatorcomment>
-        <translation type="unfinished">Fichier Core :</translation>
+        <translation>Fichier core :</translation>
     </message>
 </context>
 <context>
@@ -59,8 +56,7 @@
     <message>
         <location/>
         <source>Attach to Process ID:</source>
-        <translatorcomment>PID ?</translatorcomment>
-        <translation type="unfinished">Attacher au processus d&apos;ID :</translation>
+        <translation>Attacher au processus de PID :</translation>
     </message>
     <message>
         <location/>
@@ -129,7 +125,7 @@
     <message>
         <location/>
         <source>+</source>
-        <translation></translation>
+        <translation>+</translation>
     </message>
     <message>
         <location/>
@@ -267,22 +263,22 @@
     <message>
         <location line="-75"/>
         <source>Ctrl+M</source>
-        <translation></translation>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Meta+M</source>
-        <translation></translation>
+        <translation>Meta+M</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Move Up</source>
-        <translation>Monter</translation>
+        <translation>Vers le Haut</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Move Down</source>
-        <translation>Descendre</translation>
+        <translation>Vers le Bas</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -292,12 +288,12 @@
     <message>
         <location line="+3"/>
         <source>Ctrl+,</source>
-        <translation></translation>
+        <translation>Ctrl+,</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Meta+,</source>
-        <translation></translation>
+        <translation>Meta+,</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -307,12 +303,12 @@
     <message>
         <location line="+3"/>
         <source>Ctrl+.</source>
-        <translation></translation>
+        <translation>Ctrl+.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Meta+.</source>
-        <translation></translation>
+        <translation>Meta+.</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -356,7 +352,7 @@
     <message>
         <location filename="../../../src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp" line="+49"/>
         <source>Clear system environment</source>
-        <translation type="unfinished">Nettoyer l&apos;environnement système</translation>
+        <translation>Nettoyer l&apos;environnement système</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -423,27 +419,27 @@
     <message>
         <location line="+13"/>
         <source>Run Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>Environnement d&apos;éxecution</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Clean Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>Environnement de nettoyage</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>System Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>Environnement système</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Build Environment</source>
-        <translation type="unfinished">Environnement de compilation</translation>
+        <translation>Environnement de compilation</translation>
     </message>
     <message>
         <location line="+91"/>
         <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Exécution en cours : &lt;b&gt;%1&lt;/b&gt; %2</translation>
     </message>
     <message>
         <source>Environment</source>
@@ -460,7 +456,7 @@
     <message>
         <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+91"/>
         <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Qt Creator a détecté une &lt;b&gt;compilation dans les sources de %1&lt;/b&gt; qui empêche les shadow builds. Qt Creator ne permettra pas de changer le répertoire de compilation. Si vous voulez effectuer un &quot;shadow build&quot;, nettoyez le répertoire source et rouvrez le projet.</translation>
     </message>
     <message>
         <source>Qt Creator has detected an in-source-build which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
@@ -472,8 +468,7 @@
     <message>
         <location line="+57"/>
         <source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
-        <translatorcomment>Traduction de path, ici chemin ?</translatorcomment>
-        <translation type="unfinished">Veuillez spécifier le chemin de l&apos;exécutable cmake. Aucun exécutable cmake n&apos;a été trouvé dans le chemin.</translation>
+        <translation>Veuillez spécifier l&apos;emplacement de l&apos;exécutable cmake. Aucun exécutable cmake n&apos;a été trouvé dans la liste de répertoires standards.</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -483,12 +478,12 @@
     <message>
         <location line="+2"/>
         <source> The path %1 is not a executable.</source>
-        <translation type="unfinished">%1 n&apos;est pas le chemin d&apos;un exécutable.</translation>
+        <translation> %1 n&apos;est pas le chemin d&apos;un exécutable.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source> The path %1 is not a valid cmake.</source>
-        <translation type="unfinished">%1 n&apos;est pas un cmake valide.</translation>
+        <translation>%1 n&apos;est pas un cmake valide.</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -504,22 +499,22 @@
         <location line="+19"/>
         <source>The directory %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used toolchain here and rerun cmake. Or simply finish the wizard directly</source>
         <translatorcomment>toolchain -&gt; chaine de compilation ? terminer ou terminez ?</translatorcomment>
-        <translation type="unfinished">Le répertoire %1 contient déjà un fichier cbp, ce qui est assez récent. Vous pouvez passer des arguments spéciaux ou changez la chaine de compilation utilisée ici et réexécuter cmake. Ou simplement terminer l&apos;assistant directement</translation>
+        <translation>Le répertoire %1 contient déjà un fichier cbp qui est assez récent. Vous pouvez passer des arguments spéciaux, ou changer la chaine de compilation utilisée ici et réexécuter cmake. Vous pouvez aussi terminer l&apos;assistant directement</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running cmake. Some projects require command line arguments to the initial cmake call.</source>
-        <translation type="unfinished">Le répertoire %1 ne contient pas de fichier cbp. Qt Creator a besoin de créer ce fichier en exécutant cmake. Certains projets nécessitent des arguments de ligne de commande pour le premier appel à cmake.</translation>
+        <translation>Le répertoire %1 ne contient pas de fichier cbp. Qt Creator a besoin de créer ce fichier en exécutant cmake. Certains projets nécessitent des arguments de ligne de commande pour le premier appel à cmake.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The directory %1 contains an outdated .cbp file. Qt Creator needs to update this file by running cmake. If you want to add additional command line arguments, add them below. Note that cmake remembers command line arguments from the previous runs.</source>
-        <translation type="unfinished">le répertoire %1 contient un fichier cbp obsolète. Qt Creator a besoin de mettre à jour ce fichier en exécutant cmake. Si vous voulez passer des arguments de ligne de commande, ajoutez les ci dessous. Notez que cmake conserve les arguments passés lors des exécutions précédentes.</translation>
+        <translation>Le répertoire %1 contient un fichier cbp obsolète. Qt Creator a besoin de mettre à jour ce fichier en exécutant cmake. Si vous voulez passer des arguments de ligne de commande supplémentaires, ajoutez les ci dessous. Notez que cmake conserve les arguments passés lors des exécutions précédentes.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>The directory %1 specified in a build-configuration, does not contain a cbp file. Qt Creator needs to recreate this file, by running cmake. Some projects require command line arguments to the initial cmake call. Note that cmake remembers command line arguments from the previous runs.</source>
-        <translation type="unfinished">Le répertoire %1 sélectionné dans une des configuration de compilation, ne contient pas de fichier cbp. Qt Creator a besoin de mettre à jour ce fichier en exécutant cmake. Certains projets nécessitent des arguments de ligne de commande pour le premier appel à cmake. Notez que cmake conserve les arguments passés lors des exécutions précédentes.</translation>
+        <translation>Le répertoire %1, sélectionné dans une des configurations de compilation, ne contient pas de fichier cbp. Qt Creator a besoin de mettre à jour ce fichier en exécutant cmake. Certains projets nécessitent des arguments de ligne de commande pour le premier appel à cmake. Notez que cmake conserve les arguments passés lors des exécutions précédentes.</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -534,7 +529,7 @@
     <message>
         <location line="+3"/>
         <source>NMake Generator (%1)</source>
-        <translation type="unfinished">Générateur NMake (%1)</translation>
+        <translation>Générateur NMake (%1)</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -576,8 +571,7 @@
     <message>
         <location line="+59"/>
         <source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source>
-        <translatorcomment>Traduire Make ? Construire ?</translatorcomment>
-        <translation type="unfinished">&lt;b&gt;Make : &lt;/b&gt;%1 %2</translation>
+        <translation>&lt;b&gt;Make : &lt;/b&gt;%1 %2</translation>
     </message>
 </context>
 <context>
@@ -590,7 +584,7 @@
     <message>
         <location line="+2"/>
         <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
-        <translation type="unfinished">Veuillez spécifier le répertoire où vous voulez compiler votre projet. Qt Creator recommande de de pas utiliser le répertoire source pour la compilation. Cela garantit que le répertoire source reste propre et permet des compilations multiples avec différents paramètres.</translation>
+        <translation>Veuillez spécifier le répertoire où vous voulez compiler votre projet. Qt Creator recommande de de pas utiliser le répertoire source pour la compilation. Cela garantit que le répertoire source reste propre et permet des compilations multiples avec différents paramètres.</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -644,12 +638,12 @@
     <message>
         <location/>
         <source>Symbol paths:</source>
-        <translation type="unfinished">Chemins des symboles :</translation>
+        <translation>Chemins des symboles :</translation>
     </message>
     <message>
         <location/>
         <source>Source paths:</source>
-        <translation type="unfinished">Chemins des sources :</translation>
+        <translation>Chemins des sources :</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+58"/>
@@ -675,7 +669,7 @@
     <message>
         <location/>
         <source>Verbose Symbol Loading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Chargement verbeux des symboles</translation>
     </message>
 </context>
 <context>
@@ -705,37 +699,38 @@
     <message>
         <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
         <source>&amp;Code Pasting</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Collage de code</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Paste Snippet...</source>
-        <translation type="unfinished">Coller le fragment...</translation>
+        <translatorcomment>snippet is quite common in French for programming</translatorcomment>
+        <translation>Coller le snippet...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+C,Alt+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+C,Alt+P</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Fetch Snippet...</source>
-        <translation type="unfinished">Récuperer le fragment...</translation>
+        <translation>Récuperer le snippet...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+C,Alt+F</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+C,Alt+F</translation>
     </message>
     <message>
         <location line="+87"/>
         <source>This protocol supports no listing</source>
-        <translation type="unfinished">Ce protocole ne prend en charge aucune liste</translation>
+        <translation type="unfinished">Ce protocole ne prend en charge le listage</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Waiting for items</source>
-        <translation type="unfinished">En attente des éléments</translation>
+        <translation>En attente des éléments</translation>
     </message>
 </context>
 <context>
@@ -766,7 +761,7 @@
         <location filename="../../../src/plugins/cpaster/pasteselect.ui"/>
         <source>Paste:</source>
         <translatorcomment>quelque chose de plus français pour la référence de paste?</translatorcomment>
-        <translation type="unfinished">Collage :</translation>
+        <translation>Collage :</translation>
     </message>
     <message>
         <location/>
@@ -799,7 +794,7 @@
     <message>
         <location/>
         <source>Display Output Pane after sending a post</source>
-        <translation type="unfinished">Afficher le résultat après publication</translation>
+        <translation>Afficher le résultat après publication</translation>
     </message>
     <message>
         <location/>
@@ -814,17 +809,17 @@
     <message>
         <location/>
         <source>Pastebin.ca</source>
-        <translation type="unfinished"></translation>
+        <translation>Pastebin.ca</translation>
     </message>
     <message>
         <location/>
         <source>Pastebin.com</source>
-        <translation type="unfinished"></translation>
+        <translation>Pastebin.com</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+10"/>
         <source>Code Pasting</source>
-        <translation type="unfinished"></translation>
+        <translation>Collage de code</translation>
     </message>
 </context>
 <context>
@@ -837,7 +832,7 @@
     <message>
         <location/>
         <source>Checking this will populate the source file view automatically but might slow down debugger startup considerably.</source>
-        <translation type="unfinished">Cocher cette case peuplera automatiquement la vue du fichier source mais risque de ralentir considérablement le lancement du débogueur.</translation>
+        <translation>Cocher cette case peuplera automatiquement la vue du fichier source mais risque de ralentir considérablement le lancement du débogueur.</translation>
     </message>
     <message>
         <location/>
@@ -847,19 +842,19 @@
     <message>
         <location/>
         <source>Use alternating row colors in debug views</source>
-        <translation type="unfinished">Alterner la couleur de ligne dans le débogueur visuel</translation>
+        <translation>Alterner la couleur de ligne dans le débogueur visuel</translation>
     </message>
     <message>
         <location/>
         <source>When this option is checked, &apos;Step Into&apos; compresses several steps into one in certain situations, leading to &apos;less noisy&apos; debugging. So will, e.g., the atomic
  reference counting code be skipped, and a single &apos;Step Into&apos; for a signal emission will end up directly in the slot connected to it.</source>
-        <translation type="unfinished">Lorsque cette option est cochée, &apos;Entrer dans&apos; compresse plusieurs étapes en une dans certains cas, afin d&apos;éviter une &apos;pollution&apos; du déboguage. Cela conduit par exemple
- à passer le comptage de référence atomique, et un simple &apos;Entrer dans&apos; depuis une émission de signal conduit directement au slot qui y est connecté.</translation>
+        <translation>Lorsque cette option est cochée, « Entrer dans » compresse plusieurs étapes en une dans certains cas, afin d&apos;éviter une &apos;pollution&apos; du déboguage. Cela conduit par exemple
+ à passer le comptage de référence atomique, et un simple « Entrer dans » depuis une émission de signal conduit directement au slot qui y est connecté.</translation>
     </message>
     <message>
         <location/>
         <source>Skip known frames when stepping</source>
-        <translation type="unfinished">Passer les trames connues en pas à pas</translation>
+        <translation>Passer les trames connues en pas à pas</translation>
     </message>
     <message>
         <source>Checking this will enable tooltips for variable values during debugging. Since this can slow down debugging and does not provide reliable information as it does not use scope information, it is switched off by default.</source>
@@ -889,12 +884,12 @@
         <location/>
         <source>Show a message box when receiving a signal</source>
         <translatorcomment>message box -&gt; message, boîte de message, fenêtre de message ?</translatorcomment>
-        <translation type="unfinished">Afficher un message à la réception d&apos;un signal</translation>
+        <translation>Afficher un message à la réception d&apos;un signal</translation>
     </message>
     <message>
         <location/>
         <source>Use tooltips in main editor while debugging</source>
-        <translation type="unfinished">Utiliser les info-bulles dans l&apos;éditeur principal lors du déboguage</translation>
+        <translation>Utiliser les info-bulles dans l&apos;éditeur principal lors du déboguage</translation>
     </message>
 </context>
 <context>
@@ -902,37 +897,37 @@
     <message>
         <location filename="../../../src/plugins/cpptools/completionsettingspage.ui"/>
         <source>Code Completion</source>
-        <translation type="unfinished">Complétion du code</translation>
+        <translation>Complétion du code</translation>
     </message>
     <message>
         <location/>
         <source>Do a case-sensitive match for completion items.</source>
-        <translation type="unfinished">Tenir compte de la casse lors de la complétion.</translation>
+        <translation>Tenir compte de la casse lors de la complétion.</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Case-sensitive completion</source>
-        <translation type="unfinished">Sensible à la &amp;casse</translation>
+        <translation>Sensible à la &amp;casse</translation>
     </message>
     <message>
         <location/>
         <source>Automatically insert (, ) and ; when appropriate.</source>
-        <translation type="unfinished">Insérer (, ) et; si approprié.</translation>
+        <translation>Insérer automatiquement (, ) et; si approprié.</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Automatically insert brackets</source>
-        <translation type="unfinished">Insertion &amp;automatique des parenthèses</translation>
+        <translation>Insertion &amp;automatique des parenthèses</translation>
     </message>
     <message>
         <location/>
         <source>Insert the common prefix of available completion items.</source>
-        <translation type="unfinished">Insérer le préfixe commun des élements disponibles.</translation>
+        <translation>Insérer le préfixe commun des élements disponibles.</translation>
     </message>
     <message>
         <location/>
         <source>Autocomplete common &amp;prefix</source>
-        <translation type="unfinished">Autocomplétion pour le &amp;préfixe commun</translation>
+        <translation>Autocomplétion pour le &amp;préfixe commun</translation>
     </message>
 </context>
 <context>
@@ -977,7 +972,7 @@
         <location line="-22"/>
         <location line="+111"/>
         <source>Existing files</source>
-        <translation type="unfinished">Fichiers existants</translation>
+        <translation>Fichiers existants</translation>
     </message>
     <message>
         <location line="-62"/>
@@ -1022,7 +1017,7 @@ Voulez vous les écraser?</translation>
         <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+187"/>
         <location line="+1493"/>
         <source>Revert to Saved</source>
-        <translation type="unfinished">Revenir à la version sauvegardée</translation>
+        <translation>Revenir à la version sauvegardée</translation>
     </message>
     <message>
         <location line="-1490"/>
@@ -1033,13 +1028,13 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+1"/>
         <source>Close All</source>
-        <translation type="unfinished">Fermer Tout</translation>
+        <translation>Fermer Tout</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+1292"/>
         <source>Close Others</source>
-        <translation type="unfinished">Fermer les Autres Éditeurs</translation>
+        <translation>Fermer les autres éditeurs</translation>
     </message>
     <message>
         <source>Next Document in History</source>
@@ -1052,102 +1047,102 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="-1291"/>
         <source>Next Open Document in History</source>
-        <translation type="unfinished"></translation>
+        <translation>Document ouvert suivant dans l&apos;historique</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Previous Open Document in History</source>
-        <translation type="unfinished"></translation>
+        <translation>Document ouvert précédent dans l&apos;historique</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Go Back</source>
-        <translation type="unfinished">Précédent</translation>
+        <translation>Précédent</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Go Forward</source>
-        <translation type="unfinished">Suivant</translation>
+        <translation>Suivant</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open in External Editor</source>
-        <translation type="unfinished">Ouvrir dans l&apos;Éditeur Externe</translation>
+        <translation>Ouvrir dans l&apos;éditeur externe</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Revert File to Saved</source>
-        <translation type="unfinished">Restaurer le fichier sauvegardé</translation>
+        <translation>Restaurer le fichier sauvegardé</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Ctrl+Shift+W</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+W</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Alt+Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+Tab</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Tab</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Alt+Shift+Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+Shift+Tab</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Shift+Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+Tab</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Ctrl+Alt+Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+Left</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+Left</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Ctrl+Alt+Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+Right</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+Right</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Meta+E</source>
-        <translation type="unfinished"></translation>
+        <translation>Meta+E</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+E</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Split</source>
-        <translation type="unfinished">Scinder</translation>
+        <translation>Scinder</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Split Side by Side</source>
-        <translation type="unfinished">Scinder Verticalement</translation>
+        <translation>Scinder verticalement</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1167,48 +1162,48 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="-22"/>
         <source>%1,2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1,2</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>%1,3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1,3</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>%1,0</source>
-        <translation type="unfinished"></translation>
+        <translation>%1,0</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>%1,1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1,1</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>%1,o</source>
-        <translation type="unfinished"></translation>
+        <translation>%1,o</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Advanced</source>
-        <translation type="unfinished">&amp;Avancé</translation>
+        <translation>&amp;Avancé</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Alt+V,Alt+I</source>
-        <translation type="unfinished"></translation>
+        <translation>nav.net </translation>
     </message>
     <message>
         <location line="+720"/>
         <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tout les fichiers (*)</translation>
     </message>
     <message>
         <location line="+34"/>
         <location line="+24"/>
         <source>Opening File</source>
-        <translation type="unfinished">Ouverture du Fichier</translation>
+        <translation>Ouverture du Fichier</translation>
     </message>
     <message>
         <location line="-24"/>
@@ -1228,18 +1223,18 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+1"/>
         <source>The file %1 is read only.</source>
-        <translation type="unfinished">Le fichier %1 est en lecture seule.</translation>
+        <translation>Le fichier %1 est en lecture seule.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open with VCS (%1)</source>
-        <translation type="unfinished">Ouvrir avec VCS (%1)</translation>
+        <translation>Ouvrir avec VCS (%1)</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+134"/>
         <source>Make writable</source>
-        <translation type="unfinished">Rendre Inscriptible</translation>
+        <translation>Rendre inscriptible</translation>
     </message>
     <message>
         <location line="-130"/>
@@ -1250,17 +1245,17 @@ Voulez vous les écraser?</translation>
         <location line="+29"/>
         <location line="+8"/>
         <source>Failed!</source>
-        <translation type="unfinished">Échec!</translation>
+        <translation>Échec !</translation>
     </message>
     <message>
         <location line="-8"/>
         <source>Could not open the file for editing with SCC.</source>
-        <translation type="unfinished">Impossible d&apos;ouvrir le fichier pour écrire avec SCC.</translation>
+        <translation>Impossible d&apos;ouvrir le fichier pour édition avec SCC.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Could not set permissions to writable.</source>
-        <translation type="unfinished">Impossible d&apos;attribuer les droits en écriture.</translation>
+        <translation>Impossible d&apos;attribuer les droits en écriture.</translation>
     </message>
     <message>
         <location line="+92"/>
@@ -1275,12 +1270,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+1"/>
         <source>&amp;Save %1</source>
-        <translation type="unfinished">Enregi&amp;strer %1</translation>
+        <translation>Enregi&amp;strer %1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Revert %1 to Saved</source>
-        <translation type="unfinished">Restaurer %1</translation>
+        <translation>Restaurer %1 à la version sauvegardée</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1290,17 +1285,17 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+3"/>
         <source>Close All Except %1</source>
-        <translation type="unfinished">Fermer tout sauf %1</translation>
+        <translation>Fermer tout sauf %1</translation>
     </message>
     <message>
         <location line="+197"/>
         <source>You will lose your current changes if you proceed reverting %1.</source>
-        <translation type="unfinished">Vous perdrez tous les changements en cours si vous restaurez %1.</translation>
+        <translation>Vous perdrez tous les changements en cours si vous restaurez %1.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Proceed</source>
-        <translation type="unfinished">Continuer</translation>
+        <translation>Continuer</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1326,23 +1321,22 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+306"/>
         <source>Cannot save file</source>
-        <translatorcomment>sauver ou sauvegarder ?</translatorcomment>
-        <translation type="unfinished">Impossible de sauver le fichier</translation>
+        <translation>Impossible d&apos;enregistrer le fichier</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cannot save changes to &apos;%1&apos;. Do you want to continue and lose your changes?</source>
-        <translation type="unfinished">Impossible de sauvegarder les modifications dans &apos;%1&apos;. Voulez vous continuer et perdre vos modifications?</translation>
+        <translation>Impossible d&apos;enregistrer les modifications dans &apos;%1&apos;. Voulez vous continuer et perdre vos modifications?</translation>
     </message>
     <message>
         <location line="+113"/>
         <source>Overwrite?</source>
-        <translation type="unfinished">Écraser ?</translation>
+        <translation>Écraser ?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>An item named &apos;%1&apos; already exists at this location. Do you want to overwrite it?</source>
-        <translation type="unfinished">Un élément nommé &apos;%1&apos; existe déjà. Voulez-vous l&apos;écraser ?</translation>
+        <translation>Un élément nommé &apos;%1&apos; existe déjà. Voulez-vous l&apos;écraser ?</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -1364,7 +1358,7 @@ Voulez vous les écraser?</translation>
         <location filename="../../../src/plugins/coreplugin/editmode.cpp" line="+95"/>
         <source>Edit</source>
         <translatorcomment>sonne mieux pour le mode...  non ?</translatorcomment>
-        <translation type="unfinished">Éditeur</translation>
+        <translation>Éditeur</translation>
     </message>
 </context>
 <context>
@@ -1372,12 +1366,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/coreplugin/editormanager/editorsplitter.cpp" line="+75"/>
         <source>Split Left/Right</source>
-        <translation type="unfinished">Scinder gauche/droite</translation>
+        <translation>Scinder gauche/droite</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Split Top/Bottom</source>
-        <translation type="unfinished">Scinder haut/bas</translation>
+        <translation>Scinder haut/bas</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -1397,7 +1391,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+7"/>
         <source>Restore Default Layout</source>
-        <translation type="unfinished">Restaurer l&apos;arrangement par défaut</translation>
+        <translation>Restaurer l&apos;arrangement par défaut</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -1407,7 +1401,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+2"/>
         <source>Alt+Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+Gauche</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -1417,7 +1411,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+2"/>
         <source>Alt+Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+Droite</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1449,13 +1443,13 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-440"/>
         <source>Go Forward</source>
-        <translation type="unfinished">Suivant</translation>
+        <translation>Suivant</translation>
     </message>
     <message>
         <location line="+73"/>
         <location line="+37"/>
         <source>Placeholder</source>
-        <translation type="unfinished">Signet</translation>
+        <translation type="unfinished">Paramètre fictif</translation>
     </message>
     <message>
         <location line="-31"/>
@@ -1465,17 +1459,17 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+213"/>
         <source>Make writable</source>
-        <translation type="unfinished">Rendre inscriptible</translation>
+        <translation>Rendre inscriptible</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>File is writable</source>
-        <translation type="unfinished">Le fichier est inscriptible</translation>
+        <translation>Le fichier est inscriptible</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>Copy full path to clipboard</source>
-        <translation type="unfinished">Copier le chemin complet vers le presse-papier</translation>
+        <translation>Copier le chemin complet vers le presse-papier</translation>
     </message>
 </context>
 <context>
@@ -1483,22 +1477,22 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/coreplugin/generalsettings.ui"/>
         <source>General settings</source>
-        <translation type="unfinished">Réglages généraux</translation>
+        <translation>Réglages généraux</translation>
     </message>
     <message>
         <location/>
         <source>User &amp;interface color:</source>
-        <translation type="unfinished">Couleur de l&apos;&amp;interface utilisateur :</translation>
+        <translation>Couleur de l&apos;&amp;interface utilisateur :</translation>
     </message>
     <message>
         <location/>
         <source>Reset to default</source>
-        <translation type="unfinished">Restaurer les réglages par default</translation>
+        <translation>Restaurer les réglages par default</translation>
     </message>
     <message>
         <location/>
         <source>R</source>
-        <translation type="unfinished">R</translation>
+        <translation>R</translation>
     </message>
     <message>
         <location/>
@@ -1533,23 +1527,22 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/coreplugin/generalsettings.ui"/>
         <source>When files are externally modified:</source>
-        <translatorcomment>modifié à l&apos;extérieur ?</translatorcomment>
-        <translation type="unfinished">Quand un fichier a été modifié à l&apos;extérieur :</translation>
+        <translation>Quand des fichiers ont été modifiés en dehors de Qt Creator :</translation>
     </message>
     <message>
         <location/>
         <source>Always ask</source>
-        <translation type="unfinished">Demander quoi faire</translation>
+        <translation>Demander quoi faire</translation>
     </message>
     <message>
         <location/>
         <source>Reload all modified files</source>
-        <translation type="unfinished">Recharger tous les fichiers modifiés</translation>
+        <translation>Recharger tous les fichiers modifiés</translation>
     </message>
     <message>
         <location/>
         <source>Ignore modifications</source>
-        <translation type="unfinished">Ignorer les modifications</translation>
+        <translation>Ignorer les modifications</translation>
     </message>
 </context>
 <context>
@@ -1572,22 +1565,22 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+14"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Édition</translation>
+        <translation>&amp;Édition</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>&amp;Tools</source>
-        <translation type="unfinished">O&amp;utils</translation>
+        <translation>O&amp;utils</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Window</source>
-        <translation type="unfinished">F&amp;enêtre</translation>
+        <translation>F&amp;enêtre</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>&amp;Help</source>
-        <translation type="unfinished">&amp;Aide</translation>
+        <translation>&amp;Aide</translation>
     </message>
     <message>
         <source>&amp;New...</source>
@@ -1604,17 +1597,17 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+62"/>
         <source>&amp;New File or Project...</source>
-        <translation type="unfinished">&amp;Nouveau fichier ou projet...</translation>
+        <translation>&amp;Nouveau fichier ou projet...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Open File or Project...</source>
-        <translation type="unfinished">&amp;Ouvrir le fichier ou le projet...</translation>
+        <translation>&amp;Ouvrir un fichier ou projet...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Open File With...</source>
-        <translation type="unfinished">&amp;Ouvrir le fichier avec...</translation>
+        <translation>Ouvrir le fichier &amp;avec...</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1625,86 +1618,86 @@ Voulez vous les écraser?</translation>
         <location line="+3"/>
         <location line="+4"/>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Enregistrer</translation>
+        <translation>&amp;Enregistrer</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+6"/>
         <source>Save &amp;As...</source>
-        <translation type="unfinished">Enregistrer &amp;sous...</translation>
+        <translation>Enregistrer &amp;sous...</translation>
     </message>
     <message>
         <location line="-3"/>
         <location line="+10"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>Save A&amp;ll</source>
-        <translation type="unfinished">&amp;Tout enregistrer</translation>
+        <translation>&amp;Tout enregistrer</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>&amp;Print...</source>
-        <translation type="unfinished">Im&amp;primer...</translation>
+        <translation>Im&amp;primer...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>E&amp;xit</source>
-        <translation type="unfinished">&amp;Quitter</translation>
+        <translation>&amp;Quitter</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+4"/>
         <source>&amp;Undo</source>
-        <translation type="unfinished">Ann&amp;uler</translation>
+        <translation>Ann&amp;uler</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+4"/>
         <source>&amp;Redo</source>
-        <translation type="unfinished">Re&amp;faire</translation>
+        <translation>Re&amp;faire</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cu&amp;t</source>
-        <translation type="unfinished">Co&amp;uper</translation>
+        <translation>Co&amp;uper</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">Cop&amp;ier</translation>
+        <translation>Cop&amp;ier</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">C&amp;oller</translation>
+        <translation>C&amp;oller</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Select All</source>
-        <translation type="unfinished">Tout &amp;sélectionner</translation>
+        <translation>Tout &amp;sélectionner</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Go To Line...</source>
-        <translation type="unfinished">&amp;Aller à la ligne...</translation>
+        <translation>&amp;Aller à la ligne...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Options...</source>
-        <translation type="unfinished">&amp;Options...</translation>
+        <translation>&amp;Options...</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -1719,7 +1712,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+12"/>
         <source>Show Sidebar</source>
-        <translation type="unfinished">Afficher la barre latérale</translation>
+        <translation>Afficher la barre latérale</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -1729,28 +1722,28 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+10"/>
         <source>About &amp;Qt Creator</source>
-        <translation type="unfinished">A propos de &amp;Qt Creator</translation>
+        <translation>À propos de &amp;Qt Creator</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>About &amp;Qt Creator...</source>
-        <translation type="unfinished">A propos de &amp;Qt Creator...</translation>
+        <translation>À propos de &amp;Qt Creator...</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>About &amp;Plugins...</source>
-        <translation type="unfinished">A propos des &amp;Plugins...</translation>
+        <translation>À propos des &amp;Plugins...</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>New...</source>
         <comment>Title of dialog</comment>
-        <translation type="unfinished">Nouveau...</translation>
+        <translation>Nouveau...</translation>
     </message>
     <message>
         <location line="+511"/>
         <source>Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Paramètres...</translation>
     </message>
 </context>
 <context>
@@ -1774,7 +1767,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="-146"/>
         <source>Split</source>
-        <translation type="unfinished">Scinder</translation>
+        <translation>Scinder</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1787,7 +1780,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="-40"/>
         <source>Activate %1 Pane</source>
-        <translation type="unfinished">Activer le Panneau %1</translation>
+        <translation>Activer le panneau %1</translation>
     </message>
 </context>
 <context>
@@ -1800,7 +1793,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location/>
         <source>1</source>
-        <translation></translation>
+        <translation>1</translation>
     </message>
 </context>
 <context>
@@ -1844,7 +1837,7 @@ Voulez vous les écraser?</translation>
         <location filename="../../../src/plugins/coreplugin/editormanager/openeditorswindow.cpp" line="+210"/>
         <location line="+27"/>
         <source>*</source>
-        <translation></translation>
+        <translation>*</translation>
     </message>
 </context>
 <context>
@@ -1880,7 +1873,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+62"/>
         <source>Output &amp;Panes</source>
-        <translation type="unfinished">&amp;Paneaux de sortie</translation>
+        <translation>&amp;Paneaux de sortie</translation>
     </message>
 </context>
 <context>
@@ -1893,7 +1886,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+1"/>
         <source>Error Details</source>
-        <translation type="unfinished">Détails de l&apos;erreur</translation>
+        <translation>Détails de l&apos;erreur</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1909,13 +1902,12 @@ Voulez vous les écraser?</translation>
         <location line="+35"/>
         <source>Plugin Details of %1</source>
         <translatorcomment>Détail sur le plugin %1 ?</translatorcomment>
-        <translation type="unfinished">Détail sur plugin %1</translation>
+        <translation type="unfinished">Détails du plugin %1</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Plugin Errors of %1</source>
-        <translatorcomment>Pas de s</translatorcomment>
-        <translation type="unfinished">Erreurs du plugins %1</translation>
+        <translation>Erreurs du plugin %1</translation>
     </message>
 </context>
 <context>
@@ -1923,7 +1915,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/coreplugin/progressmanager/progressview.cpp" line="+47"/>
         <source>Processes</source>
-        <translation type="unfinished">Processus</translation>
+        <translation>Processus</translation>
     </message>
 </context>
 <context>
@@ -1987,7 +1979,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/coreplugin/sidebar.cpp" line="-130"/>
         <source>Split</source>
-        <translation type="unfinished">Scinder</translation>
+        <translation>Scinder</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2006,13 +1998,13 @@ Voulez vous les écraser?</translation>
         <location line="+11"/>
         <source>From revision %1&lt;br/&gt;</source>
         <extracomment>This gets conditionally inserted as argument %8 into the description string.</extracomment>
-        <translation type="unfinished">Depuis la révision %1&lt;br/&gt;</translation>
+        <translation>Depuis la révision %1&lt;br/&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&lt;h3&gt;Qt Creator %1&lt;/h3&gt;Based on Qt %2 (%3 bit)&lt;br/&gt;&lt;br/&gt;Built on %4 at %5&lt;br /&gt;&lt;br/&gt;%8&lt;br/&gt;Copyright 2008-%6 %7. All rights reserved.&lt;br/&gt;&lt;br/&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;br/&gt;</source>
         <translatorcomment>%4 == __DATE__ et %5 ==__TIME__. Pour les formulations légales, dans le doute, mieux vaut laisser l&apos;anglais...</translatorcomment>
-        <translation type="unfinished">&lt;h3&gt;Qt Creator %1&lt;/h3&gt;Basé sur Qt %2 (%3 bit)&lt;br/&gt;&lt;br/&gt;Compilé le %4 à %5&lt;br /&gt;&lt;br/&gt;%8&lt;br/&gt;Copyright 2008-%6 %7. Tous droits réservés.&lt;br/&gt;&lt;br/&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;br/&gt;</translation>
+        <translation type="unfinished">&lt;h3&gt;Qt Creator %1&lt;/h3&gt;Basé sur Qt %2 (%3 bit)&lt;br/&gt;&lt;br/&gt;Compilé le %4 à %5&lt;br /&gt;&lt;br/&gt;%8&lt;br/&gt;Copyright 2008-%6 %7. Tous droits réservés.&lt;br/&gt;&lt;br/&gt;Ce programme est fournit « EN L&apos;ÉTAT », SANS GARANTIE D&apos;AUCUNE SORTE, INCLUANT, SANS S&apos;Y LIMITER, LES GARANTIES D&apos;ABSENCE DE DÉFAUT, DE QUALITÉ MARCHANDE, D&apos;ADÉQUATION À UN USAGE PARTICULIER.&lt;br/&gt;</translation>
     </message>
 </context>
 <context>
@@ -2191,17 +2183,17 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/libs/utils/checkablemessagebox.ui"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Boîte de dialogue</translation>
     </message>
     <message>
         <location/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Label de texte</translation>
     </message>
     <message>
         <location/>
         <source>CheckBox</source>
-        <translation type="unfinished"></translation>
+        <translation>Case à cocher</translation>
     </message>
 </context>
 <context>
@@ -2252,7 +2244,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+5"/>
         <source>Cannot change to working directory &apos;%1&apos;: %2</source>
-        <translation type="unfinished">Impossible de changer le répertoire de travail &apos;%1&apos; : %2</translation>
+        <translation>Impossible de changer le répertoire de travail &apos;%1&apos; : %2</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2277,12 +2269,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+70"/>
         <source>Cannot obtain a handle to the inferior: %1</source>
-        <translation type="unfinished">Impossible d&apos;obtenir le descripteur du processus : %1</translation>
+        <translation>Impossible d&apos;obtenir le descripteur du processus : %1</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Cannot obtain exit status from inferior: %1</source>
-        <translation type="unfinished">Impossible d&apos;obtenir la valeur de retour du processus : %1</translation>
+        <translation>Impossible d&apos;obtenir la valeur de retour du processus : %1</translation>
     </message>
 </context>
 <context>
@@ -2395,7 +2387,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/libs/utils/newclasswidget.ui"/>
         <source>Inherits QObject</source>
-        <translation type="unfinished"></translation>
+        <translation>hérite de QObject</translation>
     </message>
 </context>
 <context>
@@ -2494,7 +2486,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/libs/utils/projectintropage.cpp" line="+65"/>
         <source>&lt;Enter_Name&gt;</source>
-        <translation type="unfinished">&lt;Entrer_Nom&gt;</translation>
+        <translation>&lt;Entrer_Nom&gt;</translation>
     </message>
     <message>
         <location line="+97"/>
@@ -2561,7 +2553,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+4"/>
         <source>The unsaved file %1 has been changed outside Qt Creator. Do you want to reload it and discard your changes?</source>
-        <translation></translation>
+        <translation>Le fichier %1 n&apos;est pas enregistré et a été modifé en dehors de Qt Creator. Voulez-vous le recharger et ignorer vos changements ?</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2579,12 +2571,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+163"/>
         <source>This change cannot be undone.</source>
-        <translation></translation>
+        <translation>Ce changement ne peut être annulé.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Yes, I know what I am doing.</source>
-        <translation>Simplifier les déclarations</translation>
+        <translation>Simplifier les déclarations.</translation>
     </message>
     <message>
         <source>Simplify Declarations</source>
@@ -2638,7 +2630,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+174"/>
         <source>C++</source>
-        <translation></translation>
+        <translation>C++</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2683,12 +2675,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+9"/>
         <source>Find Usages</source>
-        <translation type="unfinished">Trouver des utilisations</translation>
+        <translation>Trouver des utilisations</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Shift+U</source>
-        <translation type="unfinished">Ctrl+Shift+U</translation>
+        <translation>Ctrl+Shift+U</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2737,8 +2729,8 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+295"/>
         <source>Scanning</source>
-        <translatorcomment>Balayage ?</translatorcomment>
-        <translation type="unfinished">Numérisation</translation>
+        <translatorcomment>Balayage ? (Numérisation ça fait franchement scanner)</translatorcomment>
+        <translation>Analyse</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -2756,7 +2748,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+1"/>
         <source>C++</source>
-        <translation></translation>
+        <translation>C++</translation>
     </message>
 </context>
 <context>
@@ -2799,7 +2791,7 @@ Voulez vous les écraser?</translation>
 **   To protect a percent sign, use &apos;%%&apos;.
 **************************************************************************/
 </source>
-        <translation type="unfinished">/**************************************************************************
+        <translation>/**************************************************************************
 ** Modèle de licence Qt Creator
 **   Mot-clés spéciaux: %USER% %DATE% %YEAR%
 **   Variables d&apos;environnement : %$VARIABLE%
@@ -2809,7 +2801,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+157"/>
         <source>Edit...</source>
-        <translation>Éditer...</translation>
+        <translation>Modifier...</translation>
     </message>
     <message>
         <location line="+51"/>
@@ -2857,8 +2849,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+8"/>
         <source>Switch Header/Source</source>
-        <translatorcomment>&quot;Sauter&quot;, ça pourrait prêter à confusion, non ?</translatorcomment>
-        <translation type="unfinished">Basculer entre en-tête/source</translation>
+        <translation>Basculer entre en-tête/source</translation>
     </message>
 </context>
 <context>
@@ -2918,20 +2909,20 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+103"/>
         <source>Found an outdated version of the debugging helper library (%1); version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une version obsolète de la librairie d&apos;assistance au déboggage a été trouvée (%1); version %2 requise.</translation>
     </message>
     <message numerus="yes">
         <location line="+37"/>
         <source>%n known types, Qt version: %1, Qt namespace: %2 Dumper version: %3</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n type connu, version de Qt : %1, espace de noms Qt : %2, version du collecteur : %3</numerusform>
+            <numerusform>%n types connus, version de Qt : %1, espace de noms Qt : %2, version du collecteur : %3</numerusform>
         </translation>
     </message>
     <message>
         <location line="-1"/>
         <source>&lt;none&gt;</source>
-        <translation></translation>
+        <translation>&lt;aucun&gt;</translation>
     </message>
 </context>
 <context>
@@ -2975,7 +2966,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+220"/>
         <source>Select start address</source>
-        <translation type="unfinished">Sélectionner l&apos;adresse de départ</translation>
+        <translation>Sélectionner l&apos;adresse de départ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3092,7 +3083,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+0"/>
         <source>Address</source>
-        <translation></translation>
+        <translation>Adresse</translation>
     </message>
     <message>
         <location line="+62"/>
@@ -3210,33 +3201,33 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+349"/>
         <source>Version: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Version : %1</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&lt;html&gt;The installed version of the &lt;i&gt;Debugging Tools for Windows&lt;/i&gt; (%1) is rather old. Upgrading to version %2 is recommended for the proper display of Qt&apos;s data types.&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;html&gt;La version des &lt;i&gt;Outils de déboggage pour Windows&lt;/i&gt;installée (%1) est relativement ancienne. Une mise à jour vers la version %2 est recommandée pour un affichage correct des types Qt.&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Debugger</source>
-        <translation type="unfinished">Débogueur</translation>
+        <translation>Débogueur</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>The dumper library was not found at %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">La bibliothèque de collection de données n&apos;a pas été trouvée en %1.</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>The console stub process was unable to start &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le processus de console n&apos;a pas pu lancer &apos;%1&apos;.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Attaching to core files is not supported!</source>
-        <translatorcomment>A noun could be better instead of Attacher</translatorcomment>
-        <translation type="unfinished">Attacher à un fichier core n&apos;est pas supporté!</translation>
+        <translatorcomment>A noun could be better instead of Attacher ← attachement ?</translatorcomment>
+        <translation type="unfinished">L&apos;attachement à un fichier core n&apos;est pas supporté!</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -3277,38 +3268,38 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+24"/>
         <source>Reverse stepping is not implemented.</source>
-        <translation type="unfinished">L&apos;échelonnage inversé n&apos;est pas implémenté.</translation>
+        <translation type="unfinished">Le déplacement inversé n&apos;est pas implémenté.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Thread %1 cannot be stepped.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le fil d&apos;éxecution %1 ne peut être parcouru pas à pas.</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Stepping %1</source>
         <translatorcomment>Intensification ?</translatorcomment>
-        <translation type="unfinished">Echellonage %1</translation>
+        <translation type="unfinished">Pas à pas %1</translation>
     </message>
     <message>
         <location line="+63"/>
         <source>Running to 0x%1...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lancement à l&apos;adresse 0x%1…</translation>
     </message>
     <message>
         <location line="+67"/>
         <source>Running requested...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éxecution requise…</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Running up to %1:%2...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éxecution jusqu&apos;à %1 : %2…</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Running up to function &apos;%1()&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éxecution jusqu&apos;à la fonction &apos;%1()&apos;…</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -3340,12 +3331,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+27"/>
         <source>Ignoring initial breakpoint...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Point d&apos;arrêt initial ignoré…</translation>
     </message>
     <message>
         <location line="+55"/>
         <source>Interrupted in thread %1, current thread: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Interruption dans le fil d&apos;éxecution %1, fil d&apos;éxecution courant : %2</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3384,47 +3375,48 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+5"/>
         <source>Loading the custom dumper library &apos;%1&apos; (%2) ...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Chargement de la bibliothèque du collecteur de données personnalisé &apos;%1&apos; (%2)...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Loading of the custom dumper library &apos;%1&apos; (%2) failed: %3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec du chargement de la bibliothèque du collecteur de données personnalisé &apos;%1&apos; (%2) : %3</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Loaded the custom dumper library &apos;%1&apos; (%2).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bibliothèque du collecteur de données personnalisé &apos;%1&apos; chargée (%2).</translation>
     </message>
     <message>
         <location line="+62"/>
         <source>Stopped / Custom dumper library initialized.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Stopped?</translatorcomment>
+        <translation type="unfinished">Collecteur de données personnalisé initialisé.</translation>
     </message>
     <message>
         <location line="+77"/>
         <source>Disabling dumpers due to debuggee crash...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Désactive les collecteurs de données à cause d&apos;un crash du débogué...</translation>
     </message>
     <message>
         <location line="-43"/>
         <source>The debuggee does not appear to be Qt application.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le débogué ne semble pas être une application Qt.</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Initializing dumpers...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Initialise les collecteurs de données...</translation>
     </message>
     <message>
         <location line="-39"/>
         <source>The custom dumper library could not be initialized: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">La bibliothèque de collecteurs de données personnalisé n&apos;a pas pu être initialisé : %1</translation>
     </message>
     <message>
         <location line="+411"/>
         <source>Querying dumpers for &apos;%1&apos;/&apos;%2&apos; (%3)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Recherche de collecteur pour &apos;%1&apos;/&apos;%2&apos; (%3)</translation>
     </message>
 </context>
 <context>
@@ -3511,8 +3503,8 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+3"/>
         <source>Step Into</source>
-        <translatorcomment>Pas sur???</translatorcomment>
-        <translation type="unfinished">Aller dans</translation>
+        <translatorcomment>check all the instances of &quot;Step Into&quot; if you modify this one</translatorcomment>
+        <translation>Entrer dans</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3543,12 +3535,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+2"/>
         <source>Add to Watch Window</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter à la fenêtre d&apos;observeur</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Reverse Direction</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Inverser la direction</translation>
     </message>
     <message>
         <location line="+235"/>
@@ -3619,17 +3611,17 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+312"/>
         <source>Turn off helper usage</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Désactiver cet avertissement</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>The debugger could not load the debugging helper library.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le débogueur n&apos;a pas pu charger la bibliothèque d&apos;aide au déboguage.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each used Qt version separately. This can be done in the Qt preferences page by selecting a Qt installation and clicking on &apos;Rebuild&apos; in the &apos;Debugging Helper&apos; row.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">L&apos;aide au déboguage est utilisé pour visualiser facilement les valeurs de certains types de Qt et de la bibliothèque standard C++. Elle doit être compilé séparément pour chaque version de Qt. Ceci peut être fait dans la page de préférences de Qt en sélectionnant une version de Qt et en cliquant sur &quot;Recompiler&quot; à la ligne &quot;Aide au déboguage&quot;.</translation>
     </message>
     <message>
         <location line="+164"/>
@@ -3670,17 +3662,17 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+36"/>
         <source>Close Debugging Session</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fermer la session de déboguage</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>A debugging session is still in progress. Would you like to terminate it?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une session de déboguage est en cours. Voulez vous la terminer ?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>A debugging session is still in progress. Terminating the session in the current state (%1) can leave the target in an inconsistent state. Would you still like to terminate it?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une session de déboguage est en cours. Terminer la session dans l&apos;état courant (%1) risque de laisser la cible dans un état incohérent. Voulez vous la terminer néanmoins ?</translation>
     </message>
 </context>
 <context>
@@ -3688,38 +3680,38 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+269"/>
         <source>Option &apos;%1&apos; is missing the parameter.</source>
-        <translation type="unfinished">Option &apos;%1&apos; le paramètre est manquant.</translation>
+        <translation type="unfinished">Option &apos;%1&apos; : le paramètre est manquant.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The parameter &apos;%1&apos; of option &apos;%2&apos; is not a number.</source>
-        <translation type="unfinished">Le paramètre &apos;%1&apos; de l&apos;option &apos;%2&apos; n&apos;est pas un nombre.</translation>
+        <translation>Le paramètre &apos;%1&apos; de l&apos;option &apos;%2&apos; n&apos;est pas un nombre.</translation>
     </message>
     <message>
         <location line="+54"/>
         <source>Invalid debugger option: %1</source>
-        <translation type="unfinished">Option du débogueur invalide : %1</translation>
+        <translation>Option du débogueur invalide : %1</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Error evaluating command line arguments: %1</source>
-        <translation type="unfinished">Erreur durant l&apos;évaluation des arguments de la ligne de commande : %1</translation>
+        <translation>Erreur durant l&apos;évaluation des arguments de la ligne de commande : %1</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Start and Debug External Application...</source>
-        <translation type="unfinished">Démarrer et déboguer une application externe...</translation>
+        <translation>Démarrer et déboguer une application externe...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Attach to Running External Application...</source>
-        <translation type="unfinished">Attacher à l&apos;application externe en cours d&apos;éxecution...</translation>
+        <translation>Attacher à l&apos;application externe en cours d&apos;éxecution...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Attach to Core...</source>
         <translatorcomment>idem, core?</translatorcomment>
-        <translation type="unfinished">Attacher au core...</translation>
+        <translation>Attacher au core...</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -3754,7 +3746,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+15"/>
         <source>Reset to default layout</source>
-        <translation type="unfinished">Restaurer la disposition par défaut</translation>
+        <translation>Restaurer la disposition par défaut</translation>
     </message>
     <message>
         <location line="+79"/>
@@ -3765,12 +3757,12 @@ Voulez vous les écraser?</translation>
         <location line="+84"/>
         <source>Attaching to PID %1.</source>
         <translatorcomment>Attachement ?</translatorcomment>
-        <translation type="unfinished">Attachement au PID %1.</translation>
+        <translation>Attachement au PID %1.</translation>
     </message>
     <message>
         <location line="+75"/>
         <source>Remove Breakpoint</source>
-        <translation type="unfinished">Supprimer le point d&apos;arrêt</translation>
+        <translation>Supprimer le point d&apos;arrêt</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -3785,25 +3777,25 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+7"/>
         <source>Set Breakpoint</source>
-        <translation type="unfinished">Définir un point d&apos;arrêt</translation>
+        <translation>Définir un point d&apos;arrêt</translation>
     </message>
     <message>
         <location line="+229"/>
         <source>Warning</source>
         <translatorcomment>Alerte?</translatorcomment>
-        <translation type="unfinished">Avertissement</translation>
+        <translation>Avertissement</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot attach to PID 0</source>
         <translatorcomment>de s&apos;attacher ? Pas sur</translatorcomment>
-        <translation type="unfinished">Impossible de s&apos;attacher au PID 0</translation>
+        <translation>Impossible de s&apos;attacher au PID 0</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Attaching to core %1.</source>
         <translatorcomment>core, toujours?</translatorcomment>
-        <translation type="unfinished">Attachement au core %1.</translation>
+        <translation>Attachement au core %1.</translation>
     </message>
 </context>
 <context>
@@ -3811,7 +3803,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/debugger/debuggeractions.cpp" line="+118"/>
         <source>Debugger properties...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">propriétés du débogueur…</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3826,7 +3818,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+5"/>
         <source>Use alternating row colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser des couleurs de lignes alternées</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -3836,62 +3828,62 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+8"/>
         <source>Log time stamps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">horodater le journal</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Operate by instruction</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">opérer par instruction</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>This switches the debugger to instruction-wise operation mode. In this mode, stepping operates on single instructions and the source location view also shows the disassembled instructions.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ceci passe le débogueur en mode instruction par instruction. Dans ce mode, avancer pas à pas agit sur une seul instruction, et la vue des source affiche aussi les instructions désassemblés.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Dereference pointers automatically</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">déréférencer les pointeurs automatiquement</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>This switches the Locals&amp;Watchers view to automatically derefence pointers. This saves a level in the tree view, but also loses data for the now-missing intermediate level.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ceci active le déférencement automatique des pointeurs dans les vues &quot;Variables locales&quot; et &quot;Observateur&quot;. Ceci réduit l&apos;arbre d&apos;un niveau, mais certaines données sont cachées.</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Watch expression &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Observer l&apos;expression &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Remove watch expression &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Retirer &quot;%1&quot; des expressions à observer</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Watch expression &quot;%1&quot; in separate window</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Observer l&apos;expression &quot;%1&quot; dans une fenêtre séparée</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Use debugging helper</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">utiliser l&apos;assistant de déboguage</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Debug debugging helper</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser les aides au déboguage</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Use code model</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser le modèle de code</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Recheck debugging helper availability</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Revérifier la disponibilité de l&apos;assistant de déboguage</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -3901,7 +3893,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+30"/>
         <source>Use tooltips in main editor when debugging</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser les info-bulles dans l&apos;éditeur principal lors du déboguage</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3911,57 +3903,57 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+10"/>
         <source>Use tooltips in locals view when debugging</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser des info-bulles dans la vue &quot;variables locales&quot; lors du déboguage</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Checking this will enable tooltips in the locals view during debugging.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cocher ceci activera les info-bulles dans la vue des variables locales lors du déboguage.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Use tooltips in breakpoints view when debugging</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser les info-bulles dans la vue des points d&apos;arrêts lors du déboguage</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Checking this will enable tooltips in the breakpoints view during debugging.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cocher ceci actiera les info-bulles dans la vue des points d&apos;arrêt lors du déboguage.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Show address data in breakpoints view when debugging</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher l&apos;adresse des données dans la vue des points d&apos;arrêts lors du déboguage</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Checking this will show a column with address information in the breakpoint view during debugging.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cocher ceci affichera l&apos;adresse des données dans la vue des points d&apos;arrêts lors du déboguage.</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Show address data in stack view when debugging</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher les adresses des données dans la vue de la pile lors du déboguage</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Checking this will show a column with address information in the stack view during debugging.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cocher ceci affichera les adresses des données dans la vue de la pile lors du déboguage.</translation>
     </message>
     <message>
         <location line="-47"/>
         <source>Automatically quit debugger</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Quitter le déboggueur automatiquement</translation>
     </message>
     <message>
         <location line="+55"/>
         <source>List source files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lister les fichiers source</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Skip known frames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sauter les séquences connues</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -3971,12 +3963,12 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+31"/>
         <source>Reload full stack</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Recharger l&apos;intégralité de la pile</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Execute line</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Executer la ligne</translation>
     </message>
 </context>
 <context>
@@ -3984,17 +3976,17 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-912"/>
         <source>Debugging Helper</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Assistant de déboguage</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Choose DebuggingHelper Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Choisir l&apos;emplacement de l&apos;assistant de déboguage</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Ctrl+Shift+F11</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+Maj+F11</translation>
     </message>
 </context>
 <context>
@@ -4002,92 +3994,93 @@ Voulez vous les écraser?</translation>
     <message>
         <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+293"/>
         <source>The Gdb process failed to start. Either the invoked program &apos;%1&apos; is missing, or you may have insufficient permissions to invoke the program.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec du démarrage du processus Gdb. Soit le programme &apos;%1&apos; est manquant, soit les droîts sont insufisants pour exécuter le programme.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The Gdb process crashed some time after starting successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le processus Gdb a crashé après avoir démarré correctement.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>this string appear twice in the translation</translatorcomment>
+        <translation type="unfinished">La dernière fonction waitFor...() est arrivé à échéance. Le status de QProcess est inchangé, vous pouvez essayer d&apos;appeler waitFor...() à nouveau.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>An error occurred when attempting to write to the Gdb process. For example, the process may not be running, or it may have closed its input channel.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une érreur s&apos;est produite lors d&apos;une tentative d&apos;écriture sur le processus Gdb. Le processus peut ne pas être démarré, ou il peut avoir fermé son entrée standard.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>An error occurred when attempting to read from the Gdb process. For example, the process may not be running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une erreur s&apos;est produite lors d&apos;un tentative de lecture depuis le processus Gdb. Le processus peut ne pas être en cours d&apos;exécution.</translation>
     </message>
     <message>
         <location line="+117"/>
         <source>Library %1 loaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bibliothèque %1 chargée.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Library %1 unloaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bibliothèque %1 déchargée.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Thread group %1 created.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Group de thread %1 créé.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Thread %1 created.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Thread %1 créé.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Thread group %1 exited.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Groupe de thread %1 terminé.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Thread %1 in group %2 exited.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Thread %1 dans le groupe %2 terminé.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Thread %1 selected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Thread %1 sélecitonné.</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Reading %1...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lecture de %1...</translation>
     </message>
     <message>
         <location line="+218"/>
         <source>Stopping temporarily.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arrêt temporaire.</translation>
     </message>
     <message>
         <location line="+198"/>
         <source>Jumped. Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sauté. Arrêté.</translation>
     </message>
     <message>
         <location line="+107"/>
         <source>Processing queued commands.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Traite les commandes en file d&apos;attente.</translation>
     </message>
     <message>
         <location line="+54"/>
         <source>Loading %1...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Charge %1...</translation>
     </message>
     <message>
         <location line="+76"/>
         <source>Stopped at breakpoint.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arrêté au point d&apos;arrêt.</translation>
     </message>
     <message>
         <location line="+25"/>
@@ -4098,7 +4091,7 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="-980"/>
         <source>An unknown error in the Gdb process occurred. </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une erreur inconnue est survenue dans le processus Gdb. </translation>
     </message>
     <message>
         <location line="+231"/>
@@ -4108,38 +4101,38 @@ Voulez vous les écraser?</translation>
     <message>
         <location line="+91"/>
         <source>Stop requested...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arrêt demandé...</translation>
     </message>
     <message>
         <location line="+141"/>
         <location line="+16"/>
         <source>Executable failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de l&apos;exécutable</translation>
     </message>
     <message>
         <location line="-15"/>
         <source>Process failed to start.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le processus n&apos;a pu pas démarrer.</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Executable failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de l&apos;exécutable : %1</translation>
     </message>
     <message>
         <location line="+217"/>
         <source>Program exited with exit code %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le programme s&apos;est terminé avec le code de sortie %1.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Program exited after receiving signal %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le programme s&apos;est terminé après la reception du signal %1.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Program exited normally.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le programme s&apos;est terminé normallement.</translation>
     </message>
     <message>
         <location line="+155"/>
@@ -4150,12 +4143,12 @@ Voulez vous les écraser?</translation>
         <location line="+4"/>
         <location line="+1"/>
         <source> &lt;Unknown&gt; </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> &lt;inconnu&gt; </translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Signal received</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Signal reçu</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -4312,29 +4305,30 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="-2124"/>
         <source>Unable to run &apos;%1&apos;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;exécuter &apos;%1&apos; : %2</translation>
     </message>
     <message>
         <location line="-792"/>
         <source>Execution Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur d&apos;exécution</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cannot continue debugged process:
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de continuer le processus débogué :
+</translation>
     </message>
     <message>
         <location line="+206"/>
         <source>Continuing after temporary stop...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Continu après un arrêt temporaire...</translation>
     </message>
     <message>
         <location line="+653"/>
         <source>&lt;unknown&gt;</source>
         <extracomment>End address of loaded module</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;inconnue&gt;</translation>
     </message>
     <message>
         <location line="+37"/>
@@ -4368,37 +4362,37 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+128"/>
         <source>&lt;0 items&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;0 éléments&gt;</translation>
     </message>
     <message numerus="yes">
         <location line="+7"/>
         <source>&lt;%n items&gt;</source>
         <extracomment>In string list</extracomment>
         <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+            <numerusform>&lt;%n élément&gt;</numerusform>
+            <numerusform>&lt;%n éléments&gt;</numerusform>
         </translation>
     </message>
     <message>
         <location line="+217"/>
         <source>&lt;shadowed&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;%n élément&gt;</translation>
     </message>
     <message>
         <location line="+133"/>
         <source>&lt;n/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;%n élément&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&lt;anonymous union&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;union anonyme&gt;</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>&lt;no information&gt;</source>
         <extracomment>About variable&apos;s value</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;aucune information&gt;</translation>
     </message>
 </context>
 <context>
@@ -4447,12 +4441,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/debugger/moduleswindow.cpp" line="+64"/>
         <source>Modules</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modules</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>Update module list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mettre à jour la liste des modules</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -4467,62 +4461,62 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="-29"/>
         <source>Show source files for module &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher les fichiers source du module &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Load symbols for all modules</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Charger les symboles pour tout les modules</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Load symbols for module</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Charcher les symboles pour le module</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Edit file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditer le fichier</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Show symbols</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher les symboles</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Load symbols for module &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Charger les symboles pour le module &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Edit file &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditer le fichier &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Show symbols in file &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Affichier les symboles dans le fichier &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+79"/>
         <source>Address</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adresse</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Code</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Code</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Symbol</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Symbole</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Symbols in &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Symboles dans &quot;%1&quot;</translation>
     </message>
 </context>
 <context>
@@ -4530,17 +4524,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/debugger/outputcollector.cpp" line="+95"/>
         <source>Cannot create temporary file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de créer le fichier temporaire : %1</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Cannot create FiFo %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de créer le FiFo %1 : %2</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Cannot open FiFo %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;ouvrir le FiFo %1 : %2</translation>
     </message>
 </context>
 <context>
@@ -4553,7 +4547,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+1"/>
         <source>Value (base %1)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Valeur (base %1)</translation>
     </message>
 </context>
 <context>
@@ -4561,37 +4555,37 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/debugger/registerwindow.cpp" line="+150"/>
         <source>Registers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Registres</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Open memory editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir l&apos;éditeur de mémoire</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Open memory editor at %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir l&apos;éditeur de mémoire à l&apos;adresse %1</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Hexadecimal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hexadécimal</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Decimal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Décimal</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Octal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Octal</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Binary</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Binaire</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -4606,7 +4600,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="-32"/>
         <source>Reload register listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Recharger la liste des registres</translation>
     </message>
 </context>
 <context>
@@ -4614,22 +4608,22 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/debugger/script/scriptengine.cpp" line="+244"/>
         <source>Running requested...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécution...</translation>
     </message>
     <message>
         <location line="+228"/>
         <source>&apos;%1&apos; contains no identifier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&apos;%1&apos; ne contient pas d&apos;identifiant</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>String literal %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Chaîne de caractères %1</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Cowardly refusing to evaluate expression &apos;%1&apos; with potential side effects</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Refuse lâchement d&apos;évaluer l&apos;expression &apos;%1&apos; avec des effects secondaires potentiels</translation>
     </message>
     <message>
         <location line="+81"/>
@@ -4643,12 +4637,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/debugger/sourcefileswindow.cpp" line="+98"/>
         <source>Internal name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom interne</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Full name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom complet</translation>
     </message>
 </context>
 <context>
@@ -4656,12 +4650,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+76"/>
         <source>Source Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichiers source</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Reload data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Recharger les données</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -4671,7 +4665,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+3"/>
         <source>Open file &quot;%1&quot;&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir le fichier &quot;%1&quot;</translation>
     </message>
 </context>
 <context>
@@ -4680,52 +4674,52 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+66"/>
         <location line="+14"/>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adresse :</translation>
     </message>
     <message>
         <location line="-13"/>
         <location line="+14"/>
         <source>Function:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fonction :</translation>
     </message>
     <message>
         <location line="-13"/>
         <location line="+14"/>
         <source>File:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier :</translation>
     </message>
     <message>
         <location line="-13"/>
         <location line="+14"/>
         <source>Line:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ligne :</translation>
     </message>
     <message>
         <location line="-13"/>
         <location line="+14"/>
         <source>From:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">À partir de :</translation>
     </message>
     <message>
         <location line="-13"/>
         <location line="+14"/>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vers :</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&lt;More&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;plus&gt;</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Niveau</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4745,7 +4739,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+1"/>
         <source>Address</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adresse</translation>
     </message>
 </context>
 <context>
@@ -4768,27 +4762,27 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+2"/>
         <source>Address</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adresse</translation>
     </message>
     <message>
         <location line="-28"/>
         <source>Thread: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Thread: %1</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Thread: %1 at %2 (0x%3)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Thread: %1 à %2 (0x%3)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Thread: %1 at %2, %3:%4 (0x%5)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Thread: %1 à %2, %3:%4 (0x%5)</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Thread ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ID du Thread</translation>
     </message>
 </context>
 <context>
@@ -4796,32 +4790,32 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/debugger/stackwindow.cpp" line="+60"/>
         <source>Stack</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pile</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Copy contents to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Copier le contenu dans le presse papier</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open memory editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir l&apos;éditeur de mémoire</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Open memory editor at %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir l&apos;éditeur de mémoire à l&apos;adresse %1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open disassembler</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir le désasembleur</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Open disassembler at %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir le désasembleur à l&apos;adresse %1</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -4844,12 +4838,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+7"/>
         <source>Executable:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécutable :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Arguments:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arguments :</translation>
     </message>
 </context>
 <context>
@@ -4865,7 +4859,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+46"/>
         <source>Thread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Thread</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -4884,12 +4878,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+71"/>
         <location line="+250"/>
         <source>&lt;not in scope&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;pas dans la portée&gt;</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>%1 &lt;shadowed %2&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 &lt;shadowed %2&gt;</translation>
     </message>
 </context>
 <context>
@@ -4897,7 +4891,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="-27"/>
         <source>Expression</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Expression</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4907,57 +4901,57 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+4"/>
         <source> ... &lt;cut off&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">... &lt;coupé&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Valeur</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Object Address</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adresse de l&apos;objet</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stored Address</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adresse stockée</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Root</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Racine</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Locals</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Variables locales</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Watchers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Observateurs</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Tooltip</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Info-bulle</translation>
     </message>
     <message>
         <location line="+1069"/>
         <source>&lt;Edit&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;Éditer&gt;</translation>
     </message>
     <message>
         <location line="-1116"/>
         <source>Internal ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ID interne</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Génération</translation>
     </message>
 </context>
 <context>
@@ -4965,22 +4959,22 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+447"/>
         <source>decimal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">décimal</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>hexadecimal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">hexadécimal</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>binary</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">binaire</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>octal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">octal</translation>
     </message>
     <message>
         <location line="+86"/>
@@ -4990,7 +4984,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+1"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Valeur</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5003,47 +4997,47 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/debugger/watchwindow.cpp" line="+128"/>
         <source>Locals and Watchers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Variables locales et observateurs</translation>
     </message>
     <message>
         <location line="+95"/>
         <source>Change format for type &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modifier le format pour le type &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Change format for expression &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modifier le format pour l&apos;expression &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Change format for type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modifier le format pour le type</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Change format for expression</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modifier le format pour l&apos;expression</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Select widget to watch</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sélectionner le widget à observer</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open memory editor...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir l&apos;éditeur de mémoire...</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Open memory editor at %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir l&apos;éditeur de mémoire à l&apos;adresse %1</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Refresh code model snapshot</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rafraîchir l&apos;instanté ud code</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -5058,7 +5052,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="-38"/>
         <source>Insert new watch item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Insérer un nouvel élémen observé</translation>
     </message>
 </context>
 <context>
@@ -5066,12 +5060,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="-140"/>
         <source>Clear contents</source>
-        <translation type="unfinished">Effacer le contenu</translation>
+        <translation>Effacer le contenu</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Save contents</source>
-        <translation type="unfinished">Sauver le contenu</translation>
+        <translation>Sauver le contenu</translation>
     </message>
 </context>
 <context>
@@ -5079,47 +5073,49 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/debugger/dumperoptionpage.ui"/>
         <source>Debugging helper</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aide au débogage</translation>
     </message>
     <message>
         <location/>
         <source>This will enable nice display of Qt and Standard Library objects in the Locals&amp;Watchers view</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Traduction de  Locals&amp;Watchers ?</translatorcomment>
+        <translation type="unfinished">Cela permettra un affichage correct des objets de Qt et de la bibliothèque standard dans a vue Locals&amp;Watchers</translation>
     </message>
     <message>
         <location/>
         <source>Use debugging helper</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser l&apos;aide au déboguage</translation>
     </message>
     <message>
         <location/>
         <source>This will load a dumper library</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ceci charchera une bibliothèque de collecte de données</translation>
     </message>
     <message>
         <location/>
         <source>Use debugging helper from custom location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser un collecteur de données à partir d&apos;un emplacement personnalisé</translation>
     </message>
     <message>
         <location/>
         <source>Location: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Emplacement :</translation>
     </message>
     <message>
         <location/>
         <source>Debug debugging helper</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Déboguer l&apos;aide au déboguage</translation>
     </message>
     <message>
         <location/>
         <source>Makes use of Qt Creator&apos;s code model to find out if a variable has already been assigned a value at the point the debugger interrupts.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utilise le modèle de code de Qt Creator pour trouver si une valeur à déjà été assigné à une variable au point où le débogueur interomps l&apos;exécution.</translation>
     </message>
     <message>
         <location/>
         <source>Use code model</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>pas exactement ça ?</translatorcomment>
+        <translation type="unfinished">Utiliser le modèle de code</translation>
     </message>
 </context>
 <context>
@@ -5127,12 +5123,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+121"/>
         <source>Unable to add dependency</source>
-        <translation type="unfinished">Impossible d&apos;ouvrir les dépendances</translation>
+        <translation>Impossible d&apos;ajouter une dépendance</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>This would create a circular dependency.</source>
-        <translation type="unfinished">Ceci créerais une dépendance circulaire.</translation>
+        <translation>Ceci créerais une dépendance circulaire.</translation>
     </message>
 </context>
 <context>
@@ -5140,17 +5136,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+143"/>
         <source>%1 has no dependencies.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 n&apos;a aucune dépendances.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 depends on %2.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 dépend de %2.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 depends on: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 dépend de : %2.</translation>
     </message>
 </context>
 <context>
@@ -5158,27 +5154,27 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/shared/qrceditor/resourcefile.cpp" line="+54"/>
         <source>The file name is empty.</source>
-        <translation type="unfinished">Le nom de fichier est vide.</translation>
+        <translation>Le nom de fichier est vide.</translation>
     </message>
     <message>
         <location line="+54"/>
         <source>XML error on line %1, col %2: %3</source>
-        <translation type="unfinished">Erreur XML à la ligne %1, col %2: %3</translation>
+        <translation>Erreur XML à la ligne %1, col %2 : %3</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>The &lt;RCC&gt; root element is missing.</source>
-        <translation type="unfinished">L&apos;élement racine &lt;RCC&gt; est manquant.</translation>
+        <translation>L&apos;élement racine &lt;RCC&gt; est manquant.</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/designer/designerconstants.h" line="+38"/>
         <source>Designer</source>
-        <translation type="unfinished"></translation>
+        <translation>Designer</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Class Generation</source>
-        <translation type="unfinished"></translation>
+        <translation>Génération de classe</translation>
     </message>
 </context>
 <context>
@@ -5186,7 +5182,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/designer/cpp/formclasswizarddialog.cpp" line="+50"/>
         <source>Qt Designer Form Class</source>
-        <translation type="unfinished"></translation>
+        <translation>Classe d&apos;interface graphique Qt Designer</translation>
     </message>
 </context>
 <context>
@@ -5194,22 +5190,22 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.ui"/>
         <source>Choose a class name</source>
-        <translation type="unfinished"></translation>
+        <translation>Choisissez un nom de classe</translation>
     </message>
     <message>
         <location/>
         <source>Class</source>
-        <translation type="unfinished"></translation>
+        <translation>Classe</translation>
     </message>
     <message>
         <location/>
         <source>Configure...</source>
-        <translation type="unfinished">Configurer...</translation>
+        <translation>Configurer...</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+148"/>
         <source>%1 - Error</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - Erreur</translation>
     </message>
 </context>
 <context>
@@ -5217,27 +5213,27 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/designer/formeditorplugin.cpp" line="+137"/>
         <source>Qt</source>
-        <translation type="unfinished">Qt</translation>
+        <translation>Qt</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Qt Designer Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Interface graphique Qt Designer</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates a Qt Designer form file (.ui).</source>
-        <translation type="unfinished"></translation>
+        <translation>Crée un fichier d&apos;interface graphique Qt Designer (.ui).</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Qt Designer Form Class</source>
-        <translation type="unfinished"></translation>
+        <translation>Classe d&apos;interface graphique Qt Designer</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates a Qt Designer form file (.ui) with a matching class.</source>
-        <translation type="unfinished"></translation>
+        <translation>Crée un fichier d&apos;interface graphique Qt Designer (.ui) avec une classe correspondante.</translation>
     </message>
 </context>
 <context>
@@ -5246,115 +5242,117 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <location filename="../../../src/plugins/designer/formeditorw.cpp" line="+335"/>
         <location line="+170"/>
         <source>Widget Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Liste des widgets</translation>
     </message>
     <message>
         <location line="-165"/>
         <location line="+169"/>
         <source>Object Inspector</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Je trouve que &quot;Inspecteur d&apos;objet&quot; est peu adapté. Explorateur d&apos;objet n&apos;est pas excellent non plus, à changer surement.</translatorcomment>
+        <translation type="unfinished">Explorateur d&apos;objet</translation>
     </message>
     <message>
         <location line="-164"/>
         <location line="+168"/>
         <source>Property Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Editeur de propriété</translation>
     </message>
     <message>
         <location line="-163"/>
         <source>Signals &amp; Slots Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Editeur de Signaux &amp; Slots</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+167"/>
         <source>Action Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Editeur d&apos;Action</translation>
     </message>
     <message>
         <location line="-125"/>
         <source>For&amp;m editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Editeur d&apos;&amp;interface graphique</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Edit widgets</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditer les widgets</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>F3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">F3</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Edit signals/slots</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditer signaux/slots</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>F4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">F4</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Edit buddies</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Je traduis &quot;buddies&quot; par &quot;amis&quot; même si c&apos;est incorrect puisque la traduction exacte est &quot;potes&quot;. Seuleument &quot;potes&quot; est trop familier. &quot;Copains&quot; serait plus convenable ?</translatorcomment>
+        <translation type="unfinished">Éditer les amis</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Edit tab order</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditer l&apos;ordre des tab</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Meta+H</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Meta+H</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Ctrl+H</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+H</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Meta+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Meta+L</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+L</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Meta+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Meta+G</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+G</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Meta+J</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Meta+J</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Ctrl+J</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+J</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Views</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vues</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Signals &amp;&amp; Slots Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Editeur de Signaux &amp;&amp; Slots</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -5364,32 +5362,32 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+7"/>
         <source>Reset to Default Layout</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Restaurer la disposition par défaut</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Ctrl+Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+Alt+R</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>About Qt Designer plugins....</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">À propos des plugins Qt Designer....</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Preview in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aperçu dans</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Designer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Designer</translation>
     </message>
     <message>
         <location line="+161"/>
         <source>The image could not be created: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">L&apos;image ne peut pas être créée: %1</translation>
     </message>
 </context>
 <context>
@@ -5397,12 +5395,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/designer/formtemplatewizardpage.cpp" line="+62"/>
         <source>Choose a form template</source>
-        <translation type="unfinished"></translation>
+        <translation>Choisir un modèle d&apos;interface graphique</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>%1 - Error</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - Erreur</translation>
     </message>
 </context>
 <context>
@@ -5410,17 +5408,17 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/designer/formwindowfile.cpp" line="+77"/>
         <source>Error saving %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur lors de l&apos;enregistrement de %1</translation>
     </message>
     <message>
         <location line="+106"/>
         <source>Unable to open %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;ouvrir %1 : %2</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Unable to write to %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;écrire dans %1 : %2</translation>
     </message>
 </context>
 <context>
@@ -5428,7 +5426,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/designer/formwizarddialog.cpp" line="+60"/>
         <source>Qt Designer Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Interface graphique Qt Designer</translation>
     </message>
 </context>
 <context>
@@ -5436,23 +5434,25 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/plugins/designer/qtcreatorintegration.cpp" line="+72"/>
         <source>The class definition of &apos;%1&apos; could not be found in %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>La déclaration de la classe %1 est introuvable dans %2.</translation>
     </message>
     <message>
         <location line="+475"/>
         <source>Error finding/adding a slot.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Erreur lors de la recherche/de l&apos;ajout d&apos;un slot. ?</translatorcomment>
+        <translation type="unfinished">Erreur de recherche/ajout de slot.</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>No documents matching &apos;%1&apos; could be found.
 Rebuilding the project might help.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de trouver un document correspondant à %1.
+Regénérer le projet peut résoudre ce problème.</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Unable to add the method definition.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;ajouter la déclaration de la méthode.</translation>
     </message>
 </context>
 <context>
@@ -5460,17 +5460,17 @@ Rebuilding the project might help.</source>
     <message>
         <location filename="../../../src/plugins/help/docsettingspage.ui"/>
         <source>Registered Documentation</source>
-        <translation type="unfinished"></translation>
+        <translation>Documentation enregistrée</translation>
     </message>
     <message>
         <location/>
         <source>Add...</source>
-        <translation type="unfinished">Ajouter...</translation>
+        <translation>Ajouter...</translation>
     </message>
     <message>
         <location/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer</translation>
     </message>
 </context>
 <context>
@@ -5480,7 +5480,9 @@ Rebuilding the project might help.</source>
         <source>Use Virtual Box
 Note: This adds the toolchain to the build environment and runs the program inside a virtual machine.
 It also automatically sets the correct Qt version.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser Virtual Box
+Note : ceci ajoute la chaîne d&apos;outil à l&apos;environnement de compilation et exécute le programme à l&apos;intérieur d&apos;une machine virtuelle.
+La version de Qt est aussi définie automatiquement.</translation>
     </message>
     <message>
         <location/>
@@ -5493,52 +5495,53 @@ It also automatically sets the correct Qt version.</source>
     <message>
         <location filename="../../../src/libs/extensionsystem/plugindetailsview.ui"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom :</translation>
     </message>
     <message>
         <location/>
         <source>Version:</source>
-        <translation type="unfinished"></translation>
+        <translation>Version :</translation>
     </message>
     <message>
         <location/>
         <source>Compatibility Version:</source>
-        <translation type="unfinished"></translation>
+        <translation>Version compatible :</translation>
     </message>
     <message>
         <location/>
         <source>Vendor:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vendeur :</translation>
     </message>
     <message>
         <location/>
         <source>Url:</source>
-        <translation type="unfinished"></translation>
+        <translation>Url :</translation>
     </message>
     <message>
         <location/>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Emplacement :</translation>
     </message>
     <message>
         <location/>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Description :</translation>
     </message>
     <message>
         <location/>
         <source>Copyright:</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Droit d&apos;auteur ?</translatorcomment>
+        <translation>Copyright :</translation>
     </message>
     <message>
         <location/>
         <source>License:</source>
-        <translation type="unfinished"></translation>
+        <translation>Licence :</translation>
     </message>
     <message>
         <location/>
         <source>Dependencies:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dépendances :</translation>
     </message>
 </context>
 <context>
@@ -5546,12 +5549,12 @@ It also automatically sets the correct Qt version.</source>
     <message>
         <location filename="../../../src/libs/extensionsystem/pluginerrorview.ui"/>
         <source>State:</source>
-        <translation type="unfinished"></translation>
+        <translation>État :</translation>
     </message>
     <message>
         <location/>
         <source>Error Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Message d&apos;erreur :</translation>
     </message>
 </context>
 <context>
@@ -5559,17 +5562,17 @@ It also automatically sets the correct Qt version.</source>
     <message>
         <location filename="../../../src/libs/extensionsystem/pluginspec.cpp" line="+415"/>
         <source>File does not exist: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Le fichier n&apos;existe pas : %1</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Could not open file for read: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;ouvrir le fichier en lecture : %1</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Error parsing file %1: %2, at line %3, column %4</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur pendant l&apos;analyse du fichier %1 : %2, ligne %3, colonne %4</translation>
     </message>
 </context>
 <context>
@@ -5577,27 +5580,27 @@ It also automatically sets the correct Qt version.</source>
     <message>
         <location filename="../../../src/libs/extensionsystem/pluginview.ui"/>
         <source>State</source>
-        <translation type="unfinished">État</translation>
+        <translation>État</translation>
     </message>
     <message>
         <location/>
         <source>Name</source>
-        <translation type="unfinished">Nom</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location/>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Version</translation>
     </message>
     <message>
         <location/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation>Vendeur</translation>
     </message>
     <message>
         <location/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Emplacement</translation>
     </message>
 </context>
 <context>
@@ -5605,82 +5608,82 @@ It also automatically sets the correct Qt version.</source>
     <message>
         <location filename="../../../src/libs/extensionsystem/pluginerrorview.cpp" line="+79"/>
         <source>Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Invalide</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Description file found, but error on read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Description du fichier trouvé, mais erreur de lecture</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lecture</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Description successfully read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Description correctement lus</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Resolved</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Résolu</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Dependencies are successfully resolved</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Les dépendances ont été  résolues avec succès</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Loaded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Chargé</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Library is loaded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bibliothèque chargée</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Initialized</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Initialisé</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Plugin&apos;s initialization method succeeded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Méthode d&apos;initialisation du plugin réussi</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Running</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Démaré</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Plugin successfully loaded and running</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Plugin correctement chargé et démarré</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Stopped</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arrêté</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Plugin was shut down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Plugin éteind</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Deleted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimé</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Plugin ended its life cycle and was deleted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le plugin a terminé son cycle de vie et a été supprimé</translation>
     </message>
 </context>
 <context>
@@ -5689,30 +5692,33 @@ It also automatically sets the correct Qt version.</source>
         <location filename="../../../src/libs/extensionsystem/pluginmanager.cpp" line="+618"/>
         <source>Circular dependency detected:
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dépendance circulaire détecté :
+</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1(%2) depends on
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1(%2) dépend de
+</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1(%2)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1(%2)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Cannot load plugin because dependencies are not resolved</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de charger le plugin car les dépendances ne sont pas résolues</translation>
     </message>
     <message>
         <location line="+8"/>
         <location line="+29"/>
         <source>Cannot load plugin because dependency failed to load: %1(%2)
 Reason: %3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de charger le plugin car une des dépendances n&apos;a pas pu être chargé : %1(%2)
+Raison : %3</translation>
     </message>
 </context>
 <context>
@@ -5720,12 +5726,12 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/fakevim/fakevimactions.cpp" line="+119"/>
         <source>Toggle vim-style editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Activer/désactiver l&apos;édition en mode vim</translation>
     </message>
     <message>
         <location line="+56"/>
         <source>FakeVim properties...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Propriétés des FakeVim...</translation>
     </message>
 </context>
 <context>
@@ -5733,93 +5739,93 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+944"/>
         <source>Not implemented in FakeVim</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pas implémenté dans FakeVim</translation>
     </message>
     <message>
         <location line="-695"/>
         <source>E20: Mark &apos;%1&apos; not set</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">E20 : Marque &apos;%1&apos; non définie</translation>
     </message>
     <message>
         <location line="+671"/>
         <source>%1%2%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1%2%</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1Tout</translation>
     </message>
     <message>
         <location line="+1025"/>
         <source>File &apos;%1&apos; exists (add ! to override)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le fichier &apos;%1&apos; existe déjà (ajoutez ! pour écraser)</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Cannot open file &apos;%1&apos; for writing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;ouvrir le fichier &apos;%1&apos; en écriture</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&quot;%1&quot; %2 %3L, %4C written</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&quot;%1&quot; %2 %3L, %4C écrit</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Cannot open file &apos;%1&apos; for reading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;ouvrir le fichier &apos;%1&apos; en lecture</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>&quot;%1&quot; %2L, %3C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&quot;%1&quot; %2L, %3C</translation>
     </message>
     <message numerus="yes">
         <location line="+18"/>
         <source>%n lines filtered</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+            <numerusform>%n ligne filtrée</numerusform>
+            <numerusform>%n lignes filtrées</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+6"/>
         <source>%n lines &gt;ed %1 time</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+            <numerusform>%n ligne &gt;ed %1 fois</numerusform>
+            <numerusform>%n lignes &gt;ed %1 fois</numerusform>
         </translation>
     </message>
     <message>
         <location line="+78"/>
         <source>E512: Unknown option: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">E512 : option inconnue : </translation>
     </message>
     <message>
         <location line="+71"/>
         <source>search hit BOTTOM, continuing at TOP</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">la recherche a atteind la fin du document, continue à partir du début</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>search hit TOP, continuing at BOTTOM</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">la recherche a ateind le début du document, continue à partir de la fin</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Pattern not found: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Motif non trouvé : </translation>
     </message>
     <message>
         <location line="+570"/>
         <source>Already at oldest change</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Déjà au changement le plus ancien</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Already at newest change</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Déjà au changement le plus récent</translation>
     </message>
 </context>
 <context>
@@ -5832,7 +5838,7 @@ Reason: %3</source>
     <message>
         <location line="+2"/>
         <source>FakeVim</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">FakeVim</translation>
     </message>
 </context>
 <context>
@@ -5841,30 +5847,30 @@ Reason: %3</source>
         <location line="+347"/>
         <location line="+188"/>
         <source>Quit FakeVim</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Quittez FakeVim</translation>
     </message>
     <message>
         <location line="-117"/>
         <source>Saving succeeded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Succés de l&apos;enregistrement</translation>
     </message>
     <message numerus="yes">
         <location line="+2"/>
         <source>%n files not saved</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+            <numerusform>%n fichier n&apos;a pas pu être enregistré</numerusform>
+            <numerusform>%n fichiers n&apos;ont pas pu être enregistré</numerusform>
         </translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Not an editor command: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pas une commande de l&apos;éditeur : %1</translation>
     </message>
     <message>
         <location line="+112"/>
         <source>FakeVim Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Information sur FakeVim</translation>
     </message>
 </context>
 <context>
@@ -5872,87 +5878,87 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/fakevim/fakevimoptions.ui"/>
         <source>Use FakeVim</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser FakeVim</translation>
     </message>
     <message>
         <location/>
         <source>Vim style settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Paramètres de l&apos;édition de type vim</translation>
     </message>
     <message>
         <location/>
         <source>vim&apos;s &quot;expandtab&quot; option</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">option &quot;expandtab&quot; de vim</translation>
     </message>
     <message>
         <location/>
         <source>Expand tabulators:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Étendre les tabulations :</translation>
     </message>
     <message>
         <location/>
         <source>Highlight search results:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Surligner les résultats de recherche :</translation>
     </message>
     <message>
         <location/>
         <source>Shift width:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Largeur d&apos;indentation :</translation>
     </message>
     <message>
         <location/>
         <source>Smart tabulators:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tabulation intelligente :</translation>
     </message>
     <message>
         <location/>
         <source>Start of line:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Début de ligne :</translation>
     </message>
     <message>
         <location/>
         <source>vim&apos;s &quot;tabstop&quot; option</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">option &quot;tabstop&quot; de vim</translation>
     </message>
     <message>
         <location/>
         <source>Tabulator size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Taille des tabulation :</translation>
     </message>
     <message>
         <location/>
         <source>Backspace:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Touche retour :</translation>
     </message>
     <message>
         <location/>
         <source>VIM&apos;s &quot;autoindent&quot; option</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">option &quot;autoindent&quot; de vim</translation>
     </message>
     <message>
         <location/>
         <source>Automatic indentation:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Indentation automatique :</translation>
     </message>
     <message>
         <location/>
         <source>Incremental search:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Recherche incrémentale :</translation>
     </message>
     <message>
         <location/>
         <source>Copy text editor settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Copier les paramètres de l&apos;éditeur de texte</translation>
     </message>
     <message>
         <location/>
         <source>Set Qt style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Définir le style de Qt</translation>
     </message>
     <message>
         <location/>
         <source>Set plain style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Définir le style plein</translation>
     </message>
 </context>
 <context>
@@ -5960,12 +5966,12 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/shared/help/filternamedialog.ui"/>
         <source>Add Filter Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom du filtre à ajouter</translation>
     </message>
     <message>
         <location/>
         <source>Filter Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom du filtre :</translation>
     </message>
 </context>
 <context>
@@ -5973,17 +5979,17 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/help/filtersettingspage.ui"/>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Filtres</translation>
     </message>
     <message>
         <location/>
         <source>Attributes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Attributs</translation>
     </message>
     <message>
         <location/>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">1</translation>
     </message>
     <message>
         <location/>
@@ -5993,7 +5999,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer</translation>
     </message>
 </context>
 <context>
@@ -6001,22 +6007,22 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/find/finddialog.ui"/>
         <source>Search for...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Recherche...</translation>
     </message>
     <message>
         <location/>
         <source>Sc&amp;ope:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Emplacement :</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Rechercher</translation>
     </message>
     <message>
         <location/>
         <source>Search &amp;for:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rec&amp;herche :</translation>
     </message>
     <message>
         <location/>
@@ -6039,17 +6045,17 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/find/findplugin.cpp" line="+150"/>
         <source>&amp;Find/Replace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Rechercher/Remplacer</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rechercher...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Shift+F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+Shift+F</translation>
     </message>
 </context>
 <context>
@@ -6057,62 +6063,62 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/find/findtoolbar.cpp" line="+139"/>
         <source>Current Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Document courrant</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Enter Find String</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Entrer la chaîne de recherche</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+E</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+E</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Find Next</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Suivant</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Find Previous</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Précédent</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Replace &amp;&amp; Find Next</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Remplacer &amp;&amp; Suivant</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+=</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+=</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Replace &amp;&amp; Find Previous</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Remplacer &amp;&amp; Précédent</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Replace All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Remplacer tout</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sensible à la casse</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Whole Words Only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mots complets uniquement</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Use Regular Expressions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser des expressions régulières</translation>
     </message>
 </context>
 <context>
@@ -6120,27 +6126,27 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/find/findwidget.ui"/>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rechercher</translation>
     </message>
     <message>
         <location/>
         <source>Find:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rechercher :</translation>
     </message>
     <message>
         <location/>
         <source>Replace with:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Remplacer avec :</translation>
     </message>
     <message>
         <location/>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tout</translation>
     </message>
     <message>
         <location/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">...</translation>
     </message>
 </context>
 <context>
@@ -6148,32 +6154,32 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+67"/>
         <source>No matches found!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun résultat!</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Expand All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Développer tout</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Replace with:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Remplacer avec :</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Replace all occurrences</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Remplacer toutes les occurrences</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Replace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Remplacer</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/find/searchresultwindow.h" line="+89"/>
         <source>Search Results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Résultat de la recherche</translation>
     </message>
 </context>
 <context>
@@ -6181,62 +6187,62 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/debugger/gdb/gdboptionspage.ui"/>
         <source>Gdb interaction</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Intéraction avec Gdb</translation>
     </message>
     <message>
         <location/>
         <source>This is either a full absolute path leading to the gdb binary you intend to use or the name of a gdb binary that will be searched in your PATH.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ceci est soit un chemin absolu menant au binaire de gdb que vous désirez utiliser, soit le nom d&apos;un binaire de gdb qui sera recherché dans le PATH.</translation>
     </message>
     <message>
         <location/>
         <source>Gdb location:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Emplacement de GDB :</translation>
     </message>
     <message>
         <location/>
         <source>Environment:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Environnement :</translation>
     </message>
     <message>
         <location/>
         <source>This is either empty or points to a file containing gdb commands that will be executed immediately after gdb starts up.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ceci est soit vide, soit pointe vers un fichier contenant les commandes gdb qui seront exécuté immédiatement après le démarrage de gdb.</translation>
     </message>
     <message>
         <location/>
         <source>Gdb startup script:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Script de démarrage de Gdb :</translation>
     </message>
     <message>
         <location/>
         <source>Behaviour of breakpoint setting in plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Comportement des paramètres des points d&apos;arrêt dans les plugins</translation>
     </message>
     <message>
         <location/>
         <source>This is the slowest but safest option.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ceci est l&apos;option la plus lente mais la plus sûr.</translation>
     </message>
     <message>
         <location/>
         <source>Try to set breakpoints in plugins always automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Essaye de définir les points d&apos;arrêt dans les plugins automatiquement.</translation>
     </message>
     <message>
         <location/>
         <source>Try to set breakpoints in selected plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Essaye de définir les points d&apos;arrêt dans les plugins sélectionnés</translation>
     </message>
     <message>
         <location/>
         <source>Matching regular expression: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Correspond à l&apos;expression régulière : </translation>
     </message>
     <message>
         <location/>
         <source>Never set breakpoints in plugins automatically</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ne jamais définir les points d&apos;arrêt dans les plugins automatiquement</translation>
     </message>
 </context>
 <context>
@@ -6244,12 +6250,12 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.ui"/>
         <source>Override %1:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Écraser %1 :</translation>
     </message>
     <message>
         <location/>
         <source>Make arguments:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arguments de Make :</translation>
     </message>
     <message>
         <location/>
@@ -6270,17 +6276,17 @@ Reason: %3</source>
     <message>
         <location line="+38"/>
         <source>Create</source>
-        <translation type="unfinished">Créer</translation>
+        <translation>Créer</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>New configuration</source>
-        <translation type="unfinished">Nouvelle configuration</translation>
+        <translation>Nouvelle configuration</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New Configuration Name:</source>
-        <translation type="unfinished">Nom de la nouvelle configuration :</translation>
+        <translation>Nom de la nouvelle configuration :</translation>
     </message>
 </context>
 <context>
@@ -6288,17 +6294,17 @@ Reason: %3</source>
     <message>
         <location line="+450"/>
         <source>Build directory:</source>
-        <translation type="unfinished">Répertoire de compilation :</translation>
+        <translation>Répertoire de compilation :</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Tool Chain:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Chaîne d&apos;outils :</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Generic Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gestionnaire générique</translation>
     </message>
 </context>
 <context>
@@ -6306,7 +6312,7 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+190"/>
         <source>Override %1:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Écraser %1 :</translation>
     </message>
     <message>
         <location line="+32"/>
@@ -6319,22 +6325,22 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/genericprojectmanager/genericprojectwizard.cpp" line="+246"/>
         <source>Import of Makefile-based Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Importer un projet basé sur un Makefile</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates a generic project, supporting any build system.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Créer un projet générique, supportant n&apos;importe quel système de compilation.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Projects</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projets</translation>
     </message>
     <message>
         <location line="+124"/>
         <source>The project %1 could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le projet %1 ne peut pas être ouvert.</translation>
     </message>
 </context>
 <context>
@@ -6342,27 +6348,27 @@ Reason: %3</source>
     <message>
         <location line="-249"/>
         <source>Import of Makefile-based Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Importer un projet basé sur un Makefile</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Generic Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projet générique</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Project name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom du projet :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Emplacement :</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Second Page Title</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Titre de la seconde page</translation>
     </message>
 </context>
 <context>
@@ -6370,77 +6376,79 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/branchdialog.ui"/>
         <source>Branches</source>
-        <translation type="unfinished"></translation>
+        <translation>Branches</translation>
     </message>
     <message>
         <location/>
         <source>General information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informations générales</translation>
     </message>
     <message>
         <location/>
         <source>Repository:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dépôt :</translation>
     </message>
     <message>
         <location/>
         <source>Remote branches</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>traduction de remote ici ?</translatorcomment>
+        <translation type="unfinished">Branches à distance</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/git/branchdialog.cpp" line="+75"/>
         <source>Checkout</source>
-        <translation type="unfinished"></translation>
+        <translation>Checkout</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Delete</source>
-        <translation type="unfinished">Supprimer</translation>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Unable to find the repository directory for &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de trouver le dépôt de &apos;%1&apos;.</translation>
     </message>
     <message>
         <location line="+69"/>
         <source>Delete Branch</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer la branche</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Would you like to delete the branch &apos;%1&apos;?</source>
-        <translation type="unfinished"></translation>
+        <translation>Souhaitez-vous supprimer la branche &apos;%1&apos; ?</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Failed to delete branch</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de suppression de la branche</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Failed to create branch</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de création de la branche</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Failed to stash</source>
-        <translation type="unfinished"></translation>
+        <translation>Échec du stash</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Would you like to create a local branch &apos;%1&apos; tracking the remote branch &apos;%2&apos;?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Souhaitez-vous créer une branche locale &apos;%1&apos; pour la branche à distance &apos;%2&apos; ?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Create branch</source>
-        <translation type="unfinished"></translation>
+        <translation>Créer une branche</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Failed to create a tracking branch</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>tracking branch ?</translatorcomment>
+        <translation type="unfinished">Échec de la création d&apos;une branche de suivi</translation>
     </message>
 </context>
 <context>
@@ -6448,22 +6456,22 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/changeselectiondialog.cpp" line="+42"/>
         <source>Select a Git commit</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner un commit Git</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Select Git repository</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner un dépôt Git</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Selected directory is not a Git repository</source>
-        <translation type="unfinished"></translation>
+        <translation>Le répertoire sélectionné n&apos;est pas un dépôt Git</translation>
     </message>
 </context>
 <context>
@@ -6471,121 +6479,126 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/gitclient.cpp" line="+71"/>
         <source>Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>marchera ou marcheront ? Le etc laisse sous entendre qu&apos;il y aurait d&apos;autres choses qui ne marcheraient pas.</translatorcomment>
+        <translation>Notez que le plugin git pour QtCreator n&apos;est pas capable d&apos;intéragir directement avec le serveur. Ainsi, l&apos;identification ssh manuelle etc. ne marcheront pas.</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Unable to determine the repository for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de déterminer le dépôt de %1.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Unable to parse the file output.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;analyser le fichier de sortie.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Executing: %1 %2
 </source>
         <extracomment>Executing: &lt;executable&gt; &lt;arguments&gt;</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Exécution de : %1 %2
+</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Waiting for data...</source>
-        <translation type="unfinished"></translation>
+        <translation>En attente de données...</translation>
     </message>
     <message>
         <location line="+100"/>
         <source>Git Diff</source>
-        <translation type="unfinished"></translation>
+        <translation>Git Diff</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Git Diff %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Git Diff %1</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Git Log %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Git Log %1</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Git Show %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Git Show %1</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Git Blame %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Git blame %1</translation>
     </message>
     <message numerus="yes">
         <location line="+56"/>
         <source>Unable to add %n file(s) to %1: %2</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Impossible d&apos;ajouter %n fichier dans %1 : %2</numerusform>
+            <numerusform>Impossible d&apos;ajouter %n fichiers dans %1 : %2</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+33"/>
         <source>Unable to reset %n file(s) in %1: %2</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Impossible de réinitialiser %n fichier dans %1 : %2</numerusform>
+            <numerusform>Impossible de réinitialiser %n fichiers dans %1 : %2</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+18"/>
         <source>Unable to checkout %n file(s) in %1: %2</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+            <numerusform>Impossible de réaliser le checkout de %n fichier dans %1 : %2</numerusform>
+            <numerusform>Impossible de réaliser le checkout de %n fichiers dans %1 : %2</numerusform>
         </translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Unable stash in %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;utiliser stash dans %1 : %2</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Unable to run branch command: %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;exécuter la commande branch : %1 : %2</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Unable to run show: %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;exécuter show : %1 : %2</translation>
     </message>
     <message>
         <location line="+148"/>
         <source>Changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifications</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You have modified files. Would you like to stash your changes?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vous avez modifié des fichiers. Souhaitez-vous mettre vos changements dans le stash ?</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>Unable to obtain the status: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;obtenir le statut : %1</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>The repository %1 is not initialized yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le dépôt %1 n&apos;est pas encore initialisé.</translation>
     </message>
     <message numerus="yes">
         <location line="+106"/>
         <source>Committed %n file(s).
 </source>
+        <translatorcomment>&quot;commité&quot; is common at the Oslo office, I don&apos;t know about France</translatorcomment>
         <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+            <numerusform>%n fichier a été commité.
+</numerusform>
+            <numerusform>%n fichiers ont été commité.
+</numerusform>
         </translation>
     </message>
     <message numerus="yes">
@@ -6593,8 +6606,10 @@ Reason: %3</source>
         <source>Unable to commit %n file(s): %1
 </source>
         <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+            <numerusform>Impossible de commiter %n fichier : %1
+</numerusform>
+            <numerusform>Impossible de commiter %n fichiers : %1
+</numerusform>
         </translation>
     </message>
     <message>
@@ -6610,7 +6625,7 @@ Reason: %3</source>
     <message>
         <location line="+24"/>
         <source>The file is not modified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le fichier n&apos;a pas été modifié.</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -6623,117 +6638,118 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/gitplugin.cpp" line="+232"/>
         <source>&amp;Git</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Git</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Diff Current File</source>
-        <translation type="unfinished">Faire un diff du fichier courant</translation>
+        <translation type="unfinished">Réaliser un diff du fichier courant</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Diff &quot;%1&quot;</source>
-        <translation type="unfinished">Faire un diff de &quot;%1&quot;</translation>
+        <translation type="unfinished">Réaliser un diff de &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+G,Alt+D</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+G,Alt+D</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>File Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Statut du fichier</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Status Related to &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Statut lié à &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+G,Alt+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+G,Alt+S</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Réaliser un log du fichier</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Log of &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Réaliser un log de &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+G,Alt+L</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+G,Alt+L</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Blame</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Traduction autre ?</translatorcomment>
+        <translation type="unfinished">Blâmer</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Blame for &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Blâmer pour &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+G,Alt+B</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+G,Alt+B</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Undo Changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Annuler les changements</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Undo Changes for &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Annuler les changements pour &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+G,Alt+U</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+G,Alt+U</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Stage File for Commit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter le fichier au staging pour commit</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Stage &quot;%1&quot; for Commit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter &quot;%1&quot; au staging pour commit</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+G,Alt+A</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+G,Alt+A</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Unstage File from Commit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Retirer le fichier du staging pour commit</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Unstage &quot;%1&quot; from Commit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Retirer %1 du staging pour commit</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Diff Current Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Réaliser un diff du projet courant</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Diff Project &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Réaliser un diff du projet &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -6743,82 +6759,86 @@ Reason: %3</source>
     <message>
         <location line="+0"/>
         <source>Status Project &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Statut du projet &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Log Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Réaliser un log du projet</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Log Project &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Réaliser un log du projet &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+G,Alt+K</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+G,Alt+K</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Undo Project Changes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Annuler les changements sur le projet</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Stash</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Trad ?</translatorcomment>
+        <translation type="unfinished">Cacher</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Saves the current state of your work.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sauvegarde de l&apos;état actuel de votre travail.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Pull</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pull</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Stash Pop</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>stash encore ?</translatorcomment>
+        <translation type="unfinished">Stash Pop</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Restores changes saved to the stash list using &quot;Stash&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Restaurer les changements sauvés dans la liste de stash à l&apos;aide de &quot;Stash&quot;.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Commit...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Commit...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+G,Alt+C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+G,Alt+C</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Push</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Faire un push ou push tout court ?</translatorcomment>
+        <translation type="unfinished">Push</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Branches...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Branches...</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>List Stashes</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>stash ?</translatorcomment>
+        <translation type="unfinished">Liste de Stash</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show Commit...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher le commit...</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -6833,17 +6853,17 @@ Reason: %3</source>
     <message>
         <location line="+3"/>
         <source>&amp;Undo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Annu&amp;ler</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Redo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Refaire</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Could not find working directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de trouver le répertoire de travail</translation>
     </message>
     <message>
         <location line="+61"/>
@@ -6853,22 +6873,22 @@ Reason: %3</source>
     <message>
         <location line="+1"/>
         <source>Would you like to revert all pending changes to the project?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Souhaitez-vous rétablir toues les modifications en attente sur le projet ?</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Another submit is currently being executed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Un autre submit est actuellement exécuté.</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Cannot create temporary file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de créer un fichier temporaire : %1</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>Closing git editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fermeture de l&apos;éditeur git</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6886,7 +6906,7 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/gitsettings.cpp" line="+110"/>
         <source>The binary &apos;%1&apos; could not be located in the path &apos;%2&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Le binaire &apos;%1&apos; n&apos;a pas pu être trouvé dans le chemin &apos;%2&apos;</translation>
     </message>
 </context>
 <context>
@@ -6894,7 +6914,7 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/gitsubmiteditor.cpp" line="+55"/>
         <source>Git Commit</source>
-        <translation type="unfinished"></translation>
+        <translation>Git commit</translation>
     </message>
 </context>
 <context>
@@ -6902,42 +6922,42 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/gitsubmitpanel.ui"/>
         <source>General Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informations générales</translation>
     </message>
     <message>
         <location/>
         <source>Repository:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dépôt :</translation>
     </message>
     <message>
         <location/>
         <source>repository</source>
-        <translation type="unfinished"></translation>
+        <translation>dépôt</translation>
     </message>
     <message>
         <location/>
         <source>Branch:</source>
-        <translation type="unfinished"></translation>
+        <translation>Branche :</translation>
     </message>
     <message>
         <location/>
         <source>branch</source>
-        <translation type="unfinished"></translation>
+        <translation>branche</translation>
     </message>
     <message>
         <location/>
         <source>Commit Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informations de commit</translation>
     </message>
     <message>
         <location/>
         <source>Author:</source>
-        <translation type="unfinished"></translation>
+        <translation>Auteur :</translation>
     </message>
     <message>
         <location/>
         <source>Email:</source>
-        <translation type="unfinished"></translation>
+        <translation>Email :</translation>
     </message>
 </context>
 <context>
@@ -6945,12 +6965,13 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/branchmodel.cpp" line="+181"/>
         <source>&lt;New branch&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Nouvelle branche&gt;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Type to create a new branch</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Type pas facile à traduire dans ce contexte... Taper ?</translatorcomment>
+        <translation type="unfinished">Saisir pour créer une nouvelle branche</translation>
     </message>
 </context>
 <context>
@@ -6958,62 +6979,63 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/git/settingspage.ui"/>
         <source>Environment variables</source>
-        <translation type="unfinished"></translation>
+        <translation>Variables d&apos;environnement</translation>
     </message>
     <message>
         <location/>
         <source>PATH:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">PATH :</translation>
     </message>
     <message>
         <location/>
         <source>From system</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Parcourir</translation>
     </message>
     <message>
         <location/>
         <source>&lt;b&gt;Note:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Note :&lt;/b&gt;</translation>
     </message>
     <message>
         <location/>
         <source>Git needs to find Perl in the environment as well.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Trop long ?</translatorcomment>
+        <translation type="unfinished">Git a également besoin de trouver Perl dans l&apos;environnement.</translation>
     </message>
     <message>
         <location/>
         <source>Log commit display count:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nombre de log de commit affiché :</translation>
     </message>
     <message>
         <location/>
         <source>Note that huge amount of commits might take some time.</source>
-        <translation type="unfinished"></translation>
+        <translation>Notez qu&apos;un grand nombre de commit pourrait prendre un certain temps.</translation>
     </message>
     <message>
         <location/>
         <source>Timeout (seconds):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Timeout (secondes) : </translation>
     </message>
     <message>
         <location/>
         <source>Prompt to submit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Message à envoyer</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/git/settingspage.cpp" line="+90"/>
         <source>Git</source>
-        <translation type="unfinished"></translation>
+        <translation>Git</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Git Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Paramètres de git</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/git/settingspage.ui"/>
         <source>Omit date from annotation output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ne pas mettre la date sur l&apos;annotation de sortie</translation>
     </message>
 </context>
 <context>
@@ -7023,14 +7045,18 @@ Reason: %3</source>
         <source>
 &apos;%1&apos; failed (exit code %2).
 </source>
-        <translation type="unfinished"></translation>
+        <translation>
+&apos;%1&apos; échoué (code de retour %2).
+</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 &apos;%1&apos; completed (exit code %2).
 </source>
-        <translation type="unfinished"></translation>
+        <translation>
+&apos;%1&apos; terminé (code de retour %2).
+</translation>
     </message>
 </context>
 <context>
@@ -7038,32 +7064,32 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/helloworld/helloworldplugin.cpp" line="+85"/>
         <source>Say &quot;&amp;Hello World!&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dites &quot;&amp;Bonjour le monde!&quot;</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>&amp;Hello World</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Bonjour le monde</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Hello world!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bonjour le monde!</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Hello World PushButton!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Touche bonjour le monde!</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Hello World!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bonjour le monde!</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Hello World! Beautiful day today, isn&apos;t it?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bonjour le monde! Belle journée aujourd&apos;hui, n&apos;est-ce pas ?</translation>
     </message>
 </context>
 <context>
@@ -7071,12 +7097,12 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/helloworld/helloworldwindow.cpp" line="+41"/>
         <source>Focus me to activate my context!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Donnez moi le focus pour activer mon contexte !</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hello, world!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bonjour, monde!</translation>
     </message>
 </context>
 <context>
@@ -7084,38 +7110,38 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/help/centralwidget.cpp" line="+97"/>
         <source>Add new page</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter une nouvelle page</translation>
     </message>
     <message>
         <location line="+238"/>
         <source>Print Document</source>
-        <translation type="unfinished">Imprimer le document</translation>
+        <translation>Imprimer le document</translation>
     </message>
     <message>
         <location line="+120"/>
         <location line="+2"/>
         <source>unknown</source>
-        <translation type="unfinished">inconnue</translation>
+        <translation>inconnue</translation>
     </message>
     <message>
         <location line="+87"/>
         <source>Add New Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter une nouvelle page</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Close This Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Fermer cette page</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Close Other Pages</source>
-        <translation type="unfinished"></translation>
+        <translation>Fermer les autres pages</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Add Bookmark for this Page...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter un signet pour cette page...</translation>
     </message>
 </context>
 <context>
@@ -7124,33 +7150,34 @@ Reason: %3</source>
         <location filename="../../../src/plugins/help/docsettingspage.cpp" line="+51"/>
         <location line="+84"/>
         <source>Documentation</source>
-        <translation type="unfinished"></translation>
+        <translation>Documentation</translation>
     </message>
     <message>
         <location line="-73"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Aide</translation>
     </message>
     <message>
         <location line="+23"/>
         <location line="+10"/>
         <source>Add Documentation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter de la documentation</translation>
     </message>
     <message>
         <location line="-9"/>
         <source>Qt Help Files (*.qch)</source>
-        <translation type="unfinished"></translation>
+        <translation>Fichiers d&apos;aide Qt (*.qch)</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>The file %1 is not a valid Qt Help file!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le fichier %1 n&apos;est pas un fichier d&apos;aide Qt valide !</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Cannot unregister documentation file %1!</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>trad unregister ?</translatorcomment>
+        <translation type="unfinished">Impossible de désinscrire le fichier de documentation %1 !</translation>
     </message>
 </context>
 <context>
@@ -7158,12 +7185,12 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/help/filtersettingspage.cpp" line="+51"/>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtres</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Aide</translation>
     </message>
 </context>
 <context>
@@ -7171,7 +7198,7 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/help/helpindexfilter.cpp" line="+72"/>
         <source>Help index</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Index de l&apos;aide</translation>
     </message>
 </context>
 <context>
@@ -7179,7 +7206,7 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/help/helpmode.cpp" line="+46"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Aide</translation>
     </message>
 </context>
 <context>
@@ -7188,121 +7215,122 @@ Reason: %3</source>
         <location filename="../../../src/plugins/help/helpplugin.cpp" line="+209"/>
         <location line="+46"/>
         <source>Contents</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Contenu</translation>
     </message>
     <message>
         <location line="-44"/>
         <location line="+38"/>
         <source>Index</source>
-        <translation type="unfinished"></translation>
+        <translation>Index</translation>
     </message>
     <message>
         <location line="-36"/>
         <location line="+48"/>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechercher</translation>
     </message>
     <message>
         <location line="-45"/>
         <source>Bookmarks</source>
-        <translation type="unfinished">Signets</translation>
+        <translation>Signets</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Home</source>
-        <translation type="unfinished"></translation>
+        <translation>Accueil</translation>
     </message>
     <message>
         <location line="+231"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Précédent</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Suivant</translation>
     </message>
     <message>
         <location line="-214"/>
         <source>Add Bookmark</source>
-        <translation type="unfinished">Ajouter un signet</translation>
+        <translation>Ajouter un signet</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>Previous Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Page précédente</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Next Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Page suivante</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Context Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Aide contextuelle</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>Activate Index in Help mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Activer l&apos;index en mode aide</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Activate Contents in Help mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Activer le contenu en mode aide</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Activate Search in Help mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Activer la recherche en mode aide</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Increase Font Size</source>
-        <translation type="unfinished">Augmenter la taille de la police</translation>
+        <translation>Augmenter la taille de la police</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ctrl++</source>
-        <translation type="unfinished">Ctrl++</translation>
+        <translation>Ctrl++</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Decrease Font Size</source>
-        <translation type="unfinished">Diminuer la taille de la police</translation>
+        <translation>Diminuer la taille de la police</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ctrl+-</source>
-        <translation type="unfinished">Ctrl+-</translation>
+        <translation>Ctrl+-</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Reset Font Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Réinitialiser la taille de la police</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ctrl+0</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+0</translation>
     </message>
     <message>
         <location line="+201"/>
         <location line="+4"/>
         <location line="+146"/>
         <source>Unfiltered</source>
-        <translation type="unfinished">Sans filtre</translation>
+        <translation>Sans filtre</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;No documentation available.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Aucune documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;Aucune documentation disponible.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+54"/>
         <source>Filtered by:</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>To check: translated by &quot;Filtre&quot; in Qt Assistant because of way it is displayed</translatorcomment>
+        <translation type="unfinished">Filtré par :</translation>
     </message>
 </context>
 <context>
@@ -7310,22 +7338,22 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/help/searchwidget.cpp" line="+169"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">Cop&amp;ier</translation>
+        <translation>Co&amp;pier</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Copy &amp;Link Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier l&apos;adresse du &amp;lien</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Open Link in New Tab</source>
-        <translation type="unfinished">Ouvrir le lien dans un nouvel onglet</translation>
+        <translation>Ouvrir le lien dans un nouvel onglet</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Tout sélectionner</translation>
     </message>
 </context>
 <context>
@@ -7333,38 +7361,39 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/shared/help/helpviewer.cpp" line="+247"/>
         <source>Open Link in New Tab</source>
-        <translation type="unfinished">Ouvrir le lien dans un nouvel onglet</translation>
+        <translation>Ouvrir le lien dans un nouvel onglet</translation>
     </message>
     <message>
         <location line="+166"/>
         <source>&lt;title&gt;Error 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;The page could not be found&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;title&gt;Erreur 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;La page est introuvable&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Aide</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Unable to launch external application.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de lancer l&apos;application externe.
+</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location line="+63"/>
         <source>Copy &amp;Link Location</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Copier l&apos;adresse du lien</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Open Link in New Tab	Ctrl+LMB</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir le lien dans un nouvel onglet	Ctrl+LMB</translation>
     </message>
 </context>
 <context>
@@ -7372,17 +7401,17 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/shared/help/indexwindow.cpp" line="+52"/>
         <source>&amp;Look for:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rechercher :</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Open Link</source>
-        <translation type="unfinished">Ouvrir le lien</translation>
+        <translation>Ouvrir le lien</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open Link in New Tab</source>
-        <translation type="unfinished">Ouvrir le lien dans un nouvel onglet</translation>
+        <translation>Ouvrir le lien dans un nouvel onglet</translation>
     </message>
 </context>
 <context>
@@ -7390,7 +7419,7 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+76"/>
         <source>Type Ctrl-&lt;Return&gt; to execute a line.</source>
-        <translation type="unfinished"></translation>
+        <translation>Taper Ctrl-&lt;Retour&gt; pour exécuter une ligne.</translation>
     </message>
 </context>
 <context>
@@ -7398,12 +7427,12 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtres</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Locator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Localisateur</translation>
     </message>
 </context>
 <context>
@@ -7411,118 +7440,118 @@ Reason: %3</source>
     <message>
         <location filename="../../../src/tools/qdebugger/mainwindow.cpp" line="+155"/>
         <source>Open file</source>
-        <translation type="unfinished">Ouvrir le fichier</translation>
+        <translation>Ouvrir le fichier</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>Quitter</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Run to main()</source>
-        <translation type="unfinished"></translation>
+        <translation>Exécuter jusqu&apos;à main()</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ctrl+F5</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+F5</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>F5</source>
-        <translation type="unfinished"></translation>
+        <translation>F5</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Shift+F5</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift+F5</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>F6</source>
-        <translation type="unfinished"></translation>
+        <translation>F6</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>F7</source>
-        <translation type="unfinished"></translation>
+        <translation>F7</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Shift+F6</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift+F6</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Shift+F9</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift+F9</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Shift+F7</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift+F7</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Shift+F8</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift+F8</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>F8</source>
-        <translation type="unfinished"></translation>
+        <translation>F8</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>ALT+D,ALT+W</source>
-        <translation type="unfinished"></translation>
+        <translation>ALT+D,ALT+W</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Fichiers</translation>
     </message>
     <message>
         <location line="+19"/>
         <location filename="../../../src/tools/texteditor/mainwindow.cpp" line="+121"/>
         <source>File</source>
-        <translation type="unfinished">Fichier</translation>
+        <translation>Fichier</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Debug</source>
-        <translation type="unfinished">Déboguer</translation>
+        <translation>Déboguer</translation>
     </message>
     <message>
         <location line="+105"/>
         <source>Not a runnable project</source>
-        <translation type="unfinished"></translation>
+        <translation>Pas un projet exécutable</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The current startup project can not be run.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le projet de démarrage actuel ne peut pas être exéctué.</translation>
     </message>
     <message>
         <location line="+146"/>
         <source>Open File</source>
-        <translation type="unfinished">Ouvrir le Fichier</translation>
+        <translation>Ouvrir un fichier</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>Cannot find special data dumpers</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de trouver les collecteurs de données</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7533,12 +7562,18 @@ Make sure you use something like
 SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
 
 in your .pro file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le fichier binaire débogué ne contient pas les informations nécessaires pour l&apos;affichage correct des types de données Qt.
+
+Assurez-vous que vous utilisez quelque chose comme
+
+SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
+
+dans votre fichier .pro.</translation>
     </message>
     <message>
         <location filename="../../../src/tools/texteditor/mainwindow.cpp" line="+62"/>
         <source>Open Executable File</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir un fichier exécutable</translation>
     </message>
 </context>
 <context>
@@ -7546,12 +7581,12 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/makestep.ui"/>
         <source>Override %1:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Écraser %1 :</translation>
     </message>
     <message>
         <location/>
         <source>Make arguments:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arguments de Make :</translation>
     </message>
 </context>
 <context>
@@ -7561,6 +7596,7 @@ in your .pro file.</source>
         <location line="+1"/>
         <location line="+1"/>
         <source>N/A</source>
+        <translatorcomment>&quot;Non applicable&quot; or &quot;N/A&quot; instead?</translatorcomment>
         <translation type="unfinished">Indisponible</translation>
     </message>
 </context>
@@ -7574,12 +7610,12 @@ in your .pro file.</source>
     <message>
         <location/>
         <source>Filter:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Filtre :</translation>
     </message>
     <message>
         <location/>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Effacer</translation>
     </message>
 </context>
 <context>
@@ -7587,12 +7623,12 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/coreplugin/dialogs/openwithdialog.ui"/>
         <source>Open File With...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir le fichier avec...</translation>
     </message>
     <message>
         <location/>
         <source>Open file extension with:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir ce type d&apos;extension avec :</translation>
     </message>
 </context>
 <context>
@@ -7600,32 +7636,32 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/perforce/perforcesettings.cpp" line="+100"/>
         <source>No executable specified</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun exécutable spécifié</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Unable to launch &quot;%1&quot;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de lancer &quot;%1&quot; : %2</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&quot;%1&quot; timed out after %2ms.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&quot;%1&quot; temps écoulé après %2ms.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&quot;%1&quot; crashed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&quot;%1&quot; planté.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&quot;%1&quot; terminated with exit code %2: %3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&quot;%1&quot; terminé avec le code %2 : %3</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>The client does not seem to contain any mapped files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le client semble contenir aucun fichier correspondant.</translation>
     </message>
 </context>
 <context>
@@ -7633,12 +7669,14 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/perforce/changenumberdialog.ui"/>
         <source>Change Number</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>?</translatorcomment>
+        <translation type="unfinished">Modifier le nombre</translation>
     </message>
     <message>
         <location/>
         <source>Change Number:</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>?</translatorcomment>
+        <translation type="unfinished">Modifier le nombre : </translation>
     </message>
 </context>
 <context>
@@ -7646,22 +7684,22 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/perforce/pendingchangesdialog.ui"/>
         <source>P4 Pending Changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifications pour P4 en attente</translation>
     </message>
     <message>
         <location/>
         <source>Submit</source>
-        <translation type="unfinished"></translation>
+        <translation>Envoyer</translation>
     </message>
     <message>
         <location/>
         <source>Cancel</source>
-        <translation type="unfinished">Annuler</translation>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/perforce/pendingchangesdialog.cpp" line="+46"/>
         <source>Change %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Modification %1 : %2</translation>
     </message>
 </context>
 <context>
@@ -7669,27 +7707,27 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/perforce/perforceplugin.cpp" line="+243"/>
         <source>&amp;Perforce</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Perforce</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditer</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Edit &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditer &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+P,Alt+E</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+P,Alt+E</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Edit File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditer le fichier</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7704,12 +7742,12 @@ in your .pro file.</source>
     <message>
         <location line="+3"/>
         <source>Alt+P,Alt+A</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+P,Alt+A</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter le fichier</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7724,7 +7762,7 @@ in your .pro file.</source>
     <message>
         <location line="+3"/>
         <source>Delete File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer le fichier</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7739,12 +7777,12 @@ in your .pro file.</source>
     <message>
         <location line="+3"/>
         <source>Alt+P,Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+P,Alt+R</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Revert File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rétablir le fichier</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -7770,7 +7808,7 @@ in your .pro file.</source>
     <message>
         <location line="+3"/>
         <source>Alt+P,Alt+D</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+P,Alt+D</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -7780,12 +7818,12 @@ in your .pro file.</source>
     <message>
         <location line="+10"/>
         <source>Opened</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvert</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Alt+P,Alt+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+P,Alt+O</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7795,22 +7833,22 @@ in your .pro file.</source>
     <message>
         <location line="+2"/>
         <source>Alt+P,Alt+S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+P,Alt+S</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Pending Changes...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Changements en attente...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Update Current Project/Session</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mettre à jour le projet ou la session courante</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Update Project &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mettre à jour le projet &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -7831,7 +7869,7 @@ in your .pro file.</source>
     <message>
         <location line="+7"/>
         <source>Annotate...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Annoter...</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -7847,22 +7885,22 @@ in your .pro file.</source>
     <message>
         <location line="+3"/>
         <source>Alt+P,Alt+F</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+P,Alt+F</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Filelog...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Journal d&apos;évenements...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Update All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tout mettre à jour</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Submit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Envoyer</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7872,63 +7910,64 @@ in your .pro file.</source>
     <message>
         <location line="+3"/>
         <source>&amp;Undo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Annu&amp;ler</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Redo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Refaire</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>p4 revert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Restauration p4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The file has been changed. Do you want to revert it?</source>
-        <translation type="unfinished">Le fichier a été modifié. Voulez-vous le rétablir ?</translation>
+        <translation type="unfinished">Le fichier a été modifié. Voulez-vous le restaurer ?</translation>
     </message>
     <message>
         <location line="+93"/>
         <source>Another submit is currently executed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Un autre envoi est en cours d&apos;exécution.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cannot create temporary file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de créer un fichier temporaire.</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Project has no files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le projet n&apos;a pas de fichiers</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>p4 annotate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Anotation p4</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>p4 annotate %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Anotation p4 %1</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>p4 filelog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Journal d&apos;événements p4</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>p4 filelog %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Journal d&apos;événements p4 %1</translation>
     </message>
     <message>
         <location line="+110"/>
         <source>Executing: %1
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécution : %1
+</translation>
     </message>
     <message>
         <location line="+70"/>
@@ -7943,12 +7982,12 @@ in your .pro file.</source>
     <message>
         <location line="+3"/>
         <source>Could not start perforce &apos;%1&apos;. Please check your settings in the preferences.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de démarrer perfoce &apos;%1&apos;. S&apos;il vous plaît vérifiez vos réglages dans les préférences.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Perforce did not respond within timeout limit (%1 ms).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Perforce n&apos;a pas répondu dans la limite de temps (%1 ms).</translation>
     </message>
     <message>
         <location line="+84"/>
@@ -8035,7 +8074,7 @@ in your .pro file.</source>
     <message>
         <location/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
@@ -8109,7 +8148,7 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/perforce/submitpanel.ui"/>
         <source>Submit</source>
-        <translation type="unfinished"></translation>
+        <translation>Envoyer</translation>
     </message>
     <message>
         <location/>
@@ -8119,12 +8158,12 @@ in your .pro file.</source>
     <message>
         <location/>
         <source>Client:</source>
-        <translation type="unfinished"></translation>
+        <translation>Client :</translation>
     </message>
     <message>
         <location/>
         <source>User:</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilisateur :</translation>
     </message>
 </context>
 <context>
@@ -8132,27 +8171,27 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp" line="+55"/>
         <source>Details</source>
-        <translation type="unfinished">Détails</translation>
+        <translation>Détails</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Error Details</source>
-        <translation type="unfinished">Détails de l&apos;erreur</translation>
+        <translation>Détails de l&apos;erreur</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Installed Plugins</source>
-        <translation type="unfinished">Plugins installés</translation>
+        <translation>Plugins installés</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Plugin Details of %1</source>
-        <translation type="unfinished">Détail sur plugin %1</translation>
+        <translation>Détail sur plugin %1</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Plugin Errors of %1</source>
-        <translation type="unfinished">Erreurs du plugins %1</translation>
+        <translation>Erreurs du plugins %1</translation>
     </message>
 </context>
 <context>
@@ -8161,17 +8200,17 @@ in your .pro file.</source>
         <location filename="../../../src/libs/extensionsystem/optionsparser.cpp" line="+106"/>
         <location line="+18"/>
         <source>The plugin &apos;%1&apos; does not exist.</source>
-        <translation type="unfinished">L&apos;extension &apos;%1&apos; n&apos;existe pas.</translation>
+        <translation>Le plugin &apos;%1&apos; n&apos;existe pas.</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Unknown option %1</source>
-        <translation type="unfinished">Option &apos;%1&apos; non reconnue</translation>
+        <translation>Option &apos;%1&apos; non reconnue</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>The option %1 requires an argument.</source>
-        <translation type="unfinished">L&apos;option %1 requiert un argument.</translation>
+        <translation>L&apos;option %1 requiert un argument.</translation>
     </message>
 </context>
 <context>
@@ -8258,22 +8297,22 @@ in your .pro file.</source>
         <location filename="../../../src/plugins/projectexplorer/abstractprocessstep.cpp" line="+188"/>
         <source>&lt;font color=&quot;#0000ff&quot;&gt;Starting: %1 %2&lt;/font&gt;
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;font color=&quot;#0000ff&quot;&gt;Lancement: %1 %2&lt;/font&gt;</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;font color=&quot;#0000ff&quot;&gt;Exited with code %1.&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;font color=&quot;#0000ff&quot;&gt;Terminé avec le code %1.&lt;/font&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Exited with code %1.&lt;/b&gt;&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;font color=&quot;#0000ff&quot;&gt;&lt;b&gt;Terminé avec le code %1.&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;font color=&quot;#ff0000&quot;&gt;Could not start process %1 &lt;/b&gt;&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;font color=&quot;#ff0000&quot;&gt;Impossible de lancer le processus %1 &lt;/b&gt;&lt;/font&gt;</translation>
     </message>
 </context>
 <context>
@@ -8281,42 +8320,42 @@ in your .pro file.</source>
     <message numerus="yes">
         <location filename="../../../src/plugins/projectexplorer/buildmanager.cpp" line="+61"/>
         <source>Finished %n of %1 build steps</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n étape de compilation sur %1 terminée</numerusform>
+            <numerusform>%n étapes de compilation sur %1 terminées</numerusform>
         </translation>
     </message>
     <message>
         <location line="+80"/>
         <source>&lt;font color=&quot;#ff0000&quot;&gt;Canceled build.&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;font color=&quot;#ff0000&quot;&gt;Compilation annulée.&lt;/font&gt;</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>Build</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Compilation</translation>
     </message>
     <message>
         <location line="+55"/>
         <location line="+39"/>
         <source>&lt;font color=&quot;#ff0000&quot;&gt;Error while building project %1&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;font color=&quot;#ff0000&quot;&gt;Erreur lors de la compilation du projet %1&lt;/font&gt;</translation>
     </message>
     <message>
         <location line="-38"/>
         <location line="+39"/>
         <source>&lt;font color=&quot;#ff0000&quot;&gt;When executing build step &apos;%1&apos;&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;font color=&quot;#ff0000&quot;&gt;Lors de l&apos;éxecution de l&apos;étape &apos;%1&apos;&lt;/font&gt;</translation>
     </message>
     <message>
         <location line="-37"/>
         <source>Error while building project %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur à la compilation du projet %1</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>&lt;b&gt;Running build steps for project %2...&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Éxecution des étapes de compilation pour le projet %2...&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
@@ -8324,18 +8363,19 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="+249"/>
         <source>Custom Executable</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>custom ici a plutôt le sens de celui utilisé, usage, mais je sais pas comment le traduire ?</translatorcomment>
+        <translation>Exécutable personnalisé</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Could not find the executable, please specify one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Exécutable introuvable, merci d&apos;en spécifier un.</translation>
     </message>
     <message>
         <location line="+124"/>
         <location line="+32"/>
         <source>Run %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Exécuter %1</translation>
     </message>
 </context>
 <context>
@@ -8344,7 +8384,7 @@ in your .pro file.</source>
         <location line="+49"/>
         <location line="+16"/>
         <source>Custom Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Éxecutable personnalisé</translation>
     </message>
 </context>
 <context>
@@ -8353,28 +8393,28 @@ in your .pro file.</source>
         <location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+68"/>
         <location line="+72"/>
         <source>&lt;UNSET&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;NON-DÉFINIT&gt;</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Variable</source>
-        <translation type="unfinished"></translation>
+        <translation>Variable</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Valeur</translation>
     </message>
     <message>
         <location line="+119"/>
         <location line="+254"/>
         <source>&lt;VARIABLE&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;VARIABLE&gt;</translation>
     </message>
     <message>
         <location line="-243"/>
         <source>&lt;VALUE&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;VALEUR&gt;</translation>
     </message>
 </context>
 <context>
@@ -8382,37 +8422,37 @@ in your .pro file.</source>
     <message>
         <location line="+163"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Édition</translation>
+        <translation>&amp;Édition</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ajouter</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Réinitialiser</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Unset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;RaZ</translation>
     </message>
     <message>
         <location line="+68"/>
         <source>Unset &lt;b&gt;%1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Remettre &lt;b&gt;%1&lt;/b&gt; à zéro</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Set &lt;b&gt;%1&lt;/b&gt; to &lt;b&gt;%2&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Initialiser &lt;b&gt;%1&lt;/b&gt; à &lt;b&gt;%2&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Summary: No changes to Environment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Résumé : l&apos;environnement n&apos;est pas modifié</translation>
     </message>
 </context>
 <context>
@@ -8420,7 +8460,7 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/allprojectsfilter.h" line="+51"/>
         <source>Files in any project</source>
-        <translation type="unfinished"></translation>
+        <translation>Fichiers dans n&apos;importe quel projet</translation>
     </message>
 </context>
 <context>
@@ -8428,12 +8468,13 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/allprojectsfind.cpp" line="+64"/>
         <source>All Projects</source>
-        <translation type="unfinished"></translation>
+        <translation>Tout les projets</translation>
     </message>
     <message>
         <location line="+52"/>
         <source>File &amp;pattern:</source>
-        <translation type="unfinished">&amp;Schéma de fichier :</translation>
+        <translatorcomment>Schéma de fichier?</translatorcomment>
+        <translation type="unfinished">&amp;Motif de fichier :</translation>
     </message>
 </context>
 <context>
@@ -8441,7 +8482,7 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+80"/>
         <source>Build Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Paramètres de compilation</translation>
     </message>
 </context>
 <context>
@@ -8449,17 +8490,17 @@ in your .pro file.</source>
     <message>
         <location line="+118"/>
         <source>&amp;Clone Selected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Clone sélectionné</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Build Steps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Étapes de compilation</translation>
     </message>
     <message>
         <location line="-81"/>
         <source>Edit Build Configuration:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditer la configuration de compilation :</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -8469,12 +8510,12 @@ in your .pro file.</source>
     <message>
         <location line="+5"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer</translation>
     </message>
     <message>
         <location line="+71"/>
         <source>Clean Steps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Étapes de nettoyage</translation>
     </message>
     <message>
         <location line="+69"/>
@@ -8484,7 +8525,7 @@ in your .pro file.</source>
     <message>
         <location line="+0"/>
         <source>Clone configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Configuration du clone</translation>
     </message>
 </context>
 <context>
@@ -8492,37 +8533,37 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+61"/>
         <source>No Build Steps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucune étape de compilation</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Add clean step</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter une étape de nettoyage</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Add build step</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter une étape de compilation</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove clean step</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer une étape de nettoyage</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Remove build step</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer une étape de compilation</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Build Steps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Étapes de compilation</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Clean Steps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Étapes de nettoyage</translation>
     </message>
 </context>
 <context>
@@ -8531,7 +8572,7 @@ in your .pro file.</source>
         <location filename="../../../src/plugins/projectexplorer/compileoutputwindow.cpp" line="+47"/>
         <location filename="../../../src/plugins/projectexplorer/compileoutputwindow.h" line="+51"/>
         <source>Compile Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sortie de compilation</translation>
     </message>
 </context>
 <context>
@@ -8539,27 +8580,27 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/corelistenercheckingforrunningbuild.cpp" line="+48"/>
         <source>Cancel Build &amp;&amp; Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Annuler la compilation et fermer</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Do not Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ne pas fermer</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Close Qt Creator?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fermer Qt Creator ?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>A project is currently being built.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Un projet est en cours de compilation.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Do you want to cancel the build process and close Qt Creator anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Voulez-vous annuler le processus de compilation et fermer Qt Creator ?</translation>
     </message>
 </context>
 <context>
@@ -8567,7 +8608,7 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/currentprojectfilter.h" line="+54"/>
         <source>Files in current project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichiers dans le projet courant</translation>
     </message>
 </context>
 <context>
@@ -8575,7 +8616,7 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/currentprojectfind.cpp" line="+64"/>
         <source>Current Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projet courant</translation>
     </message>
     <message>
         <location line="+47"/>
@@ -8588,17 +8629,17 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="-435"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom :</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Executable:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécutable :</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Arguments:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arguments :</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -8608,22 +8649,22 @@ in your .pro file.</source>
     <message>
         <location line="+2"/>
         <source>Run in &amp;Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lancer dans un &amp;terminal</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Run Environment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Environnement d&apos;éxecution</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Clean Environment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Environnement de nettoyage</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>System Environment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Environnement système</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8633,12 +8674,12 @@ in your .pro file.</source>
     <message>
         <location line="+102"/>
         <source>No Executable specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun exécutable spécifié.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécution en cours : &lt;b&gt;%1&lt;/b&gt; %2</translation>
     </message>
     <message>
         <location line="-110"/>
@@ -8651,7 +8692,7 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+22"/>
         <source>Dependencies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dépendances</translation>
     </message>
 </context>
 <context>
@@ -8659,17 +8700,17 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectmodels.cpp" line="+232"/>
         <source>%1 of project %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 du projet %2</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Could not rename file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de renommer le fichier</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Renaming file %1 to %2 failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec du renommage du fichier %1 en %2.</translation>
     </message>
 </context>
 <context>
@@ -8677,7 +8718,7 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.cpp" line="+63"/>
         <source>Editor Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Paramètres de l&apos;éditeur</translation>
     </message>
 </context>
 <context>
@@ -8685,7 +8726,7 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.ui"/>
         <source>Default File Encoding:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Encodage de fichier par défaut :</translation>
     </message>
 </context>
 <context>
@@ -8693,12 +8734,12 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/foldernavigationwidget.cpp" line="+194"/>
         <source>File System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Système de fichier</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Synchronize with Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Synchroniser avec l&apos;éditeur</translation>
     </message>
 </context>
 <context>
@@ -8706,12 +8747,12 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="+89"/>
         <source>New session name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom de la nouvelle session</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Enter the name of the new session:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Entrez le nom de la nouvelle session :</translation>
     </message>
 </context>
 <context>
@@ -8719,32 +8760,32 @@ in your .pro file.</source>
     <message>
         <location line="+22"/>
         <source>Switch to session</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Passer à la session</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
         <source>Session Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gestionnaire de session</translation>
     </message>
     <message>
         <location/>
         <source>Create New Session</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Créer une nouvelle session</translation>
     </message>
     <message>
         <location/>
         <source>Clone Session</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cloner la session</translation>
     </message>
     <message>
         <location/>
         <source>Delete Session</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer la session</translation>
     </message>
     <message>
         <location/>
         <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;Qu&apos;est ce qu&apos;une session ?&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
@@ -8752,33 +8793,33 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/outputwindow.cpp" line="+75"/>
         <source>Re-run this run-configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Relancer cette configuration de lancement</translation>
     </message>
     <message>
         <location line="+11"/>
         <location line="+1"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arrêter</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Ctrl+Shift+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+Shift+R</translation>
     </message>
     <message>
         <location line="+56"/>
         <source>Application Output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sortie de l&apos;application</translation>
     </message>
     <message>
         <location line="+116"/>
         <source>The application is still running. Close it first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">L&apos;application est toujours en cours d&apos;exécution. Veuillez la fermer d&apos;abord.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Unable to close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de fermer</translation>
     </message>
 </context>
 <context>
@@ -8786,7 +8827,7 @@ in your .pro file.</source>
     <message>
         <location line="+84"/>
         <source>Application Output Window</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fenêtre de sortie de l&apos;application</translation>
     </message>
 </context>
 <context>
@@ -8808,12 +8849,12 @@ in your .pro file.</source>
     <message>
         <location line="+30"/>
         <source>&lt;b&gt;%1&lt;/b&gt; %2 %3 %4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;%1&lt;/b&gt; %2 %3 %4</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>(disabled)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">(désactivé)</translation>
     </message>
 </context>
 <context>
@@ -8821,12 +8862,12 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/processstep.ui"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom :</translation>
     </message>
     <message>
         <location/>
         <source>Command:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Commande :</translation>
     </message>
     <message>
         <location/>
@@ -8836,7 +8877,7 @@ in your .pro file.</source>
     <message>
         <location/>
         <source>Command Arguments:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arguments de a commande :</translation>
     </message>
     <message>
         <location/>
@@ -8849,12 +8890,12 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.cpp" line="+56"/>
         <source>Build and Run</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Compiler et exécuter</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Projects</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projets</translation>
     </message>
 </context>
 <context>
@@ -8862,7 +8903,7 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/pluginfilefactory.cpp" line="+70"/>
         <source>Could not open the following project: &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;ouvrir le projet &apos;%1&apos;</translation>
     </message>
 </context>
 <context>
@@ -8871,12 +8912,13 @@ in your .pro file.</source>
         <location filename="../../../src/plugins/projectexplorer/projectfilewizardextension.cpp" line="+168"/>
         <source>Failed to add one or more files to project
 &apos;%1&apos; (%2).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;ajouter un ou plusieurs fichier au projet
+&apos;%1&apos; (%2).</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Failed to add &apos;%1&apos; to the version control system.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de l&apos;ajout de &apos;%1&apos; au système de gestion de version.</translation>
     </message>
 </context>
 <context>
@@ -8884,17 +8926,17 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/projecttreewidget.cpp" line="+144"/>
         <source>Simplify tree</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Simplifier l&apos;arbre</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hide generated files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cacher les fichiers générés</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Synchronize with Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Synchroniser avec l&apos;éditeur</translation>
     </message>
 </context>
 <context>
@@ -8902,12 +8944,12 @@ in your .pro file.</source>
     <message>
         <location line="+191"/>
         <source>Projects</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projets</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Filter tree</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Filtrer l&apos;arbre</translation>
     </message>
 </context>
 <context>
@@ -8915,12 +8957,12 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectwizardpage.cpp" line="+131"/>
         <source>Add to &amp;VCS (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter à &amp;VCS (%1)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Files to be added:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier à ajouter :</translation>
     </message>
 </context>
 <context>
@@ -8928,22 +8970,22 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/removefiledialog.ui"/>
         <source>Remove File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer le fichier</translation>
     </message>
     <message>
         <location/>
         <source>File to remove:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier à supprimer :</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Delete file permanently</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Supprimer le fichier de façon permanente</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Remove from Version Control</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Supprimer du système de gestion de version</translation>
     </message>
 </context>
 <context>
@@ -8951,7 +8993,7 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+119"/>
         <source>Run Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Paramètres d&apos;exécution</translation>
     </message>
 </context>
 <context>
@@ -8964,7 +9006,7 @@ in your .pro file.</source>
     <message>
         <location line="+1"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer</translation>
     </message>
 </context>
 <context>
@@ -8972,17 +9014,17 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.ui"/>
         <source>+</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">+</translation>
     </message>
     <message>
         <location/>
         <source>-</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">-</translation>
     </message>
     <message>
         <location/>
         <source>Edit run configuration:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditer la configuration d&apos;exécution :</translation>
     </message>
 </context>
 <context>
@@ -8990,13 +9032,13 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+157"/>
         <source>Session</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Session</translation>
     </message>
     <message>
         <location line="+184"/>
         <source>Untitled</source>
         <comment>default file name to display</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sans titre</translation>
     </message>
 </context>
 <context>
@@ -9004,7 +9046,7 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="+688"/>
         <source>File not found: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier non trouvé : %1</translation>
     </message>
 </context>
 <context>
@@ -9013,7 +9055,7 @@ in your .pro file.</source>
         <location line="-352"/>
         <location filename="../../../src/plugins/projectexplorer/taskwindow.h" line="+62"/>
         <source>Build Issues</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Problèmes de compilation</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -9023,7 +9065,7 @@ in your .pro file.</source>
     <message>
         <location line="+16"/>
         <source>Show Warnings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher les avertissements</translation>
     </message>
 </context>
 <context>
@@ -9031,12 +9073,12 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+122"/>
         <source>The process could not be started!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le processus n&apos;a pas pû être démarré !</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cannot retrieve debugging output!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;obtenir la sortie de déboguage</translation>
     </message>
 </context>
 <context>
@@ -9044,22 +9086,22 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectwizardpage.ui"/>
         <source>Project management</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gestion du projet</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Add to Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Ajouer au projet</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Projet</translation>
     </message>
     <message>
         <location/>
         <source>Add to &amp;version control</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter au gestionnaire de &amp;version</translation>
     </message>
     <message>
         <location/>
@@ -9068,7 +9110,11 @@ in your .pro file.</source>
 
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Les fichiers suivants seronts ajoutés :
+
+
+
+</translation>
     </message>
 </context>
 <context>
@@ -9076,32 +9122,32 @@ in your .pro file.</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+256"/>
         <source>Projects</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projets</translation>
     </message>
     <message>
         <location line="+86"/>
         <source>&amp;Build</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Compilation</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&amp;Debug</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Déboguage</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Start Debugging</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Commencer le déboguage</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>Open With</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir avec</translation>
     </message>
     <message>
         <location line="+66"/>
         <source>Session Manager...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gestionnaire de session...</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -9111,194 +9157,194 @@ in your .pro file.</source>
     <message>
         <location line="+2"/>
         <source>Ctrl+Shift+N</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+Shift+N</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Load Project...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Charger le projet...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Shift+O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+Shift+O</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Open File</source>
-        <translation type="unfinished">Ouvrir le Fichier</translation>
+        <translation type="unfinished">Ouvrir un fichier</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show in Explorer...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher dans l&apos;explorer...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show in Finder...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher dans Finder...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show containing folder...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher le dossier parent...</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Recent Projects</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projets récent</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Close Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fermer le projet</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Close Project &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fermer le projet &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Close All Projects</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fermer tout les projets</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Session</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Session</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Set Build Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Définir la configuration de compilation</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Build All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tout compiler</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Shift+B</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+Shift+B</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Rebuild All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tout recompiler</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Clean All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tout nettoyer</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Build Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Compiler le projet</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Build Project &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Compiler le projet &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Ctrl+B</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+B</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Rebuild Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Recompiler le projet</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Rebuild Project &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Recompiler le projet &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Clean Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nettoyer le projet</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Clean Project &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nettoyer le projet &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Build Without Dependencies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Compiler sans les dépendances</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Rebuild Without Dependencies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Recompiler sans les dépendances</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Clean Without Dependencies</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nettoyer sans les dépendances</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+18"/>
         <source>Run</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécuter</translation>
     </message>
     <message>
         <location line="-16"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+R</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Set Run Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Définir la configuration d&apos;exécution</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Cancel Build</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Annuler la compilation</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+4"/>
         <source>Start Debugging</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Commencer le déboguage</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>F5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">F5</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Add New...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter nouveau...</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Add Existing Files...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter des fichiers existants...</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Remove File...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer fichier...</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Renommer</translation>
     </message>
     <message>
         <location line="+126"/>
         <source>Load Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Charger un projet</translation>
     </message>
     <message>
         <location line="+83"/>
@@ -9310,86 +9356,90 @@ in your .pro file.</source>
         <location line="+867"/>
         <source>New File</source>
         <comment>Title of dialog</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nouveau fichier</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Add Existing Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter des fichiers existants</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Could not add following files to project %1:
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;ajouter les fichiers suivants au projet %1 :
+</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Add files to project failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de l&apos;ajout des fichiers au projet</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Add to Version Control</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter au gestionnaire de version</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add files
 %1
 to version control (%2)?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter les fichiers
+%1
+au gestionnaire de version (%2) ?</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Could not add following files to version control (%1)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;ajouter les fichiers suivant au gestionnaire de version (%1)
+</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Add files to version control failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de l&apos;ajout des fichiers au gestionnaire de version</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Launching Windows Explorer failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec du lancement de l&apos;Explorer Windows</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Could not find explorer.exe in path to launch Windows Explorer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de trouver explorer.exe dans le path pour lancer l&apos;Explorer Windows.</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Launching a file explorer failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec du lancement d&apos;un explorateur de fichier</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Could not find xdg-open to launch the native file explorer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de trouver xdg-open pour lancer un gestionnaire de fichier natif.</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Remove file failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Suppression du fichier échoué</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Could not remove file %1 from project %2.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de supprimer le fichier %1 du projet %2.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Delete file failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de la suppression du fichier</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Could not delete file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de supprimer le fichier %1.</translation>
     </message>
 </context>
 <context>
@@ -9397,22 +9447,22 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+300"/>
         <source>Error while restoring session</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur lors de la restauration de la session</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Could not restore session %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de restaurer la session %1</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Error while saving session</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur lors de l&apos;enregistrement de la session</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Could not save session to file %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;enregistrer la session dans le fichier %1</translation>
     </message>
     <message>
         <location line="+204"/>
@@ -9423,12 +9473,12 @@ to version control (%2)?</source>
         <location line="+4"/>
         <location line="+24"/>
         <source>Untitled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sans titre</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Session (&apos;%1&apos;)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Session (&apos;%1&apos;)</translation>
     </message>
 </context>
 <context>
@@ -9436,27 +9486,27 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qmakestep.ui"/>
         <source>QMake Build Configuration:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Configuration de QMake pour la compilation :</translation>
     </message>
     <message>
         <location/>
         <source>debug</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location/>
         <source>release</source>
-        <translation type="unfinished"></translation>
+        <translation>release</translation>
     </message>
     <message>
         <location/>
         <source>Additional arguments:</source>
-        <translation type="unfinished">Arguments supplémentaires :</translation>
+        <translation>Arguments supplémentaires :</translation>
     </message>
     <message>
         <location/>
         <source>Effective qmake call:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Appels qmake effectif :</translation>
     </message>
 </context>
 <context>
@@ -9464,22 +9514,22 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qtestlib/qtestlibplugin.cpp" line="+59"/>
         <source>Pass</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Succès</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Expected Failure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec attendu</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Failure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Expected Pass</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Succès attendu</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -9489,32 +9539,32 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>Qt Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Avertissements Qt (niveau Warning)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Debug</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Deboguage Qt (niveau Debug)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Critical</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Critique (niveau critical)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Fatal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fatal</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Skipped</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Passé (niveau skipped)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Info</translation>
     </message>
 </context>
 <context>
@@ -9522,17 +9572,17 @@ to version control (%2)?</source>
     <message>
         <location line="+266"/>
         <source>Test Results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Résultats des tests</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Résultat</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Message</translation>
     </message>
 </context>
 <context>
@@ -9540,12 +9590,12 @@ to version control (%2)?</source>
     <message>
         <location line="+45"/>
         <source>All Incidents</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tout les incidents</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Show Only:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher seulement :</translation>
     </message>
 </context>
 <context>
@@ -9553,22 +9603,22 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qmlprojectmanager/qmlnewprojectwizard.cpp" line="+188"/>
         <source>QML Application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Application QML</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates a QML application.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Créer une application QML.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Projects</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projets</translation>
     </message>
     <message>
         <location line="+69"/>
         <source>The project %1 could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le projet %1 n&apos;a pas pu être ouvert.</translation>
     </message>
 </context>
 <context>
@@ -9576,12 +9626,12 @@ to version control (%2)?</source>
     <message>
         <location line="-135"/>
         <source>New QML Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nouveau projet QML</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>This wizard generates a QML application project.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cet assistant génère un projet pour une application QML.</translation>
     </message>
 </context>
 <context>
@@ -9589,22 +9639,22 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectwizard.cpp" line="+190"/>
         <source>Import of existing QML directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Importer un répertoire QML existant</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates a QML project from an existing directory of QML files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Crée un projet QML à partir d&apos;un répertoire existant de fichiers QML.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Projects</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projets</translation>
     </message>
     <message>
         <location line="+94"/>
         <source>The project %1 could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le projet %1 n&apos;a pas pu être ouvert.</translation>
     </message>
 </context>
 <context>
@@ -9612,22 +9662,22 @@ to version control (%2)?</source>
     <message>
         <location line="-163"/>
         <source>Import of QML Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Importation de projet QML</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>QML Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projet QML</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Project name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom du projet :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Emplacement :</translation>
     </message>
 </context>
 <context>
@@ -9636,24 +9686,24 @@ to version control (%2)?</source>
         <location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+339"/>
         <location line="+106"/>
         <source>QML Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Visualisateur QML</translation>
     </message>
     <message>
         <location line="-31"/>
         <location line="+40"/>
         <location line="+60"/>
         <source>&lt;Current File&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;Fichier courant&gt;</translation>
     </message>
     <message>
         <location line="-68"/>
         <source>QML Viewer arguments:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arguments du visualisateur QML:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Main QML File:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier QML principal :</translation>
     </message>
 </context>
 <context>
@@ -9661,32 +9711,32 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/shared/qrceditor/qrceditor.ui"/>
         <source>Add</source>
-        <translation type="unfinished">Ajouter</translation>
+        <translation>Ajouter</translation>
     </message>
     <message>
         <location/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <location/>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Propriétés</translation>
     </message>
     <message>
         <location/>
         <source>Prefix:</source>
-        <translation type="unfinished">Préfixe:</translation>
+        <translation>Préfixe :</translation>
     </message>
     <message>
         <location/>
         <source>Language:</source>
-        <translation type="unfinished">Langue:</translation>
+        <translation>Langue :</translation>
     </message>
     <message>
         <location/>
         <source>Alias:</source>
-        <translation type="unfinished">Alias:</translation>
+        <translation>Alias :</translation>
     </message>
 </context>
 <context>
@@ -9694,12 +9744,12 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp" line="+59"/>
         <source>Qt4 Console Application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Application Console Qt4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates a Qt4 console application.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Crée une application Qt4 de type console.</translation>
     </message>
 </context>
 <context>
@@ -9707,7 +9757,7 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp" line="+52"/>
         <source>This wizard generates a Qt4 console application project. The application derives from QCoreApplication and does not provide a GUI.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cet assistant génère un projet d&apos;application Qt4 console. L&apos;application dérive de QtCoreApplication et ne fournit pas d&apos;interface graphique.</translation>
     </message>
 </context>
 <context>
@@ -9715,12 +9765,12 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/externaleditors.cpp" line="+215"/>
         <source>Qt Designer is not responding (%1).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Qt Designer ne répond pas (%1).</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Unable to create server socket: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de créer le socket serveur : %1</translation>
     </message>
 </context>
 <context>
@@ -9728,7 +9778,7 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/embeddedpropertiespage.cpp" line="+80"/>
         <source>Embedded Linux</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Linux embarqué</translation>
     </message>
 </context>
 <context>
@@ -9736,12 +9786,12 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp" line="+40"/>
         <source>Empty Qt4 Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projet Qt4 vide</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates an empty Qt project.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Crée un projet Qt4 vide.</translation>
     </message>
 </context>
 <context>
@@ -9749,7 +9799,7 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp" line="+50"/>
         <source>This wizard generates an empty Qt4 project. Add files to it later on by using the other wizards.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cet assistant génère un projet Qt4 vide. Ajouter ensuite des fichiers en utilisant les autres assistants.</translation>
     </message>
 </context>
 <context>
@@ -9757,12 +9807,12 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/externaleditors.cpp" line="-185"/>
         <source>Unable to start &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de démarrer &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The application &quot;%1&quot; could not be found.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">L&apos;application &quot;%1&quot; est introuvable.</translation>
     </message>
 </context>
 <context>
@@ -9770,12 +9820,12 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/wizards/filespage.cpp" line="+45"/>
         <source>Class Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Information de la classe</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Specify basic information about the classes for which you want to generate skeleton source code files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Définit les informations de bases des classes pour lesquelles vous souhaitez générer des fichiers squelettes de code source.</translation>
     </message>
 </context>
 <context>
@@ -9783,17 +9833,17 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/wizards/guiappwizard.cpp" line="+76"/>
         <source>Qt4 Gui Application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Application Graphique Qt4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates a Qt4 Gui Application with one form.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Crée une application Gui Qt 4 avec un formulaire.</translation>
     </message>
     <message>
         <location line="+125"/>
         <source>The template file &apos;%1&apos; could not be opened for reading: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le fichier modèle &apos;%1&apos; n&apos;a pas pu être ouvert en lecture : %2</translation>
     </message>
 </context>
 <context>
@@ -9801,7 +9851,7 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp" line="+63"/>
         <source>This wizard generates a Qt4 GUI application project. The application derives by default from QApplication and includes an empty widget.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cet assistant génère un projet d&apos;application graphique Qt4. L&apos;application dérive par défaut de QApplication et inclut un widget vide.</translation>
     </message>
 </context>
 <context>
@@ -9809,12 +9859,12 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/wizards/librarywizard.cpp" line="+51"/>
         <source>C++ Library</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bibliothèque C++</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates a C++ Library.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Crée une bibliothèque C++.</translation>
     </message>
 </context>
 <context>
@@ -9822,17 +9872,17 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp" line="+122"/>
         <source>Shared library</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bibliothèque partagée</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Statically linked library</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bibliothèque avec lien statique</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Qt 4 plugin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Plugin Qt 4</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9842,7 +9892,7 @@ to version control (%2)?</source>
     <message>
         <location line="+35"/>
         <source>This wizard generates a C++ library project.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cet assistant génère un projet de bibliothèque C++.</translation>
     </message>
 </context>
 <context>
@@ -9850,12 +9900,12 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/wizards/modulespage.cpp" line="+51"/>
         <source>Select required modules</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sélectionner les modules requis</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select the modules you want to include in your project. The recommended modules for this project are selected by default.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sélectionnez les modules que vous souhaitez inclure au projet. Les modules recommandés pour ce projet sont sélectionnées par défaut.</translation>
     </message>
 </context>
 <context>
@@ -9863,27 +9913,27 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/shared/proparser/proeditor.ui"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
         <location/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer</translation>
     </message>
     <message>
         <location/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Monter</translation>
     </message>
     <message>
         <location/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Descendre</translation>
     </message>
     <message>
         <location filename="../../../src/shared/proparser/proeditor.cpp" line="+51"/>
         <source>Cut</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Couper</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9898,32 +9948,32 @@ to version control (%2)?</source>
     <message>
         <location line="+37"/>
         <source>Ctrl+X</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+X</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ctrl+C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+C</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ctrl+V</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+V</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Add Variable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter une variable</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add Scope</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter une portée</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add Block</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouter un bloc</translation>
     </message>
 </context>
 <context>
@@ -9931,37 +9981,37 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/shared/proparser/proeditormodel.cpp" line="+446"/>
         <source>&lt;Global Scope&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;Portée Globale&gt;</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Change Item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modifier l&apos;élément</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Change Variable Assignment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modifier l&apos;affectation de la variable</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Change Variable Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modifier le type de la variable</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Change Scope Condition</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modifier la condition de portée</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Change Expression</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modifier l&apos;expression</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>Move Item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Déplacer l&apos;élément</translation>
     </message>
     <message>
         <location line="+41"/>
@@ -9971,7 +10021,7 @@ to version control (%2)?</source>
     <message>
         <location line="+49"/>
         <source>Insert Item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Insérer un élément</translation>
     </message>
 </context>
 <context>
@@ -9980,22 +10030,22 @@ to version control (%2)?</source>
         <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+51"/>
         <location line="+125"/>
         <source>Import existing build settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Importer des paramètres de génération existants</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Qt Creator has found an already existing build in the source directory.&lt;br&gt;&lt;br&gt;&lt;b&gt;Qt Version:&lt;/b&gt; %1&lt;br&gt;&lt;b&gt;Build configuration:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;Additional QMake Arguments:&lt;/b&gt;%3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Qt Creator a détecté une génération existante dans le répertoire source. &lt;br&gt; &lt;br&gt; &lt;b&gt;Qt Version : &lt;/b&gt; %1&lt;br&gt;&lt;b&gt;Configuration de génération :&lt;/b&gt; %2&lt;br&gt;Arguments QMake supplémentaires : &lt;/b&gt; %3</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; Importing the settings will automatically add the Qt Version identified by &lt;br&gt;&lt;b&gt;%1&lt;/b&gt; to the list of Qt versions.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Note:&lt;/b&gt; L&apos;importation des paramètres ajoutera automatiquement la version de Qt identifiée par &lt;br&gt; &lt;b&gt; %1&lt;/b&gt; à la liste des versions de Qt.</translation>
     </message>
     <message>
         <location line="-6"/>
         <source>Import existing build settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Importer des paramètres de génération existants.</translation>
     </message>
 </context>
 <context>
@@ -10008,7 +10058,7 @@ to version control (%2)?</source>
     <message>
         <location line="+14"/>
         <source>Build Environment</source>
-        <translation type="unfinished">Environnement de compilation</translation>
+        <translation type="unfinished">Environnement de génération</translation>
     </message>
 </context>
 <context>
@@ -10016,27 +10066,27 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+352"/>
         <source>Headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">En-têtes</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Sources</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sources</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Forms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Intefaces</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Resources</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ressources</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Other files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Autres fichiers</translation>
     </message>
     <message>
         <location line="+155"/>
@@ -10047,7 +10097,7 @@ to version control (%2)?</source>
     <message>
         <location line="-7"/>
         <source>Could not open the file for edit with SCC.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;ouvrir le fichier pour l&apos;éditer avec SCC.</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -10057,17 +10107,17 @@ to version control (%2)?</source>
     <message>
         <location line="+33"/>
         <source>There are unsaved changes for project file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Des modifications n&apos;ont pas été enregistrées pour le fichier de projet %1.</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Error while parsing file %1. Giving up.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur pendant le parcours du fichier %1. Abandon.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Error while changing pro file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur pendant la modification du fichier pro %1.</translation>
     </message>
 </context>
 <context>
@@ -10075,12 +10125,12 @@ to version control (%2)?</source>
     <message>
         <location line="+240"/>
         <source>Error while parsing file %1. Giving up.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur pendant le parcours du fichier %1. Abandon.</translation>
     </message>
     <message>
         <location line="+364"/>
         <source>Could not find .pro file for sub dir &apos;%1&apos; in &apos;%2&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de trouver le fichier .pro pour le sous répertoire &apos;%1&apos; dans &apos;%2&apos;</translation>
     </message>
 </context>
 <context>
@@ -10088,53 +10138,53 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
         <source>Configuration Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom de la configuration :</translation>
     </message>
     <message>
         <location/>
         <source>Qt Version:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Version de Qt :</translation>
     </message>
     <message>
         <location/>
         <source>This Qt-Version is invalid.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cette version de Qt est invalide.</translation>
     </message>
     <message>
         <location/>
         <source>Shadow Build:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Shadow Build :</translation>
     </message>
     <message>
         <location/>
         <source>Build Directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Répertoire des fichiers compilés :</translation>
     </message>
     <message>
         <location/>
         <source>&lt;a href=&quot;import&quot;&gt;Import existing build&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;a href=&quot;import&quot;&gt;Importer une compilation existante&lt;/a&gt;</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+71"/>
         <source>Shadow Build Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Répertoire du Shadow build</translation>
     </message>
     <message>
         <location line="+47"/>
         <location line="+65"/>
         <source>Default Qt Version (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Version de Qt par défaut (%1)</translation>
     </message>
     <message>
         <location line="-61"/>
         <source>No Qt Version set</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucune version de Qt définie</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>using Qt version: &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;with tool chain &lt;b&gt;%2&lt;/b&gt;&lt;br&gt;building in &lt;b&gt;%3&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">utilise la version de Qt : &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;avec la chaîne d&apos;outil &lt;b&gt;%2&lt;/b&gt;&lt;br&gt;compilé dans &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -10144,12 +10194,12 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
         <source>Manage</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gérer</translation>
     </message>
     <message>
         <location/>
         <source>Tool Chain:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Chaîne d&apos;outil :</translation>
     </message>
 </context>
 <context>
@@ -10158,7 +10208,7 @@ to version control (%2)?</source>
         <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+181"/>
         <location line="+5"/>
         <source>Run qmake</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécuter qmake</translation>
     </message>
 </context>
 <context>
@@ -10167,7 +10217,7 @@ to version control (%2)?</source>
         <location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+72"/>
         <location line="+458"/>
         <source>Qt4RunConfiguration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Qt4RunConfiguration</translation>
     </message>
     <message>
         <location line="+50"/>
@@ -10915,17 +10965,18 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
-        <translation type="unfinished">Configuration du filtre</translation>
+        <translation>Configuration du filtre</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Limit to prefix</source>
+        <translatorcomment>Limité ?</translatorcomment>
         <translation type="unfinished">Limiter au préfixe</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Prefix:</source>
-        <translation type="unfinished">Préfixe:</translation>
+        <translation>Préfixe :</translation>
     </message>
 </context>
 <context>
@@ -10933,36 +10984,36 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
-        <translation type="unfinished">Filtre de dossier générique</translation>
+        <translation>Filtre de dossier générique</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Filter Configuration</source>
-        <translation type="unfinished">Configuration du filtre</translation>
+        <translation>Configuration du filtre</translation>
     </message>
     <message>
         <location line="+45"/>
         <location line="+11"/>
         <source>Choose a directory to add</source>
-        <translation type="unfinished">Choisir un répertoire à ajouter</translation>
+        <translation>Sélectionner un répertoire à ajouter</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>%1 filter update: 0 files</source>
-        <translation type="unfinished">Mise à jour du filtre %1: 0 fichiers</translation>
+        <translation>Mise à jour du filtre %1 : 0 fichiers</translation>
     </message>
     <message numerus="yes">
         <location line="+23"/>
         <source>%1 filter update: %n files</source>
-        <translation type="unfinished">
-            <numerusform>Mise à jour du filtre %1: %n fichier</numerusform>
-            <numerusform>Mise à jour du filtre %1: %n fichiers</numerusform>
+        <translation>
+            <numerusform>Mise à jour du filtre %1 : %n fichier</numerusform>
+            <numerusform>Mise à jour du filtre %1 : %n fichiers</numerusform>
         </translation>
     </message>
     <message>
         <location line="+41"/>
         <source>%1 filter update: canceled</source>
-        <translation type="unfinished">Mise à jour du filtre %1: annulée</translation>
+        <translation>Mise à jour du filtre %1 : annulée</translation>
     </message>
 </context>
 <context>
@@ -10970,38 +11021,38 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
-        <translation type="unfinished">Nom:</translation>
+        <translation>Nom :</translation>
     </message>
     <message>
         <location/>
         <source>File Types:</source>
-        <translation type="unfinished">Types de fichiers:</translation>
+        <translation>Types de fichiers :</translation>
     </message>
     <message>
         <location/>
         <source>Specify file name filters, separated by comma. Filters may contain wildcards.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Spécifier les filtres de nom de fichier, séparés par la virgule. Les filtres peuvent contenir des caractères de remplacement.</translation>
     </message>
     <message>
         <location/>
         <source>Prefix:</source>
-        <translation type="unfinished">Préfixe:</translation>
+        <translation>Préfixe :</translation>
     </message>
     <message>
         <location/>
         <source>Specify a short word/abbreviation that can be used to restrict completions to files from this directory tree.
 To do this, you type this shortcut and a space in the Locator entry field, and then the word to search for.</source>
-        <translation type="unfinished">Spécifier a mot court ou une abbréviation qui peut être utilisé pour réstreindre la complétion aux fichiers de cette arborescence. Pour ce faire, entrez ce raccourci et un espace dans le champs Localisation, puis ensuite le mot à chercher.</translation>
+        <translation>Spécifier un mot court ou une abbréviation qui peut être utilisé pour réstreindre les complétions aux fichiers de cette arborescence. Pour ce faire, entrer ce raccourci et un espace dans le champs localisation, puis ensuite le mot à chercher.</translation>
     </message>
     <message>
         <location/>
         <source>Limit to prefix</source>
-        <translation type="unfinished">Limiter au préfixe</translation>
+        <translation>Limiter au préfixe</translation>
     </message>
     <message>
         <location/>
         <source>Add...</source>
-        <translation type="unfinished">Ajouter...</translation>
+        <translation>Ajouter...</translation>
     </message>
     <message>
         <location/>
@@ -11016,7 +11067,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Directories:</source>
-        <translation type="unfinished">Dossiers:</translation>
+        <translation>Dossiers :</translation>
     </message>
 </context>
 <context>
@@ -11024,7 +11075,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
-        <translation type="unfinished">Fichiers du système de fichier</translation>
+        <translation>Fichiers du système de fichier</translation>
     </message>
 </context>
 <context>
@@ -11032,27 +11083,27 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
-        <translation type="unfinished">Configuration du filtre</translation>
+        <translation>Configuration du filtre</translation>
     </message>
     <message>
         <location/>
         <source>Prefix:</source>
-        <translation type="unfinished">Préfixe:</translation>
+        <translation>Préfixe :</translation>
     </message>
     <message>
         <location/>
         <source>Limit to prefix</source>
-        <translation type="unfinished">Limiter au préfixe</translation>
+        <translation>Limiter au préfixe</translation>
     </message>
     <message>
         <location/>
         <source>Include hidden files</source>
-        <translation type="unfinished">Inclure les fichiers cachés</translation>
+        <translation>Inclure les fichiers cachés</translation>
     </message>
     <message>
         <location/>
         <source>Filter:</source>
-        <translation type="unfinished">Filtre:</translation>
+        <translation>Filtre :</translation>
     </message>
 </context>
 <context>
@@ -11060,7 +11111,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
-        <translation type="unfinished">Ouvrir des documents</translation>
+        <translation>Ouvrir des documents</translation>
     </message>
 </context>
 <context>
@@ -11068,7 +11119,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
-        <translation type="unfinished">Filtres disponibles</translation>
+        <translation>Filtres disponibles</translation>
     </message>
 </context>
 <context>
@@ -11084,12 +11135,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
-        <translation type="unfinished">Raffraîchir</translation>
+        <translation>Rafraîchir</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Configure...</source>
-        <translation type="unfinished">Configurer...</translation>
+        <translation>Configurer...</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -11143,7 +11194,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
-        <translation type="unfinished">%1 (Prefixe: %2)</translation>
+        <translation>%1 (Préfixe : %2)</translation>
     </message>
 </context>
 <context>
@@ -11151,12 +11202,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
-        <translation type="unfinished">Configurer les filtres</translation>
+        <translation>Configurer les filtres</translation>
     </message>
     <message>
         <location/>
         <source>Add</source>
-        <translation type="unfinished">Ajouter</translation>
+        <translation>Ajouter</translation>
     </message>
     <message>
         <location/>
@@ -11171,12 +11222,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Refresh Interval:</source>
-        <translation type="unfinished">Intervalle de raffraichissement:</translation>
+        <translation>Intervalle de raffraichissement :</translation>
     </message>
     <message>
         <location/>
         <source> min</source>
-        <translation type="unfinished">min</translation>
+        <translation>min</translation>
     </message>
 </context>
 <context>
@@ -11323,17 +11374,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.ui"/>
         <source>Save Changes</source>
-        <translation type="unfinished">Sauvegarder les changements</translation>
+        <translation>Sauvegarder les changements</translation>
     </message>
     <message>
         <location/>
         <source>The following files have unsaved changes:</source>
-        <translation type="unfinished">Les fichiers suivants contiennent des modifications non enregistrées:</translation>
+        <translation>Les fichiers suivants contiennent des modifications non enregistrées :</translation>
     </message>
     <message>
         <location/>
         <source>Automatically save all files before building</source>
-        <translation type="unfinished">Sauvegarder automatiquement tous les fichiers avant de compiler</translation>
+        <translation>Sauvegarder automatiquement tous les fichiers avant de compiler</translation>
     </message>
 </context>
 <context>
@@ -11341,12 +11392,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/coreplugin/dialogs/settingsdialog.ui"/>
         <source>Options</source>
-        <translation type="unfinished">Options</translation>
+        <translation>Options</translation>
     </message>
     <message>
         <location/>
         <source>0</source>
-        <translation type="unfinished">0</translation>
+        <translation>0</translation>
     </message>
 </context>
 <context>
@@ -11955,7 +12006,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <location line="+290"/>
         <source>&lt;b&gt;Error:&lt;/b&gt; Could not decode &quot;%1&quot; with &quot;%2&quot;-encoding. Editing not possible.</source>
         <translatorcomment>error -&gt; erreur ;)</translatorcomment>
-        <translation type="unfinished">&lt;b&gt;Erreur :&lt;/b&gt; Impossible de décoder &quot;%1&quot; avec l&apos;encodage &quot;%2&quot;. L&apos;édition est impossible.</translation>
+        <translation>&lt;b&gt;Erreur :&lt;/b&gt; Impossible de décoder &quot;%1&quot; avec l&apos;encodage &quot;%2&quot;. L&apos;édition est impossible.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12041,7 +12092,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Removes trailing whitespace on saving.</source>
-        <translation type="unfinished">Supprime les caractères d&apos;espacement à la fin des lignes lors de la sauvegarde.</translation>
+        <translation>Supprime les caractères d&apos;espacement à la fin des lignes lors de la sauvegarde.</translation>
     </message>
     <message>
         <location/>
@@ -12157,27 +12208,27 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+124"/>
         <source>Copy Color Scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Copier l&apos;arrangement de couleurs</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Color Scheme name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom de l&apos;arrangement de couleurs :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>%1 (copy)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 (copie)</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Delete Color Scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer l&apos;arrangement de couleurs</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Are you sure you want to delete this color scheme permanently?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Êtes vous sûr de vouloir supprimer cet arrangement de couleurs ?</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -12187,17 +12238,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+28"/>
         <source>Color Scheme Changed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Arrangement de couleurs modifié</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The color scheme &quot;%1&quot; was modified, do you want to save the changes?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">L&apos;arrangement de couleurs &quot;%1&quot; a été modifié, voulez-vous enregistrer les changements ?</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Discard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abandonner</translation>
     </message>
     <message>
         <source>
@@ -12326,7 +12377,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location/>
         <source>Copy...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Copier...</translation>
     </message>
     <message>
         <location/>
@@ -12400,7 +12451,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+2"/>
         <source>&amp;Redo</source>
-        <translation type="unfinished">&amp;Refaire</translation>
+        <translation>&amp;Refaire</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -12420,22 +12471,22 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+5"/>
         <source>Meta</source>
-        <translation type="unfinished"></translation>
+        <translation>Meta</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Rewrap Paragraph</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Réadapter les retour à la ligne du paragraphe</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Visualize Whitespace</source>
-        <translation></translation>
+        <translation>&amp;Visualiser les espaces</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -12445,7 +12496,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+7"/>
         <source>Enable Text &amp;Wrapping</source>
-        <translation type="unfinished"></translation>
+        <translation>Activer le &amp;retour à la ligne automatique</translation>
     </message>
     <message>
         <source>Ctrl+E, Ctrl+W</source>
@@ -12454,142 +12505,144 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="-20"/>
         <source>%1+E, R</source>
-        <translation type="unfinished"></translation>
+        <translation>%1+E, R</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>%1+E, %2+V</source>
-        <translation type="unfinished"></translation>
+        <translation>%1+E, %2+V</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>%1+E, %2+W</source>
-        <translation type="unfinished"></translation>
+        <translation>%1+E, %2+W</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>(Un)Comment &amp;Selection</source>
-        <translation type="unfinished">(Dé)Commenter la &amp;Sélection</translation>
+        <translation>(Dé)Commenter la &amp;Sélection</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+/</source>
-        <translation type="unfinished">Ctrl+/</translation>
+        <translation>Ctrl+/</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Cut &amp;Line</source>
-        <translation type="unfinished">Couper la &amp;Ligne</translation>
+        <translation>Couper la &amp;ligne</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Shift+Del</source>
-        <translation type="unfinished">Shift+Suppr</translation>
+        <translation>Shift+Suppr</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Delete &amp;Line</source>
-        <translation type="unfinished">Effacer la &amp;Ligne</translation>
+        <translation>Effacer la &amp;ligne</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Collapse</source>
-        <translation type="unfinished">Plier</translation>
+        <translation>Réduire</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+&lt;</source>
-        <translation type="unfinished">Ctrl+&lt;</translation>
+        <translation>Ctrl+&lt;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Expand</source>
-        <translation type="unfinished">Étendre</translation>
+        <translation>Développer</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+&gt;</source>
-        <translation type="unfinished">Ctrl+&gt;</translation>
+        <translation>Ctrl+&gt;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>(Un)&amp;Collapse All</source>
-        <translation type="unfinished">(Dé)&amp;Plier tout</translation>
+        <translation>(Dé)&amp;Plier tout</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Increase Font Size</source>
-        <translation type="unfinished">Augmenter la taille de la police</translation>
+        <translation>Augmenter la taille de la police</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl++</source>
-        <translation type="unfinished">Ctrl++</translation>
+        <translation>Ctrl++</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Decrease Font Size</source>
-        <translation type="unfinished">Diminuer la taille de la police</translation>
+        <translation>Diminuer la taille de la police</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+-</source>
-        <translation type="unfinished">Ctrl+-</translation>
+        <translation>Ctrl+-</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Goto Block Start</source>
-        <translation type="unfinished">Aller au début du bloc</translation>
+        <translation>Aller au début du bloc</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+[</source>
-        <translation type="unfinished">Ctrl+[</translation>
+        <translation>Ctrl+[</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Goto Block End</source>
-        <translation type="unfinished">Aller à la fin du bloc</translation>
+        <translation>Aller à la fin du bloc</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+]</source>
-        <translation type="unfinished">Ctrl+]</translation>
+        <translation>Ctrl+]</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Goto Block Start With Selection</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Allez jusqu&apos;au début du bloc avec la sélection?</translatorcomment>
+        <translation>Sélectionner jusqu&apos;au début du bloc</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+{</source>
-        <translation type="unfinished">Ctrl+{</translation>
+        <translation>Ctrl+{</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Goto Block End With Selection</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Allez jusqu&apos;à la fin du bloc avec la sélection?</translatorcomment>
+        <translation>Sélectionner jusqu&apos;à la fin du bloc</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+}</source>
-        <translation type="unfinished">Ctrl+}</translation>
+        <translation>Ctrl+}</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Select Block Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner le bloc au-dessus</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished">Ctrl+U</translation>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Select Block Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner le bloc en dessous</translation>
     </message>
     <message>
         <source>Ctrl+Shift+U</source>
@@ -12598,47 +12651,47 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+5"/>
         <source>Move Line Up</source>
-        <translation type="unfinished">Déplacer la ligne au-dessus</translation>
+        <translation>Déplacer la ligne au-dessus</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Shift+Up</source>
-        <translation type="unfinished">Ctrl+Shift+Up</translation>
+        <translation>Ctrl+Shift+Up</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Move Line Down</source>
-        <translation type="unfinished">Déplacer la ligne en-dessous</translation>
+        <translation>Déplacer la ligne en dessous</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Shift+Down</source>
-        <translation type="unfinished">Ctrl+Shift+Down</translation>
+        <translation>Ctrl+Shift+Down</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy Line Up</source>
-        <translation type="unfinished">Copier la ligne au-dessus</translation>
+        <translation>Copier la ligne au-dessus</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Alt+Up</source>
-        <translation type="unfinished">Ctrl+Alt+Up</translation>
+        <translation>Ctrl+Alt+Up</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy Line Down</source>
-        <translation type="unfinished">Copier la ligne en-dessous</translation>
+        <translation>Copier la ligne en dessous</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Alt+Down</source>
-        <translation type="unfinished">Ctrl+Alt+Down</translation>
+        <translation>Ctrl+Alt+Down</translation>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
-        <translation type="unfinished">&lt;numéro de ligne&gt;</translation>
+        <source>&lt;line number&gt;</source>
+        <translation>&lt;numéro de ligne&gt;</translation>
     </message>
 </context>
 <context>
@@ -12672,7 +12725,7 @@ The following encodings are likely to fit:</source>
         <location line="+1"/>
         <source>Search Scope</source>
         <translatorcomment>contexte/portée/autre ?</translatorcomment>
-        <translation type="unfinished">Portée de la recherche</translation>
+        <translation>Portée de la recherche</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12692,22 +12745,22 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+4"/>
         <source>Occurrences</source>
-        <translation type="unfinished"></translation>
+        <translation>Occurences</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Unused Occurrence</source>
-        <translation type="unfinished"></translation>
+        <translation>Occurence inutilisé</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Renaming Occurrence</source>
-        <translation type="unfinished"></translation>
+        <translation>Renommer l&apos;occurence</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Number</source>
-        <translation type="unfinished">Numéro</translation>
+        <translation>Numéro</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12737,7 +12790,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+1"/>
         <source>Label</source>
-        <translation type="unfinished">Étiquette</translation>
+        <translation>Étiquette</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12757,7 +12810,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+1"/>
         <source>Visual Whitespace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Espace visuel</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12767,7 +12820,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+3"/>
         <source>Added Line</source>
-        <translation type="unfinished">Ligne ajoutée</translation>
+        <translation>Ligne ajoutée</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12807,47 +12860,47 @@ The following encodings are likely to fit:</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/toolchain.cpp" line="+113"/>
         <source>GCC</source>
-        <translation type="unfinished"></translation>
+        <translation>GCC</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Intel C++ Compiler (Linux)</source>
-        <translation type="unfinished"></translation>
+        <translation>Compilateur C++ Intel (Linux)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>MinGW</source>
-        <translation type="unfinished"></translation>
+        <translation>MinGW</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Microsoft Visual C++</source>
-        <translation type="unfinished"></translation>
+        <translation>Microsoft Visual C++</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Windows CE</source>
-        <translation type="unfinished"></translation>
+        <translation>Windows CE</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>WINSCW</source>
-        <translation type="unfinished"></translation>
+        <translation>WINSCW</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>GCCE</source>
-        <translation type="unfinished"></translation>
+        <translation>GCCE</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>RVCT (ARMV5)</source>
-        <translation type="unfinished"></translation>
+        <translation>RVCT (ARMV5)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>RVCT (ARMV6)</source>
-        <translation type="unfinished"></translation>
+        <translation>RVCT (ARMV6)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12963,12 +13016,12 @@ The following encodings are likely to fit:</source>
     <message>
         <location filename="../../../src/plugins/vcsbase/vcsbasesubmiteditor.cpp" line="+138"/>
         <source>Check message</source>
-        <translation type="unfinished">Contrôle du message</translation>
+        <translation>Contrôle du message</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Insert name...</source>
-        <translation type="unfinished">Inserez le nom...</translation>
+        <translation>Inserez le nom...</translation>
     </message>
     <message>
         <location line="+313"/>
@@ -13038,7 +13091,7 @@ nom &lt;email&gt; alias &lt;/email&gt;</translation>
     <message>
         <location/>
         <source>A simple file containing lines with field names like &quot;Reviewed-By:&quot; which will be added below the submit editor.</source>
-        <translation type="unfinished">Un fichier texte contenant des lignes contenant des champs tels que &quot;Reviewed-By:&quot;, qui sont ajouté à la fin dans l&apos;éditeur de message.</translation>
+        <translation type="unfinished">Un fichier texte contenant des lignes avec des champs tels que &quot;Reviewed-By:&quot;, qui seront ajouté à la fin dans l&apos;éditeur de message.</translation>
     </message>
     <message>
         <location/>
@@ -13057,7 +13110,7 @@ nom &lt;email&gt; alias &lt;/email&gt;</translation>
         <location line="+1"/>
         <source>Would you like to remove this file from the version control system (%1)?
 Note: This might remove the local file.</source>
-        <translation type="unfinished">Voulez-vous retirer ce fichier du système de gestion de versions (%1)?
+        <translation>Voulez-vous retirer ce fichier du système de gestion de versions (%1) ?
 Note : Ceci risque de supprimer le fichier du disque.</translation>
     </message>
 </context>
@@ -13100,12 +13153,12 @@ Note : Ceci risque de supprimer le fichier du disque.</translation>
     <message>
         <location/>
         <source>&amp;Description:</source>
-        <translation type="unfinished">&amp;Description :</translation>
+        <translation>&amp;Description :</translation>
     </message>
     <message>
         <location/>
         <source>&lt;Description&gt;</source>
-        <translation type="unfinished">&lt;Description&gt;</translation>
+        <translation>&lt;Description&gt;</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -13124,17 +13177,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Patch 1</source>
-        <translation type="unfinished">Patch 1</translation>
+        <translation>Patch 1</translation>
     </message>
     <message>
         <location/>
         <source>Patch 2</source>
-        <translation type="unfinished">Patch 2</translation>
+        <translation>Patch 2</translation>
     </message>
     <message>
         <location/>
         <source>Protocol:</source>
-        <translation type="unfinished">Protocole :</translation>
+        <translation>Protocole :</translation>
     </message>
     <message>
         <location/>
@@ -13143,12 +13196,16 @@ p, li { white-space: pre-wrap; }
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt;&quot;&gt;&amp;lt;Comment&amp;gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt;&quot;&gt;&amp;lt;Commentaire&amp;gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location/>
         <source>Parts to send to server</source>
-        <translation></translation>
+        <translation type="unfinished">Parties à envoyer au serveur</translation>
     </message>
 </context>
 <context>
@@ -13156,27 +13213,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/libs/aggregation/examples/text/main.ui"/>
         <source>main</source>
-        <translation type="unfinished">main</translation>
+        <translation>main</translation>
     </message>
     <message>
         <location/>
         <source>Text1:</source>
-        <translation type="unfinished">Texte 1:</translation>
+        <translation>Texte 1 :</translation>
     </message>
     <message>
         <location/>
         <source>N/A</source>
-        <translation type="unfinished">Indisponible</translation>
+        <translation type="unfinished">N/A</translation>
     </message>
     <message>
         <location/>
         <source>Text2:</source>
-        <translation type="unfinished">Texte 2:</translation>
+        <translation>Texte 2 :</translation>
     </message>
     <message>
         <location/>
         <source>Text3:</source>
-        <translation type="unfinished">Texte 3:</translation>
+        <translation>Texte 3 :</translation>
     </message>
 </context>
 <context>
@@ -13184,12 +13241,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cpaster/pastebindotcomsettings.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
         <location/>
         <source>Server Prefix:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Préfixe du serveur :</translation>
     </message>
     <message>
         <location/>
@@ -13207,37 +13264,38 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/settingspage.ui"/>
         <source>Prompt to submit</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>prompt comme &quot;message&quot; ou comme &quot;rapide&quot; ?</translatorcomment>
+        <translation type="unfinished">Message à envoyer</translation>
     </message>
     <message>
         <location/>
         <source>When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit id). Otherwise, only the respective file will be displayed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Si coché, tous les fichiers modifiés par un commit seront affichés lors d&apos;un clic sur un numéro de révison dans la vue d&apos;annotation (récupérée par un id de commit). Sinon, seul le fichier respectif sera affiché.</translation>
     </message>
     <message>
         <location/>
         <source>Describe all files matching commit id:</source>
-        <translation type="unfinished"></translation>
+        <translation>Décrire tous les fichiers correspondant à l&apos;id de commit :</translation>
     </message>
     <message>
         <location/>
         <source>CVS Command:</source>
-        <translation type="unfinished"></translation>
+        <translation>Commande CVS :</translation>
     </message>
     <message>
         <location/>
         <source>CVS Root:</source>
-        <translation type="unfinished"></translation>
+        <translation>Racine CVS :</translation>
     </message>
     <message>
         <location/>
         <source>Diff Options:</source>
-        <translation type="unfinished"></translation>
+        <translation>Options Diff :</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/cvs/settingspage.cpp" line="+84"/>
         <source>CVS</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS</translation>
     </message>
 </context>
 <context>
@@ -13245,42 +13303,43 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/gdb/trkoptionswidget.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
         <location/>
         <source>Gdb</source>
-        <translation type="unfinished"></translation>
+        <translation>Gdb</translation>
     </message>
     <message>
         <location/>
         <source>Symbian ARM gdb location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Emplacement du gdb ARM Symbian :</translation>
     </message>
     <message>
         <location/>
         <source>Communication</source>
-        <translation type="unfinished"></translation>
+        <translation>Communication</translation>
     </message>
     <message>
         <location/>
         <source>Serial Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Port Série</translation>
     </message>
     <message>
         <location/>
         <source>Bluetooth</source>
-        <translation type="unfinished"></translation>
+        <translation>Bluetooth</translation>
     </message>
     <message>
         <location/>
         <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <translation>Port :</translation>
     </message>
     <message>
         <location/>
         <source>Device:</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Périphérique plutôt ?</translatorcomment>
+        <translation type="unfinished">Appareil:</translation>
     </message>
 </context>
 <context>
@@ -13288,42 +13347,43 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/designer/cpp/cppsettingspagewidget.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulaire</translation>
     </message>
     <message>
         <location/>
         <source>Embedding of the UI Class</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Intégration de la classe UI</translation>
     </message>
     <message>
         <location/>
         <source>Aggregation as a pointer member</source>
-        <translation type="unfinished"></translation>
+        <translation>Agrégation comme pointeur membre</translation>
     </message>
     <message>
         <location/>
         <source>Aggregation</source>
-        <translation type="unfinished"></translation>
+        <translation>Agrégation</translation>
     </message>
     <message>
         <location/>
         <source>Multiple Inheritance</source>
-        <translation type="unfinished"></translation>
+        <translation>Héritage multiple</translation>
     </message>
     <message>
         <location/>
         <source>Code Generation</source>
-        <translation type="unfinished"></translation>
+        <translation>Génération de code</translation>
     </message>
     <message>
         <location/>
         <source>Support for changing languages at runtime</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>changement de langue ou de langage ?</translatorcomment>
+        <translation type="unfinished">Prise en charge du changement de langage à l&apos;exécution</translation>
     </message>
     <message>
         <location/>
         <source>Use Qt module name in #include-directive</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser le nom du module Qt dans #include-directive</translation>
     </message>
 </context>
 <context>
@@ -13331,27 +13391,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitorioushostwidget.ui"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitorioushostwidget.cpp" line="+86"/>
         <source>&lt;New Host&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Nouvel Hôte&gt;</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Host</source>
-        <translation type="unfinished"></translation>
+        <translation>Hôte</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Projects</source>
-        <translation type="unfinished"></translation>
+        <translation>Projets</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Description</translation>
     </message>
 </context>
 <context>
@@ -13359,32 +13419,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousprojectwidget.ui"/>
         <source>WizardPage</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">WizardPage</translation>
     </message>
     <message>
         <location/>
         <source>Filter:</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtre :</translation>
     </message>
     <message>
         <location/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location/>
         <source>Keep updating</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mise à jour continue</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousprojectwidget.cpp" line="+84"/>
         <source>Project</source>
-        <translation type="unfinished"></translation>
+        <translation>Projet</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Description</translation>
     </message>
 </context>
 <context>
@@ -13392,62 +13452,62 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousrepositorywizardpage.ui"/>
         <source>WizardPage</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">WizardPage</translation>
     </message>
     <message>
         <location/>
         <source>Filter:</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtre:</translation>
     </message>
     <message>
         <location/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp" line="+83"/>
         <source>Name</source>
-        <translation type="unfinished">Nom</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Owner</source>
-        <translation type="unfinished"></translation>
+        <translation>Propriétaire</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Description</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Choose a repository of the project &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Choisissez un répertoire pour le projet &apos;%1&apos;.</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Mainline Repositories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dépôts principaux</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Clones</source>
-        <translation type="unfinished"></translation>
+        <translation>Clones</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Baseline Repositories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dépôts de base</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Shared Project Repositories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dépôts de projets partagés</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Personal Repositories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dépôts personnel</translation>
     </message>
 </context>
 <context>
@@ -13455,7 +13515,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/help/generalsettingspage.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
         <location/>
@@ -13470,7 +13530,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Style:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Style :</translation>
     </message>
     <message>
         <location/>
@@ -13480,72 +13540,72 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Startup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Démarrage</translation>
     </message>
     <message>
         <location/>
         <source>On context help:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pour l&apos;aide contextuelle :</translation>
     </message>
     <message>
         <location/>
         <source>Show side-by-side if possible</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher côte à côte si possible</translation>
     </message>
     <message>
         <location/>
         <source>Always show side-by-side</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Toujours afficher côte à côte</translation>
     </message>
     <message>
         <location/>
         <source>Always start full help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Toujours afficher l&apos;aide complète</translation>
     </message>
     <message>
         <location/>
         <source>On help start:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Au démarrage de l&apos;aide :</translation>
     </message>
     <message>
         <location/>
         <source>Show my home page</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher ma page d&apos;accueil</translation>
     </message>
     <message>
         <location/>
         <source>Show a blank page</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher une page blanche</translation>
     </message>
     <message>
         <location/>
         <source>Show my tabs from last session</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher mes onglets de la dernière session</translation>
     </message>
     <message>
         <location/>
         <source>Home Page:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Page d&apos;accueil :</translation>
     </message>
     <message>
         <location/>
         <source>Use &amp;Current Page</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser la page &amp;courante</translation>
     </message>
     <message>
         <location/>
         <source>Use &amp;Blank Page</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser une page blanche</translation>
     </message>
     <message>
         <location/>
         <source>Restore to Default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Restaurer les paramètres par défaut</translation>
     </message>
     <message>
         <location/>
         <source>Help Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Signet de l&apos;aide</translation>
     </message>
     <message>
         <location/>
@@ -13563,32 +13623,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.ui"/>
         <source>Build and Run</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Générer et Exécuter</translation>
     </message>
     <message>
         <location/>
         <source>Save all files before Build</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sauvegarder tous les fichiers avant de Générer</translation>
     </message>
     <message>
         <location/>
         <source>Always build Project before Running</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Toujours générer le projet avant d&apos;exécuter</translation>
     </message>
     <message>
         <location/>
         <source>Show Compiler Output on building</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Afficher la sortie du compilateur pendant la génération</translation>
     </message>
     <message>
         <location/>
         <source>Use jom instead of nmake</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utiliser jom à la place de nmake</translation>
     </message>
     <message>
         <location/>
         <source>&lt;i&gt;jom&lt;/i&gt; is a drop-in replacement for &lt;i&gt;nmake&lt;/i&gt; which distributes the compilation process to multiple CPU cores. For more details, see the &lt;a href=&quot;http://qt.gitorious.org/qt-labs/jom/&quot;&gt;jom Homepage&lt;/a&gt;. Disable it if you experience problems with your builds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;i&gt;jom&lt;/i&gt; est un remplaçant pour &lt;i&gt;nmake&lt;/i&gt; qui réparti le processus de compilation sur les différents cores d&apos;un CPU. Pour plus de détails, voir la &lt;a href=&quot;http://qt.gitorious.org/qt-labs/jom/&quot;&gt;page consacrée à jom &lt;/a&gt;. Désactivez si vous rencontrez des problèmes de génération.</translation>
     </message>
 </context>
 <context>
@@ -13596,7 +13656,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
         <location/>
@@ -13626,7 +13686,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>%1 (current session)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 (session courante)</translation>
     </message>
     <message>
         <location line="+45"/>
@@ -13639,7 +13699,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectwelcomeplugin.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Formulaire</translation>
     </message>
 </context>
 <context>
@@ -13647,132 +13707,132 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
         <location/>
         <source>The header file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le fichier d&apos;en-tête</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Sources</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Sources</translation>
     </message>
     <message>
         <location/>
         <source>Widget librar&amp;y:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bibliothèque de widget :</translation>
     </message>
     <message>
         <location/>
         <source>Widget project &amp;file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier de projet du widget :</translation>
     </message>
     <message>
         <location/>
         <source>Widget h&amp;eader file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier d&apos;en-tête du widget :</translation>
     </message>
     <message>
         <location/>
         <source>The header file has to be specified in source code.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le fichier d&apos;en-tête doit être spécifié dans le code source.</translation>
     </message>
     <message>
         <location/>
         <source>Widge&amp;t source file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier source du widget :</translation>
     </message>
     <message>
         <location/>
         <source>Widget &amp;base class:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Classe de &amp;base du widget :</translation>
     </message>
     <message>
         <location/>
         <source>QWidget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">QWidget</translation>
     </message>
     <message>
         <location/>
         <source>Plugin class &amp;name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Nom de la classe du plugin :</translation>
     </message>
     <message>
         <location/>
         <source>Plugin &amp;header file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier d&apos;&amp;en-tête du plugin :</translation>
     </message>
     <message>
         <location/>
         <source>Plugin sou&amp;rce file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier sou&amp;rce du plugin :</translation>
     </message>
     <message>
         <location/>
         <source>Icon file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier de l&apos;icône :</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Link library</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Lier à la bibliothèque</translation>
     </message>
     <message>
         <location/>
         <source>Create s&amp;keleton</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Créer s&amp;quelette</translation>
     </message>
     <message>
         <location/>
         <source>Include pro&amp;ject</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Inclure le pro&amp;jet</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Description</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Description</translation>
     </message>
     <message>
         <location/>
         <source>G&amp;roup:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Groupe :</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Tooltip:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Info-bulle :</translation>
     </message>
     <message>
         <location/>
         <source>W&amp;hat&apos;s this:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Qu&apos;est-ce que c&apos;est? :</translation>
     </message>
     <message>
         <location/>
         <source>The widget is a &amp;container</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le widget est un conteneur</translation>
     </message>
     <message>
         <location/>
         <source>Property defa&amp;ults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Propriété par défaut</translation>
     </message>
     <message>
         <location/>
         <source>dom&amp;XML:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">dom &amp;XML:</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp" line="+44"/>
         <source>Select Icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sélectionner une icône</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier d&apos;icône (*.png *.ico *.jpg *.xpm *.tif *.svg)</translation>
     </message>
 </context>
 <context>
@@ -13780,47 +13840,47 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui"/>
         <source>WizardPage</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">WizardPage</translation>
     </message>
     <message>
         <location/>
         <source>Plugin and Collection Class Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Information sur le plugin et la classe de collection</translation>
     </message>
     <message>
         <location/>
         <source>Specify the properties of the plugin library and the collection class.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Spécifiez les propriétés de la bibliothèque de plugin et la classe de collection.</translation>
     </message>
     <message>
         <location/>
         <source>Collection class:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Clase de collection :</translation>
     </message>
     <message>
         <location/>
         <source>Collection header file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier d&apos;en-tête de la collection :</translation>
     </message>
     <message>
         <location/>
         <source>Collection source file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier source de la collection :</translation>
     </message>
     <message>
         <location/>
         <source>Plugin name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom du plugin :</translation>
     </message>
     <message>
         <location/>
         <source>Resource file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier ressource :</translation>
     </message>
     <message>
         <location/>
         <source>icons.qrc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">icons.qrc</translation>
     </message>
 </context>
 <context>
@@ -13828,22 +13888,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui"/>
         <source>Custom Qt Widget Wizard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Assistant de Widget Qt personnalisé</translation>
     </message>
     <message>
         <location/>
         <source>Custom Widget List</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">List de widgets personnalisés</translation>
     </message>
     <message>
         <location/>
         <source>Widget &amp;Classes:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Classes des widgets :</translation>
     </message>
     <message>
         <location/>
         <source>Specify the list of custom widgets and their properties.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Spécifiez la liste des widgets personnalisé et leurs propriétés.</translation>
     </message>
 </context>
 <context>
@@ -13851,7 +13911,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
         <location/>
@@ -13911,27 +13971,28 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+81"/>
         <source>Copy Project to writable Location?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Copier le projet à un emplacement inscriptible?</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&lt;p&gt;The project you are about to open is located in the write-protected location:&lt;/p&gt;&lt;blockquote&gt;%1&lt;/blockquote&gt;&lt;p&gt;Please select a writable location below and click &quot;Copy Project and Open&quot; to open a modifiable copy of the project or click &quot;Keep Project and Open&quot; to open the project in location.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You will not be able to alter or compile your project in the current location.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p&gt;Le projet que vous vous apprêtez à ouvrir se trouve dans un emplacement accessible en lecture seule :&lt;/p&gt;&lt;blockquote&gt;%1&lt;/blockquote&gt;&lt;p&gt;Veuillez sélectionner un emplacement accessible en écriture et cliquez sur &quot;Copier projet et ouvrir&quot; pour ouvrir une copie modifiable. Cliquez sur &quot;Conserver l&apos;emplacement et ouvrir&quot; pour ouvrir le projet à l&apos;emplacement courant.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt; Vous ne pourrez pas modifier ou compiler votre projet à l&apos;emplacement courant.&lt;/p&gt;</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Location:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Emplacement :</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>&amp;Copy Project and Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Copier projet et ouvrir</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Keep Project and Open</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>see &quot;&lt;p&gt;the projet you are about...&quot; to understand the translation</translatorcomment>
+        <translation type="unfinished">&amp;Conserver l&apos;emplacement et ouvrir</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -13941,26 +14002,26 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>The specified location already exists. Please specify a valid location.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">L&apos;emplacement spécifié existe déjà. Veuillez spécifier un autre emplacement.</translation>
     </message>
     <message>
         <location line="+61"/>
         <location line="+7"/>
         <source>Cmd</source>
         <comment>Shortcut key</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cmd</translation>
     </message>
     <message>
         <location line="-5"/>
         <source>Alt</source>
         <comment>Shortcut key</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Ctrl</source>
         <comment>Shortcut key</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -13991,58 +14052,58 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>You can force code completion at any time using &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vous pouvez forcer la complétion de code en utilisant &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can start Qt Creator with a session by calling &lt;tt&gt;qtcreator &amp;lt;sessionname&amp;gt;&lt;/tt&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vous pouvez démarrer Qt Creator avec une session en le lançant avec &lt;tt&gt;qtcreator &amp;lt;nomDeSession&amp;gt;&lt;/tt&gt;.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can return to edit mode from any other mode at any time by hitting &lt;tt&gt;Escape&lt;/tt&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vous pouvez retourner en mode d&apos;édition depuis n&apos;importe quel autre mode en cliquant sur &lt;tt&gt;Echap&lt;/tt&gt;.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You can switch between the output pane by hitting &lt;tt&gt;%1+n&lt;/tt&gt; where n is the number denoted on the buttons at the window bottom:&lt;ul&gt;&lt;li&gt;1 - Build Issues&lt;/li&gt;&lt;li&gt;2 - Search Results&lt;/li&gt;&lt;li&gt;3 - Application Output&lt;/li&gt;&lt;li&gt;4 - Compile Output&lt;/li&gt;&lt;/ul&gt;</source>
         <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vous pouvez passer d&apos;un panneau de sortie à l&apos;autre avec les touches &lt;tt&gt;%1+x&lt;/tt&gt; où x est le numéro qui apparaît sur les boutons en dessous de la fenêtre : &lt;ul&gt;&lt;li&gt;1 - Problèmes de compilation&lt;/li&gt;&lt;li&gt;2 - Résultat de la recherche&lt;/li&gt;&lt;li&gt;3 - Sortie de l&apos;application&lt;/li&gt;&lt;li&gt;4 - Sortie de compilation&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vous pouvez rapidement rechercher des méthodes, classes, de l&apos;aide et plus à l&apos;aide de la &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;barre de recherche&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vous pouvez ajouter vos propre étapes de compilation dans les &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;paramètres de compilation&lt;/a&gt;.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dans une session, vous pouvez ajouter des &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dépendances&lt;/a&gt; entre des projets.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vous pouvez définir l&apos;encodage de caractères préféré pour chaque projet dans &lt;tt&gt;Projet -&gt; Paramètres de l&apos;éditeur -&gt; Encodage par défaut&lt;/tt&gt;.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can modify the binary that is being executed when you press the &lt;tt&gt;Run&lt;/tt&gt; button: Add a &lt;tt&gt;Custom Executable&lt;/tt&gt; by clicking the &lt;tt&gt;+&lt;/tt&gt; button in &lt;tt&gt;Projects -&gt; Run Settings -&gt; Run Configuration&lt;/tt&gt; and then select the new target in the combo box.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vous pouvez modifier le binaire qui sera exécuté lorsque vous appuyez sur le bouton &lt;tt&gt;Lancer&lt;/tt&gt; : Ajoutez un &lt;tt&gt;exécutable personnalisé&lt;/tt&gt; en cliquant sur le bouton &lt;tt&gt;+&lt;/tt&gt; dans &lt;tt&gt;Projets -&gt; Paramètres d&apos;exécutions -&gt; Configuration d&apos;exécution&lt;/tt&gt; et sélectionnez une nouvelle cible dans le menu déroulant.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vous pouvez utiliser Qt Creator conjointement avec de nombreux &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;système de gestion de version&lt;/a&gt; tel que Subversion, Perforce, CVS et Git.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dans l&apos;éditeur, &lt;tt&gt;F2&lt;/tt&gt; passe de la déclaration à la définition de fonction, tandis que &lt;tt&gt;F4&lt;/tt&gt; passe du fichier source au fichier d&apos;en-tête.</translation>
     </message>
 </context>
 <context>
@@ -14050,32 +14111,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
         <location/>
         <source>Installed S60 SDKs:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">SDKs S60 installés :</translation>
     </message>
     <message>
         <location/>
         <source>SDK Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Emplacement du SDK</translation>
     </message>
     <message>
         <location/>
         <source>Qt Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Emplacement de Qt</translation>
     </message>
     <message>
         <location/>
         <source>Refresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rafraîchir</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+96"/>
         <source>S60 SDKs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">SDKs S60</translation>
     </message>
 </context>
 <context>
@@ -14108,7 +14169,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>x</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">x</translation>
     </message>
 </context>
 <context>
@@ -14116,17 +14177,18 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/vcsbase/basecheckoutwizardpage.ui"/>
         <source>WizardPage</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">WizardPage</translation>
     </message>
     <message>
         <location/>
         <source>Checkout Directory:</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>checkout should stay in English? </translatorcomment>
+        <translation type="unfinished">Répertoire de checkout :</translation>
     </message>
     <message>
         <location/>
         <source>Path:</source>
-        <translation type="unfinished">Chemin :</translation>
+        <translation>Chemin :</translation>
     </message>
 </context>
 <context>
@@ -14134,7 +14196,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+47"/>
@@ -14150,7 +14212,7 @@ p, li { white-space: pre-wrap; }
         <location line="+8"/>
         <source>http://labs.trolltech.com/blogs/feed</source>
         <extracomment>Add localized feed here only if one exists</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">http://labs.trolltech.com/blogs/feed</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -14160,7 +14222,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>Qt Labs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Qt Labs</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -14170,17 +14232,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>Qt Centre</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Qt Centre</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Apps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Qt Apps</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt for Symbian at Forum Nokia</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Qt pour Symbian</translation>
     </message>
     <message>
         <source>Qt for S60 at Forum Nokia</source>
@@ -14194,7 +14256,9 @@ p, li { white-space: pre-wrap; }
         <source>#gradientWidget {
   background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
 }</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">#gradientWidget {
+  background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
+}</translation>
     </message>
     <message>
         <location/>
@@ -14203,22 +14267,25 @@ p, li { white-space: pre-wrap; }
     border-width: 0;
 }
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">#headerFrame {
+    border-image: url(:/welcome/images/center_frame_header.png) 0;
+    border-width: 0;
+}</translation>
     </message>
     <message>
         <location/>
         <source>Help us make Qt Creator even better</source>
-        <translation type="unfinished">Aidez-nous à améliorer Qt Creator</translation>
+        <translation>Aidez-nous à améliorer Qt Creator</translation>
     </message>
     <message>
         <location/>
         <source>Feedback</source>
-        <translation type="unfinished">Votre avis nous interesse</translation>
+        <translation>Votre avis nous interesse</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+116"/>
         <source>Welcome</source>
-        <translation type="unfinished">Accueil</translation>
+        <translation>Accueil</translation>
     </message>
 </context>
 <context>
@@ -14226,7 +14293,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/libs/utils/detailsbutton.cpp" line="+19"/>
         <source>Show Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher les détails</translation>
     </message>
 </context>
 <context>
@@ -14234,22 +14301,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/coreplugin/coreconstants.h" line="+94"/>
         <source>Plain Text Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditeur de texte</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Binary Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditeur de binaire</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/cppeditor/cppeditorconstants.h" line="+39"/>
         <source>C++ Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditeur C++</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerconstants.h" line="+42"/>
         <source>.pro File Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditeur de fichier .pro</translation>
     </message>
 </context>
 <context>
@@ -14257,7 +14324,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/coreplugin/dialogs/settingsdialog.cpp" line="+58"/>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Préférences</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -14270,17 +14337,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+70"/>
         <source>No Server defined in the CodePaster preferences!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun serveur définit dans les préférences de CodePaster!</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>No Server defined in the CodePaster options!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun serveur définit dans les options de CodePaster !</translation>
     </message>
     <message>
         <location line="+83"/>
         <source>No such paste</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun collage de ce type</translation>
     </message>
 </context>
 <context>
@@ -14293,17 +14360,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+10"/>
         <source>Code Pasting</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Collage de code</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Server:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Serveur :</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Note : spécifiez le nom d&apos;hôte du service CodePaster sans aucun protocol (e.g. codepaster.mycompany.com).</translation>
     </message>
 </context>
 <context>
@@ -14311,7 +14378,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cpaster/pastebindotcomprotocol.cpp" line="+106"/>
         <source>Error during paste</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur durant le collage</translation>
     </message>
 </context>
 <context>
@@ -14319,12 +14386,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cpaster/pastebindotcomsettings.cpp" line="+53"/>
         <source>Pastebin.com</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pastebin.com</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Code Pasting</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Collage de code</translation>
     </message>
     <message>
         <source>CodePaster</source>
@@ -14336,25 +14403,25 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cpaster/pasteview.cpp" line="+89"/>
         <source>Paste</source>
-        <translation type="unfinished">Coller</translation>
+        <translation>Coller</translation>
     </message>
     <message>
         <location line="+11"/>
         <location line="+46"/>
         <source>&lt;Username&gt;</source>
-        <translation type="unfinished">&lt;Utilisateur&gt;</translation>
+        <translation>&lt;Utilisateur&gt;</translation>
     </message>
     <message>
         <location line="-38"/>
         <location line="+43"/>
         <source>&lt;Description&gt;</source>
-        <translation type="unfinished">&lt;Description&gt;</translation>
+        <translation>&lt;Description&gt;</translation>
     </message>
     <message>
         <location line="-35"/>
         <location line="+40"/>
         <source>&lt;Comment&gt;</source>
-        <translation type="unfinished">&lt;Commentaire&gt;</translation>
+        <translation>&lt;Commentaire&gt;</translation>
     </message>
 </context>
 <context>
@@ -14362,7 +14429,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+238"/>
         <source>Searching...</source>
-        <translation type="unfinished"></translation>
+        <translation>Recherche...</translation>
     </message>
 </context>
 <context>
@@ -14370,12 +14437,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/checkoutwizard.cpp" line="+54"/>
         <source>Checks out a project from a CVS repository.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Obtient un projet à partir d&apos;un dépôt CVS.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>CVS Checkout</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">CVS Checkout</translation>
     </message>
 </context>
 <context>
@@ -14383,12 +14450,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/checkoutwizardpage.cpp" line="+38"/>
         <source>Specify repository and path.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Spécifier le dépôt et le chemin.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Repository:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dépôt :</translation>
     </message>
 </context>
 <context>
@@ -14396,7 +14463,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="+78"/>
         <source>Cannot find repository for &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de trouver le dépot de &apos;%1&apos;</translation>
     </message>
 </context>
 <context>
@@ -14404,12 +14471,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Parsing of the log output failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de l&apos;analyse de la sortie </translation>
     </message>
     <message>
         <location line="+169"/>
         <source>&amp;CVS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;CVS</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -14424,7 +14491,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+4"/>
         <source>Alt+C,Alt+A</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+C,Alt+A</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -14464,7 +14531,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+4"/>
         <source>Alt+C,Alt+D</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+C,Alt+D</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -14484,7 +14551,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+4"/>
         <source>Alt+C,Alt+C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Alt+C,Alt+C</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -14529,17 +14596,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>&amp;Undo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Annu&amp;ler</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Redo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Re&amp;faire</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Closing CVS Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ferme l&apos;éditeur CVS</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -14554,12 +14621,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+58"/>
         <source>The files do not differ.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Les fichiers n&apos;ont pas changé.</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>The file &apos;%1&apos; could not be deleted.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le fichier &apos;%1&apos; n&apos;a pas pu être supprimé.</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -14584,39 +14651,42 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+8"/>
         <source>Cannot create temporary file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de créer le fichier temporaire : %1</translation>
     </message>
     <message>
         <location line="+105"/>
         <source>Project status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Status du projet</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>The initial revision %1 cannot be described.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">La révision initiale %1 n&apos;a pas pu être décrite.</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Could not find commits of id &apos;%1&apos; on %2.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>%2 is a date</translatorcomment>
+        <translation type="unfinished">Impossible de trouver les commits d&apos;id &apos;%1&apos; le %2.</translation>
     </message>
     <message>
         <location line="+176"/>
         <source>Executing: %1 %2
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécute : %1 %2
+</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Executing in %1: %2 %3
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécute dans %1 : %2 %3
+</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>No cvs executable specified!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun exécutable CVS spécifié !</translation>
     </message>
     <message>
         <location line="+44"/>
@@ -14631,12 +14701,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Could not start cvs &apos;%1&apos;. Please check your settings in the preferences.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de démarrer cvs &apos;%1&apos;. Veuillez vérifier vos paramètres dans les préférences.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>CVS did not respond within timeout limit (%1 ms).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">CVS n&apos;a pas répondu dans le temps imparti (%1 ms).</translation>
     </message>
 </context>
 <context>
@@ -14644,22 +14714,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/cvssubmiteditor.cpp" line="+41"/>
         <source>Added</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ajouté</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimé</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Modified</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Modifié</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>CVS Submit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">CVS Submit</translation>
     </message>
 </context>
 <context>
@@ -14667,7 +14737,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/settingspage.cpp" line="-34"/>
         <source>CVS Command</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">CVS Command</translation>
     </message>
 </context>
 <context>
@@ -14675,12 +14745,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/cdb/cdbstackframecontext.cpp" line="+136"/>
         <source>&lt;Unknown Type&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;type inconnu&gt;</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>&lt;Unknown Value&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;valeur inconnue&gt;</translation>
     </message>
     <message>
         <location line="+219"/>
@@ -14693,7 +14763,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp" line="+52"/>
         <source>Out of scope</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hors de la portée</translation>
     </message>
 </context>
 <context>
@@ -14701,7 +14771,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/debuggeragents.cpp" line="+93"/>
         <source>Memory $</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mémoire $</translation>
     </message>
 </context>
 <context>
@@ -14709,7 +14779,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+79"/>
         <source>Debug</source>
-        <translation type="unfinished">Déboguer</translation>
+        <translation>Déboguer</translation>
     </message>
 </context>
 <context>
@@ -14717,7 +14787,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+108"/>
         <source>Debugger</source>
-        <translation type="unfinished">Débogueur</translation>
+        <translation>Débogueur</translation>
     </message>
 </context>
 <context>
@@ -14727,44 +14797,46 @@ p, li { white-space: pre-wrap; }
         <location line="+27"/>
         <location line="+42"/>
         <source>Error Loading Symbols</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Érreur de chargement des symboles</translation>
     </message>
     <message>
         <location line="-68"/>
         <source>No executable to load symbols from specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pas d&apos;exécutable spécifié pour lire les symboles.</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Loading symbols from &quot;%1&quot; failed:
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de chargement des symboles depuis &quot;%1&quot; :
+</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Attached to core temporarily.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Attaché au core temporairement.</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Unable to determine executable from core file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de déterminé l&apos;exécutable à partire du fichier core.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Attach to core &quot;%1&quot; failed:
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de liaison au core &quot;%1&quot; :
+</translation>
     </message>
     <message>
         <location line="-54"/>
         <source>Symbols found.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Symboles trouvés.</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Attached to core.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Attaché au core.</translation>
     </message>
 </context>
 <context>
@@ -14772,13 +14844,14 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+70"/>
         <source>Cannot set up communication with child process: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de mettre en place la communication avec le processus enfant : %1</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Starting executable failed:
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de lancement de l&apos;exécutable :
+</translation>
     </message>
 </context>
 <context>
@@ -14786,48 +14859,50 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+93"/>
         <source>The upload process failed to start. Shell missing?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le processus d&apos;upload n&apos;a pas pu démarrer. Shell manquant ?</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The upload process crashed some time after starting successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le processus d&apos;upload a crashé après avoir démarré.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>this string appear twice in the translation</translatorcomment>
+        <translation type="unfinished">La dernière fonction waitFor...() est arrivé à échéance. Le status de QProcess est inchangé, vous pouvez essayer d&apos;appeler waitFor...() à nouveau.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>An error occurred when attempting to write to the upload process. For example, the process may not be running, or it may have closed its input channel.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une erreur est survenue lors d&apos;une tentative d&apos;écriture sur l&apos;entrée du processus d&apos;upload. Le processus peut ne pas être lancé, ou il a fermé son entrée.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>An error occurred when attempting to read from the upload process. For example, the process may not be running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une erreur est survenue lors d&apos;une tentative de lecture depuis le processus d&apos;upload. Il est probable que le processus n&apos;est pas en cours d&apos;exécution.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>An unknown error in the upload process occurred. This is the default return value of error().</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une erreur inconue est survenue dans le processus d&apos;upload. Ceci est la valeur de retour par défaut de error().</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>Adapter too old: does not support asynchronous mode.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Adaptateur trop vieux : aucun support du mode asynchrone.</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Starting remote executable failed:
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Démarrage de l&apos;exécutable distant échoué :
+</translation>
     </message>
 </context>
 <context>
@@ -14835,13 +14910,14 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1597"/>
         <source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Processus démarré, PID : 0x%1, id du thread : 0x%2, segment de code : 0x%3, segment de données : 0x%4.</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Connecting to trk server adapter failed:
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de la connexion à l&apos;adapteur au serveur TRK :
+</translation>
     </message>
 </context>
 <context>
@@ -14849,35 +14925,35 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/name_demangler.cpp" line="+331"/>
         <source>Premature end of input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Saisie interrompue</translation>
     </message>
     <message>
         <location line="+90"/>
         <source>Invalid encoding</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Encodage invalide</translation>
     </message>
     <message>
         <location line="+54"/>
         <source>Invalid name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom invalide</translation>
     </message>
     <message>
         <location line="+40"/>
         <location line="+9"/>
         <source>Invalid nested-name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom imbriqué invalide</translation>
     </message>
     <message>
         <location line="+111"/>
         <location line="+8"/>
         <source>Invalid template args</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Argument du modèle invalide</translation>
     </message>
     <message>
         <location line="+18"/>
         <location line="+8"/>
         <source>Invalid template-param</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Paramètre du modèle invalide</translation>
     </message>
     <message>
         <location line="+19"/>
@@ -14892,21 +14968,21 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+43"/>
         <source>Invalid non-negative number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nombre positif invalide</translation>
     </message>
     <message>
         <location line="+58"/>
         <location line="+9"/>
         <location line="+2"/>
         <source>Invalid template-arg</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Argument de template invalide</translation>
     </message>
     <message>
         <location line="+64"/>
         <location line="+15"/>
         <location line="+43"/>
         <source>Invalid expression</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Expression invalide</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -14925,7 +15001,7 @@ p, li { white-space: pre-wrap; }
         <location line="+5"/>
         <location line="+68"/>
         <source>Invalid type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Type invalide</translation>
     </message>
     <message>
         <location line="+138"/>
@@ -14941,7 +15017,7 @@ p, li { white-space: pre-wrap; }
         <location line="+16"/>
         <location line="+8"/>
         <source>Invalid function type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Type de fonction invalide</translation>
     </message>
     <message>
         <location line="+80"/>
@@ -15020,12 +15096,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+12"/>
         <source>Invalid digit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Chiffre invalide</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>At position %1: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">À la position %1 : </translation>
     </message>
 </context>
 <context>
@@ -15033,7 +15109,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/designer/formwindoweditor.cpp" line="+167"/>
         <source>untitled</source>
-        <translation type="unfinished">sans titre</translation>
+        <translation>sans titre</translation>
     </message>
 </context>
 <context>
@@ -15041,12 +15117,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/clonewizard.cpp" line="+53"/>
         <source>Clones a project from a git repository.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cloné un projet à partir d&apos;un dépôt git.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Git Repository Clone</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Clone du dépôt git</translation>
     </message>
 </context>
 <context>
@@ -15054,12 +15130,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/clonewizardpage.cpp" line="+58"/>
         <source>Specify repository URL, checkout directory and path.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Spécifié l&apos;URL du dépôt, le répertoire et le chemin du checkout.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Clone URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">URL de clone :</translation>
     </message>
 </context>
 <context>
@@ -15067,17 +15143,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitorious.cpp" line="+471"/>
         <source>Error parsing reply from &apos;%1&apos;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erreur d&apos;analyse de la réponse de &apos;%1&apos; : %2</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Request failed for &apos;%1&apos;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec de la requéte pour &apos;%1&apos; : %2</translation>
     </message>
     <message>
         <location line="+80"/>
         <source>Open source projects that use Git.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Projets open source qui utilisent git.</translation>
     </message>
 </context>
 <context>
@@ -15085,12 +15161,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousclonewizard.cpp" line="+81"/>
         <source>Clones a project from a Gitorious repository.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cloné un projet à partir d&apos;un dépôt Gitorious.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Gitorious Repository Clone</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Clone d&apos;un dépôt Gitorious</translation>
     </message>
 </context>
 <context>
@@ -15098,7 +15174,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitorioushostwizardpage.cpp" line="+76"/>
         <source>Select a host.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner un hôte.</translation>
     </message>
 </context>
 <context>
@@ -15106,7 +15182,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp" line="+57"/>
         <source>Choose a project from &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Choisir un projet à partir de &apos;%1&apos;</translation>
     </message>
 </context>
 <context>
@@ -15119,28 +15195,30 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+10"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Aide</translation>
     </message>
     <message>
         <location line="+122"/>
         <source>Open Image</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Image ouverte ?</translatorcomment>
+        <translation type="unfinished">Ouvrir une image</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+22"/>
         <source>Files (*.xbel)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichiers (*.xbel)</translation>
     </message>
     <message>
         <location line="-8"/>
         <source>There was an error while importing bookmarks!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Il ya eu une erreur lors de l&apos;importation des signets!</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Save File</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Enregistrer ? (tout court)</translatorcomment>
+        <translation type="unfinished">Enregistrer le fichier</translation>
     </message>
 </context>
 <context>
@@ -15148,12 +15226,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/help/xbelsupport.cpp" line="+119"/>
         <source>The file is not an XBEL version 1.0 file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Il ne s&apos;agit pas d&apos;un fichier XBEL version 1.0.</translation>
     </message>
     <message>
         <location line="+73"/>
         <source>Unknown title</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Titre inconnue</translation>
     </message>
 </context>
 <context>
@@ -15161,17 +15239,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+126"/>
         <source>Failed to start program. Path or permissions wrong?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec lors de l&apos;exécution du programme. Mauvais chemin ou permissions ?</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The program has unexpectedly finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le programme s&apos;est terminé inopinément.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Some error has occurred while running the program.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une erreur s&apos;est produite lors de l&apos;exécution du programme.</translation>
     </message>
 </context>
 <context>
@@ -15179,7 +15257,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/projectexplorer/applicationrunconfiguration.cpp" line="+89"/>
         <source>Run</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécuter</translation>
     </message>
 </context>
 <context>
@@ -15187,12 +15265,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+48"/>
         <source>Starting %1...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Démarrage de %1...</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>%1 exited with code %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 s&apos;est terminé avec le code %2</translation>
     </message>
 </context>
 <context>
@@ -15200,17 +15278,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+131"/>
         <source>The target directory %1 could not be created.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le dossier cible %1 n&apos;a pas pu être créé.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>The existing file %1 could not be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le fichier existant %1 n&apos;a pas pu être supprimé.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The file %1 could not be copied to %2.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Le fichier %1 n&apos;a pas pu être copié en %2.</translation>
     </message>
     <message>
         <location line="+25"/>
@@ -15218,33 +15296,41 @@ p, li { white-space: pre-wrap; }
 - %1
 
 Reason: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Les aides au déboguage n&apos;ont pas pu être compilées dans aucun des dossiers suivant :
+- %1
+
+Raison : %2</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Building debugging helper library in %1
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Compilation de la bibliothèque d&apos;aide au déboguage dans %1
+</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Running %1 %2...
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécution %1 %2...
+</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+21"/>
         <source>%1 not found in PATH
 </source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>traduire PATH ici ?</translatorcomment>
+        <translation type="unfinished">%1 non trouvé dans le PATH
+</translation>
     </message>
     <message>
         <location line="-16"/>
         <location line="+11"/>
         <source>Running %1 ...
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécution %1...
+</translation>
     </message>
 </context>
 <context>
@@ -15260,7 +15346,7 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+181"/>
         <source>Active run configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Configuration d&apos;exécution active</translation>
     </message>
 </context>
 <context>
@@ -15268,12 +15354,12 @@ Reason: %2</source>
     <message>
         <location line="+375"/>
         <source>Edit Project Settings for Project &lt;b&gt;%1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Éditer les paramètres du projet &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>No Project loaded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun projet chargé</translation>
     </message>
 </context>
 <context>
@@ -15281,7 +15367,7 @@ Reason: %2</source>
     <message>
         <location line="+11"/>
         <source>Select Project</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sectionner projet</translation>
     </message>
 </context>
 <context>
@@ -15290,12 +15376,12 @@ Reason: %2</source>
         <location line="+104"/>
         <location line="+105"/>
         <source>Active Build and Run Configurations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Compilation active et configuration d&apos;exécution</translation>
     </message>
     <message>
         <location line="-67"/>
         <source>No project loaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun projet chargé.</translation>
     </message>
 </context>
 <context>
@@ -15308,17 +15394,17 @@ Reason: %2</source>
     <message>
         <location line="+101"/>
         <source>Rename...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Renommer...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New id:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nouvel identifiant :</translation>
     </message>
     <message>
         <location line="+191"/>
         <source>Rename id &apos;%1&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Renommer l&apos;identifiant &apos;%1&apos;...</translation>
     </message>
 </context>
 <context>
@@ -15331,12 +15417,12 @@ Reason: %2</source>
     <message>
         <location line="+1"/>
         <source>Creates a Qt QML file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Créer un fichier QML.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt QML File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier QML</translation>
     </message>
 </context>
 <context>
@@ -15352,7 +15438,7 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qmlprojectmanager/qmlmakestep.cpp" line="+134"/>
         <source>&lt;b&gt;QML Make&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Make de QML&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
@@ -15361,17 +15447,17 @@ Reason: %2</source>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp" line="+48"/>
         <location line="+11"/>
         <source>&lt;New class&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;Nouvelle classe&gt;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Confirm Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Confirmez la suppression</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Delete class %1 from list?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Supprimer la classe %1 de la liste?</translation>
     </message>
 </context>
 <context>
@@ -15379,12 +15465,12 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp" line="+43"/>
         <source>Qt4 Designer Custom Widget</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Widget personnalié pour Qt4 Designer</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates a Qt4 Designer Custom Widget or a Custom Widget Collection.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Crée un widget personnalisé ou une collection de widgets personnalisés pour Qt4 Designer.</translation>
     </message>
 </context>
 <context>
@@ -15392,7 +15478,7 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp" line="+56"/>
         <source>This wizard generates a Qt4 Designer Custom Widget or a Qt4 Designer Custom Widget Collection project.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cet assistant génère un projet pour créer un widget personnalisé ou une collection de widgets personnalisés pour Qt4 Designer.</translation>
     </message>
 </context>
 <context>
@@ -15400,17 +15486,17 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp" line="+60"/>
         <source>Cannot open icon file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;ouvrir le fichier d&apos;icône %1.</translation>
     </message>
     <message>
         <location line="+102"/>
         <source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Créer plusieurs bibliothèques de widget (%1, %2) dans un même projet (%3) n&apos;est pas supporté.</translation>
     </message>
     <message>
         <location line="+133"/>
         <source>Cannot open %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Imposible d&apos;ouvrir %1 : %2</translation>
     </message>
 </context>
 <context>
@@ -15426,17 +15512,17 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+83"/>
         <source>QtS60DeviceRunConfiguration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">QtS60DeviceRunConfiguration</translation>
     </message>
     <message>
         <location line="+197"/>
         <source>Could not parse %1. The QtS60 Device run configuration %2 can not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;analyser %1. La configuration d&apos;appareil QtS60 %2 ne peut pas être démarrer.</translation>
     </message>
     <message>
         <location line="-199"/>
         <source>%1 on Symbian Device</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 sur appareil Symbian</translation>
     </message>
 </context>
 <context>
@@ -15444,83 +15530,84 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp" line="+73"/>
         <source>Device:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Appareil mobile :</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom :</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Install File:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier d&apos;installation :</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Device on Serial Port:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Appareil mobile sur port série :</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Queries the device for information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Inspecter l&apos;appareil mobile pour mettre à jour les informations</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Self-signed certificate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Certificat autosigné</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Choose certificate file (.cer)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Choisir un fichier de certificat (.cer)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Custom certificate:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Certificat personnalisé :</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Choose key file (.key / .pem)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Choisir le fichier contenant la clé (.key / .pem)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Key file:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier contenant la clé :</translation>
     </message>
     <message>
         <location line="+125"/>
         <source>&lt;No Device&gt;</source>
         <extracomment>Summary text of S60 device run configuration</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;Aucun appareil mobile&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>(custom certificate)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">(certificat personnalisé)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>(self-signed certificate)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">(certificat autosigné)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Summary: Run on &apos;%1&apos; %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Résumé : fonctionne avec &apos;%1&apos; %2</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Connecting...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Connexion...</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>A timeout occurred while querying the device. Check whether Trk is running</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>right translation of timeout in this context?</translatorcomment>
+        <translation type="unfinished">L&apos;appareil mobile ne répond pas. Veuillez vérifier sir TRK est lancé</translation>
     </message>
 </context>
 <context>
@@ -15528,7 +15615,7 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+286"/>
         <source>%1 on Symbian Device</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 sur appareil Symbian</translation>
     </message>
 </context>
 <context>
@@ -15536,106 +15623,109 @@ Reason: %2</source>
     <message>
         <location line="+83"/>
         <source>Creating %1.sisx ...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Création de %1.sisx...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Executable file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fichier exécutable : %1</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Debugger for Symbian Platform</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Débogueur pour plateforme Symbian</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+76"/>
         <source>%1 %2</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>TODO: remove the tr()</translatorcomment>
+        <translation type="unfinished">%1 %2</translation>
     </message>
     <message>
         <location line="-41"/>
         <source>Could not read template package file &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de lire le fichier de package de modèles &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Could not write package file &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;écrire le fichier package &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+16"/>
         <location line="+28"/>
         <source>An error occurred while creating the package.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une erreur est survenue lors de la création du package.</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Package: %1
 Deploying application to &apos;%2&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Package : %1
+Déployement de l&apos;application sur &apos;%2&apos;...</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Could not connect to phone on port &apos;%1&apos;: %2
 Check if the phone is connected and the TRK application is running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de se connecter au téléphone sur le port &apos;%1&apos; : %2
+Veuillez vérifier si le téléphone est connecté et que l&apos;application TRK est lancée.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Could not create file %1 on device: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de créer le fichier %1 sur l&apos;appareil mobile %2</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Could not write to file %1 on device: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;écrire le fichier %1 sur l&apos;appareil mobile : %2</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Could not close file %1 on device: %2. It will be closed when App TRK is closed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de fermer le fichier %1 sur l&apos;appareil mobile %2. Il sera fermé lorsque l&apos;application TRK sera fermée.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Could not connect to App TRK on device: %1. Restarting App TRK might help.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de se connecter à l&apos;application TRK sur l&apos;appareil mobile : %1. Redémarrer l&apos;application TRK pourrait résoudre le problème.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Copying install file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Copie le fichier d&apos;installation...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1% copied.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1% copié.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Installing application...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Installation de l&apos;application...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Could not install from package %1 on device: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;installer à partir sur package %1 sur l&apos;appareil mobile : %2</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Failed to start %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Échec du lancement de %1.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1 has unexpectedly finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 s&apos;est terminé de façon inattendu.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>An error has occurred while running %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Une erreur s&apos;est produite lors de l&apos;exécution de %1.</translation>
     </message>
 </context>
 <context>
@@ -15643,22 +15733,22 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location line="+37"/>
         <source>Finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Terminé.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Starting application...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Démarrage de l&apos;application...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Application running with pid %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Application en cours d&apos;éxecution avec le pid %1.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Could not start application: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible de démarrer l&apos;application : %1</translation>
     </message>
 </context>
 <context>
@@ -15666,17 +15756,17 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location line="+51"/>
         <source>Warning: Cannot locate the symbol file belonging to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Attention : Impossible de trouver le fichier de symboles appartenant à %1.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Launching debugger...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lancement du débogueur...</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Debugging finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Débogue terminé.</translation>
     </message>
 </context>
 <context>
@@ -15684,7 +15774,7 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="-28"/>
         <source>No Qt installed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pas de Qt installé</translation>
     </message>
 </context>
 <context>
@@ -15692,17 +15782,17 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+198"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nom :</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Executable:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Exécutable :</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Summary: Run %1 in emulator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sommaire: démarrer %1 sur l&apos;émulateur</translation>
     </message>
 </context>
 <context>
@@ -15710,17 +15800,17 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location line="-165"/>
         <source>%1 in Symbian Emulator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 sur l&apos;émulateur Symbian</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>QtSymbianEmulatorRunConfiguration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">QtSymbianEmulatorRunConfiguration</translation>
     </message>
     <message>
         <location line="+87"/>
         <source>Could not parse %1. The Qt for Symbian emulator run configuration %2 can not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Impossible d&apos;analyser %1. Qt pour la configuration d&apos;éxecution de l&apos;émulateur Symbian %2 ne peut pas être démarré.</translation>
     </message>
 </context>
 <context>
@@ -15728,7 +15818,7 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location line="+113"/>
         <source>%1 in Symbian Emulator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 sur l&apos;émulateur Symbian</translation>
     </message>
 </context>
 <context>
@@ -15736,17 +15826,17 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location line="+48"/>
         <source>Starting %1...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Démarrage %1...</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>[Qt Message]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">[Message Qt]</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>%1 exited with code %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 retourne le code %2</translation>
     </message>
 </context>
 <context>
@@ -15754,17 +15844,17 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+111"/>
         <source>Run in Emulator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Démarrer sur l&apos;émulateur</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Run on Device</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Démarrer sur le dispositif</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Debug on Device</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Déboguer sur le dispositif</translation>
     </message>
 </context>
 <context>
@@ -15772,12 +15862,12 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4project.cpp" line="+252"/>
         <source>Using Default Qt Version</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utilisé la version Qt par défaut</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Using Qt Version &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Utilisé la version Qt &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -15792,12 +15882,14 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location line="+9"/>
         <source>%1 Debug</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>On traduit ?</translatorcomment>
+        <translation type="unfinished">%1 Debug</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1 Release</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>On traduit ?</translatorcomment>
+        <translation type="unfinished">%1 Release</translation>
     </message>
 </context>
 <context>
@@ -15805,12 +15897,13 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/subversion/checkoutwizard.cpp" line="+54"/>
         <source>Checks out a project from a Subversion repository.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vérifié un projet à partir d&apos;un dépôt Subversion.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Subversion Checkout</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>checkout, on traduit ?</translatorcomment>
+        <translation type="unfinished">Checkout Subversion</translation>
     </message>
 </context>
 <context>
@@ -15818,12 +15911,13 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/subversion/checkoutwizardpage.cpp" line="+38"/>
         <source>Specify repository, checkout directory and path.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Traduction de checkout ? vérification ? contrôle ?</translatorcomment>
+        <translation type="unfinished">Spécifié le dépôt, le répertoire et le chemin de checkout.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Repository:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dépôt :</translation>
     </message>
 </context>
 <context>
@@ -15831,7 +15925,8 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/texteditor/colorscheme.cpp" line="+210"/>
         <source>Not a color scheme file.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Pas sur ?</translatorcomment>
+        <translation type="unfinished">Pas un fichier de jeu de couleur.</translation>
     </message>
 </context>
 <context>
@@ -15839,7 +15934,7 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/texteditor/fontsettings.cpp" line="+136"/>
         <source>Customized</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Customisé</translation>
     </message>
 </context>
 <context>
@@ -15847,32 +15942,32 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/vcsbase/basecheckoutwizard.cpp" line="+103"/>
         <source>Cannot Open Project</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;ouvrir le projet</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Failed to open project in &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Échec de l&apos;ouverture du projet dans &apos;%1&apos;.</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Could not find any project files matching (%1) in the directory &apos;%2&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de trouvé un fichier de projet correspondant (%1) dans le répertoire &apos;%2&apos;.</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>The Project Explorer is not available.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;explorateur de projets n&apos;est pas disponible.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&apos;%1&apos; does not exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; n&apos;existe pas.</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Unable to open the project &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;ouvrir le projet &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
@@ -15880,22 +15975,22 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/vcsbase/checkoutjobs.cpp" line="+109"/>
         <source>The process terminated with exit code %1.</source>
-        <translation type="unfinished">Le processus s&apos;est terminé avec le code %1.</translation>
+        <translation>Le processus s&apos;est terminé avec le code %1.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The process returned exit code %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le processus a retourné le code %1.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The process terminated in an abnormal way.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le processus s&apos;est terminé d&apos;une façon anormale.</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Stopping...</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrêt...</translation>
     </message>
 </context>
 <context>
@@ -15903,17 +15998,18 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/vcsbase/checkoutprogresswizardpage.cpp" line="+66"/>
         <source>Checkout started...</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>checkout encore ?</translatorcomment>
+        <translation type="unfinished">Checkout commencé...</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Échec.</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Succeeded.</source>
-        <translation type="unfinished"></translation>
+        <translation>Réussi.</translation>
     </message>
 </context>
 <context>
@@ -15921,12 +16017,12 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/vcsbase/vcsbaseoutputwindow.cpp" line="+90"/>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Effacer</translation>
     </message>
     <message>
         <location line="+78"/>
         <source>Version Control</source>
-        <translation type="unfinished">Gestion de versions</translation>
+        <translation>Gestion de versions</translation>
     </message>
 </context>
 <context>
@@ -15934,7 +16030,7 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/welcome/communitywelcomepage.h" line="+49"/>
         <source>Community</source>
-        <translation type="unfinished">Communauté</translation>
+        <translation>Communauté</translation>
     </message>
 </context>
 <context>
@@ -15942,97 +16038,97 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="mime_tr.h" line="+1"/>
         <source>unknown</source>
-        <translation type="unfinished">inconnue</translation>
+        <translation>inconnue</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>CMake Project file</source>
-        <translation type="unfinished">Fichier de projet CMake</translation>
+        <translation>Fichier de projet CMake</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C Source file</source>
-        <translation type="unfinished">Fichier source C</translation>
+        <translation>Fichier source C</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C Header file</source>
-        <translation type="unfinished">Fichier d&apos;en-tête C</translation>
+        <translation>Fichier d&apos;en-tête C</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C++ Header file</source>
-        <translation type="unfinished">Fichier d&apos;en-tête C++</translation>
+        <translation>Fichier d&apos;en-tête C++</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C++ header</source>
-        <translation type="unfinished">En-tête C++</translation>
+        <translation>En-tête C++</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C++ Source file</source>
-        <translation type="unfinished">Fichier source C++</translation>
+        <translation>Fichier source C++</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C++ source code</source>
-        <translation type="unfinished">Code source C++</translation>
+        <translation>Code source C++</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Objective-C source code</source>
-        <translation type="unfinished">Code source en objective-C</translation>
+        <translation>Code source en objective-C</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>CVS submit template</source>
-        <translation type="unfinished">Modéle d&apos;envoi de CVS</translation>
+        <translation type="unfinished">Modèle d&apos;envoi de CVS</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Designer file</source>
-        <translation type="unfinished">Fichier du designer Qt</translation>
+        <translation type="unfinished">Fichier Qt designer</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic Qt Creator Project file</source>
-        <translation type="unfinished">Fichier générique de projet Qt Creator</translation>
+        <translation type="unfinished">Fichier de projet générique Qt Creator</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic Project Files</source>
-        <translation type="unfinished">Fichiers génériques de projet</translation>
+        <translation type="unfinished">Fichiers de projet générique</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic Project Include Paths</source>
-        <translation type="unfinished">Chemins générique d&apos;inclusion de projet</translation>
+        <translation type="unfinished">Chemins d&apos;inclusion de projet générique</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic Project Configuration File</source>
-        <translation type="unfinished">Fichier générique de configuration de projet</translation>
+        <translation type="unfinished">Fichier de configuration de projet générique</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Perforce submit template</source>
-        <translation type="unfinished">Modéle d&apos;envoi de Perforce</translation>
+        <translation type="unfinished">Modèle d&apos;envoi de Perforce</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>QML file</source>
-        <translation type="unfinished">Fichier QML</translation>
+        <translation>Fichier QML</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qml Project file</source>
-        <translation type="unfinished">Fichier de projet Qml</translation>
+        <translation type="unfinished">Fichier de projet QML</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Project file</source>
-        <translation type="unfinished">Fichier de projet Qt</translation>
+        <translation>Fichier de projet Qt</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -16084,34 +16180,37 @@ Check if the phone is connected and the TRK application is running.</source>
         <location filename="../../../src/plugins/debugger/gdb/abstractgdbadapter.cpp" line="+74"/>
         <source>The Gdb process could not be stopped:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Le processus Gdb ne peut pas être arrêté :
+%1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Inferior process could not be stopped:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Le processus inférieur ne peut pas être arrêté :
+%1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Inferior started.</source>
-        <translation type="unfinished"></translation>
+        <translation>Processus inférieur démarré.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Inferior running.</source>
-        <translation type="unfinished"></translation>
+        <translation>Processus inférieur en fonctionnement.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Attached to stopped inferior.</source>
-        <translation type="unfinished"></translation>
+        <translation>Attaché au processus inférieur.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Connecting to remote server failed:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>La connexion au serveur distant a échoué :
+%1</translation>
     </message>
 </context>
 <context>
@@ -16119,7 +16218,7 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+142"/>
         <source>Debugger Error</source>
-        <translation type="unfinished">Erreur du débogueur</translation>
+        <translation>Erreur du débogueur</translation>
     </message>
 </context>
 <context>
@@ -16127,12 +16226,12 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/debugger/gdb/trkoptions.cpp" line="+91"/>
         <source>No Symbian gdb executable specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;exécutable Symbian gdb n&apos;est pas spécifié.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The Symbian gdb executable &apos;%1&apos; could not be found in the search path.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;exécutable Symbian gdb &apos;%1&apos; ne peut pas être trouvé dans le chemin de recherche.</translation>
     </message>
 </context>
 <context>
@@ -16140,7 +16239,7 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+43"/>
         <source>Symbian Trk</source>
-        <translation type="unfinished">TRK Symbian</translation>
+        <translation>TRK Symbian</translation>
     </message>
 </context>
 <context>
@@ -16148,66 +16247,66 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/qmleditor/parser/qmljslexer.cpp" line="+553"/>
         <source>Illegal character</source>
-        <translation type="unfinished">Caractère invalide</translation>
+        <translation>Caractère invalide</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Unclosed string at end of line</source>
-        <translation type="unfinished">Chaîne de caractère non terminée en fin de ligne</translation>
+        <translation>Chaîne de caractère non terminée en fin de ligne</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Illegal escape squence</source>
-        <translation type="unfinished">Séquence d&apos;échappement invalide</translation>
+        <translation>Séquence d&apos;échappement invalide</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Illegal unicode escape sequence</source>
         <translatorcomment>trad illegal ?</translatorcomment>
-        <translation type="unfinished">Séquence d&apos;échappement unicode invalide</translation>
+        <translation>Séquence d&apos;échappement unicode invalide</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Unclosed comment at end of file</source>
-        <translation type="unfinished">Commentaire non terminée en fin de ligne</translation>
+        <translation>Commentaire non terminée en fin de ligne</translation>
     </message>
     <message>
         <location line="+87"/>
         <source>Illegal syntax for exponential number</source>
-        <translation type="unfinished">Syntaxe pour le nombre exponentiel invalide</translation>
+        <translation>Syntaxe pour le nombre exponentiel invalide</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Identifier cannot start with numeric literal</source>
         <translatorcomment>Trad numeric literal ?</translatorcomment>
-        <translation type="unfinished">Un identificateur ne peut pas commencer par un nombre</translation>
+        <translation>Un identificateur ne peut pas commencer par un nombre</translation>
     </message>
     <message>
         <location line="+331"/>
         <source>Unterminated regular expression literal</source>
-        <translation type="unfinished">Expression régulière littérale non terminée</translation>
+        <translation>Expression régulière non terminée</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Invalid regular expression flag &apos;%0&apos;</source>
-        <translatorcomment>On traduit flag ? Comment ?</translatorcomment>
-        <translation type="unfinished">Expression régulière invalide &apos;%0&apos;</translation>
+        <translatorcomment>On traduit flag ? Comment ? [pierre: moi je traduirais pas...]</translatorcomment>
+        <translation type="unfinished">Expression régulière invalide flag &apos;%0&apos;</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/qmleditor/parser/qmljsparser.cpp" line="+1752"/>
         <source>Unexpected token `%1&apos;</source>
-        <translation type="unfinished">Symbole inattendu &apos;%1&apos;</translation>
+        <translation>Symbole inattendu &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+28"/>
         <location line="+23"/>
         <source>Expected token `%1&apos;</source>
-        <translation type="unfinished">Symbole attendu &apos;%1&apos;</translation>
+        <translation>Symbole attendu &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Syntax error</source>
-        <translation type="unfinished">Erreur de syntaxe</translation>
+        <translation>Erreur de syntaxe</translation>
     </message>
 </context>
 <context>
@@ -16215,27 +16314,27 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devices.cpp" line="+66"/>
         <source>Id:</source>
-        <translation type="unfinished">Id :</translation>
+        <translation>Id :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Name:</source>
-        <translation type="unfinished">Nom :</translation>
+        <translation>Nom :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>EPOC:</source>
-        <translation type="unfinished">EPOC :</translation>
+        <translation>EPOC :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Tools:</source>
-        <translation type="unfinished">Outils :</translation>
+        <translation>Outils :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Qt:</source>
-        <translation type="unfinished">Qt :</translation>
+        <translation>Qt :</translation>
     </message>
 </context>
 <context>
@@ -16243,37 +16342,37 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/shared/trk/bluetoothlistener.cpp" line="+133"/>
         <source>%1: Stopping listener %2...</source>
-        <translation type="unfinished">%1 : arrêt de l&apos;observateur %2...</translation>
+        <translation>%1 : arrêt de l&apos;observateur %2...</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>%1: Starting Bluetooth listener %2...</source>
-        <translation type="unfinished">%1 : démarrage de l&apos;observateur Bluetooth %2...</translation>
+        <translation>%1 : démarrage de l&apos;observateur Bluetooth %2...</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Unable to run &apos;%1&apos;: %2</source>
-        <translation type="unfinished">Impossible de démarrer &apos;%1&apos; : %2</translation>
+        <translation>Impossible de démarrer &apos;%1&apos; : %2</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>%1: Bluetooth listener running (%2).</source>
-        <translation type="unfinished">%1 : observateur Bluetooth en cours d&apos;éxecution (%2).</translation>
+        <translation>%1 : observateur Bluetooth en cours d&apos;éxecution (%2).</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>%1: Process %2 terminated with exit code %3.</source>
-        <translation type="unfinished">%1 : processus %2 terminé avec le code %3.</translation>
+        <translation>%1 : processus %2 terminé avec le code %3.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>%1: Process %2 crashed.</source>
-        <translation type="unfinished">%1 : processus %2 planté.</translation>
+        <translation>%1 : processus %2 planté.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>%1: Process error %2: %3</source>
-        <translation type="unfinished">%1 : erreur de processus %2 : %3</translation>
+        <translation>%1 : erreur de processus %2 : %3</translation>
     </message>
 </context>
 <context>
@@ -16281,27 +16380,28 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/shared/trk/bluetoothlistener_gui.cpp" line="+68"/>
         <source>Connection on %1 canceled.</source>
-        <translation type="unfinished">Connexion sur %1 annulée.</translation>
+        <translation>Connexion sur %1 annulée.</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Waiting for TRK</source>
-        <translation type="unfinished">Attente de TRK</translation>
+        <translation>Attente de TRK</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Waiting for TRK to start on %1...</source>
-        <translation type="unfinished">Attente de TRK pour démarrer sur %1...</translation>
+        <translatorcomment>Attente que TRK ai démarré sur %1... ??? [pierre: je plussoie]</translatorcomment>
+        <translation type="unfinished">Démarrage de TRK sur %1 en attente...</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Waiting for Bluetooth Connection</source>
-        <translation type="unfinished">Attente d&apos;une connexion Bluetooth</translation>
+        <translation>Attente d&apos;une connexion Bluetooth</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Connecting to %1...</source>
-        <translation type="unfinished">Connexion à %1...</translation>
+        <translation>Connexion à %1...</translation>
     </message>
 </context>
 <context>
@@ -16309,8 +16409,7 @@ Check if the phone is connected and the TRK application is running.</source>
     <message numerus="yes">
         <location filename="../../../src/shared/trk/communicationstarter.cpp" line="+165"/>
         <source>%1: timed out after %n attempts using an interval of %2ms.</source>
-        <translatorcomment>timed out ? </translatorcomment>
-        <translation type="unfinished">
+        <translation>
             <numerusform>%1 : interruption après %n tentative en utilisant un intervalle de %2ms.</numerusform>
             <numerusform>%1 : interruption après %n tentatives en utilisant un intervalle de %2ms.</numerusform>
         </translation>
@@ -16318,13 +16417,12 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location line="+8"/>
         <source>%1: Connection attempt %2 succeeded.</source>
-        <translation type="unfinished">%1 : tenative de connexion %2 réussi.</translation>
+        <translation>%1 : tentative de connexion %2 réussie.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1: Connection attempt %2 failed: %3 (retrying)...</source>
-        <translatorcomment>retrying ?</translatorcomment>
-        <translation type="unfinished">%1 : tenative de connexion %2 echoué : %3 (nouvel essai)...</translation>
+        <translation>%1 : tenative de connexion %2 echoué : %3 (nouvel essai)...</translation>
     </message>
 </context>
 </TS>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index 6e9d07812127f2d008a648dbdad600b7e3b76371..bf0eb0b77e4efe266b8fe79fd55425f7a8bfe7a6 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -13272,7 +13272,7 @@ Queste codifiche dovrebbero andare bene:</translation>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;numero di riga&gt;</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 8500b11a9ddcdb4398e4c5dd1b2977fa9bcdd80c..f59c75b1ed0e4cdb4ba93ac3059c86d31f0de3f6 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -4,7 +4,7 @@
 <context>
     <name>Application</name>
     <message>
-        <location filename="../../../src/app/main.cpp" line="+147"/>
+        <location filename="../../../src/app/main.cpp" line="+129"/>
         <source>Failed to load core: %1</source>
         <translation>coreプラグインの読込に失敗しました: %1</translation>
     </message>
@@ -16,16 +16,12 @@
     <message>
         <location line="+135"/>
         <source>Could not find &apos;Core.pluginspec&apos; in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 に &apos;Core.pluginspec&apos; が見つかりませんでした</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Qt Creator - Plugin loader messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t find &apos;Core.pluginspec&apos; in %1</source>
-        <translation type="obsolete">%1 に &apos;Core.pluginspec&apos; が見つかりませんでした</translation>
+        <translation>Qt Creator - プラグイン ローダからのメッセージ</translation>
     </message>
 </context>
 <context>
@@ -38,7 +34,7 @@
     <message>
         <location/>
         <source>Executable:</source>
-        <translation>実行可能ファイル:</translation>
+        <translation>実行ファイル:</translation>
     </message>
     <message>
         <location/>
@@ -69,29 +65,6 @@
         <translation>クリア</translation>
     </message>
 </context>
-<context>
-    <name>AttachTcfDialog</name>
-    <message>
-        <source>Start Debugger</source>
-        <translation type="obsolete">デバッガの起動時の設定</translation>
-    </message>
-    <message>
-        <source>Host and port:</source>
-        <translation type="obsolete">ホストおよびポート番号:</translation>
-    </message>
-    <message>
-        <source>Architecture:</source>
-        <translation type="obsolete">アーキテクチャ:</translation>
-    </message>
-    <message>
-        <source>Use server start script:</source>
-        <translation type="obsolete">サーバのスタートアップスクリプトを使用:</translation>
-    </message>
-    <message>
-        <source>Server start script:</source>
-        <translation type="obsolete">サーバのスタートアップスクリプト:</translation>
-    </message>
-</context>
 <context>
     <name>BINEditor::Internal::BinEditorPlugin</name>
     <message>
@@ -154,10 +127,6 @@
 </context>
 <context>
     <name>BookmarkManager</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">ブックマーク</translation>
-    </message>
     <message>
         <location line="+429"/>
         <source>Bookmarks</source>
@@ -352,7 +321,7 @@
     <message>
         <location filename="../../../src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp" line="+49"/>
         <source>Clear system environment</source>
-        <translation type="unfinished"></translation>
+        <translation>システム環境変数を非表示にする</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -365,23 +334,23 @@
     <message>
         <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+89"/>
         <source>Create</source>
-        <translation type="unfinished"></translation>
+        <translation>作成</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>New configuration</source>
-        <translation type="unfinished">新しい構成</translation>
+        <translation>新しい構成</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New Configuration Name:</source>
-        <translation type="unfinished">新しい構成名:</translation>
+        <translation>新しい構成名:</translation>
     </message>
 </context>
 <context>
     <name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
     <message>
-        <location line="+699"/>
+        <location line="+704"/>
         <source>&amp;Change</source>
         <translation>変更(&amp;C)</translation>
     </message>
@@ -389,7 +358,7 @@
 <context>
     <name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+125"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+123"/>
         <source>CMake Wizard</source>
         <translation>CMake ウィザード</translation>
     </message>
@@ -404,47 +373,47 @@
     <message>
         <location line="+5"/>
         <source>Select the working directory</source>
-        <translation type="unfinished">作業ディレクトリの選択</translation>
+        <translation>作業ディレクトリの選択</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Reset to default</source>
-        <translation type="unfinished">デフォルトに戻す</translation>
+        <translation>デフォルトに戻す</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Working Directory:</source>
-        <translation type="unfinished">作業ディレクトリ:</translation>
+        <translation>作業ディレクトリ:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Run Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>実行時の環境変数</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Base environment for this runconfiguration:</source>
-        <translation type="unfinished"></translation>
+        <translation>実行構成の元となる環境:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Clean Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>環境変数なし</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>System Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>システム環境変数</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Build Environment</source>
-        <translation type="unfinished">ビルド時の環境変数</translation>
+        <translation>ビルド時の環境変数</translation>
     </message>
     <message>
         <location line="+91"/>
         <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>実行ファイル: &lt;b&gt;%1&lt;/b&gt; %2</translation>
     </message>
 </context>
 <context>
@@ -452,11 +421,7 @@
     <message>
         <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+91"/>
         <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Qt Creator has detected an in-source-build which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
-        <translation type="obsolete">ソースツリー内でビルドを実行しようとしています。ソースツリー内でビルドを行なうとシャドウビルドが不可能になり、ビルドディレクトリの変更が行なえません。シャドウビルドを行なう場合にはソースディレクトリのクリーンを行い、プロジェクトを再度開いてください。</translation>
+        <translation>&lt;b&gt;ソースツリー: %1&lt;/b&gt;内でビルドを実行しようとしています。ソースツリー内でビルドを行なうとシャドウビルドが不可能になり、ビルドディレクトリの変更が行なえません。シャドウビルドを行なう場合にはソースディレクトリをきれいにしてから、プロジェクトを再度開いてください。</translation>
     </message>
 </context>
 <context>
@@ -464,22 +429,22 @@
     <message>
         <location line="+57"/>
         <source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
-        <translation type="unfinished"></translation>
+        <translation>cmake の実行ファイルにパスが通っていない為、cmake 実行ファイルのパスを指定してください。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source> The cmake executable (%1) does not exist.</source>
-        <translation type="unfinished"></translation>
+        <translation> cmake 実行ファイル (%1) が存在しません。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source> The path %1 is not a executable.</source>
-        <translation type="unfinished"></translation>
+        <translation> パス (%1) は実行ファイルではありません。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source> The path %1 is not a valid cmake.</source>
-        <translation type="unfinished"></translation>
+        <translation> パス (%1) は、有効な cmake 実行ファイルのパスではありません。</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -494,7 +459,7 @@
     <message>
         <location line="+19"/>
         <source>The directory %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used toolchain here and rerun cmake. Or simply finish the wizard directly</source>
-        <translation type="unfinished"></translation>
+        <translation>ディレクトリ %1 には以前のものと思われる cbp ファイルが既に含まれています。特殊な引数を渡すか使用する ツール チェインを変更し、cmake を再実行してください。もしくは直接ウィザードを終了させてください</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -519,28 +484,28 @@
     <message>
         <location line="+31"/>
         <source>NMake Generator</source>
-        <translation type="unfinished"></translation>
+        <translation>NMake ジェネレータ</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>NMake Generator (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>NMake ジェネレータ (%1)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>MinGW Generator</source>
-        <translation type="unfinished"></translation>
+        <translation>MinGW ジェネレータ</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>No valid cmake executable specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>有効な cmake 実行ファイルが指定されていません。</translation>
     </message>
 </context>
 <context>
     <name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+248"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+246"/>
         <location line="+10"/>
         <source>CMake</source>
         <translation>CMake</translation>
@@ -554,7 +519,7 @@
 <context>
     <name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+163"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+165"/>
         <source>Additional arguments:</source>
         <translation>追加の引数:</translation>
     </message>
@@ -566,13 +531,13 @@
     <message>
         <location line="+59"/>
         <source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Make:&lt;/b&gt; %1 %2</translation>
     </message>
 </context>
 <context>
     <name>CMakeProjectManager::Internal::ShadowBuildPage</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-212"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-213"/>
         <source>Please enter the directory in which you want to build your project. </source>
         <translation>プロジェクトをビルドするディレクトリを指定してください。</translation>
     </message>
@@ -587,13 +552,6 @@
         <translation>ビルド ディレクトリ:</translation>
     </message>
 </context>
-<context>
-    <name>CMakeProjectManager::Internal::XmlFileUpToDatePage</name>
-    <message>
-        <source>Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project.</source>
-        <translation type="obsolete">最新の cbp ファイルが見つかりました。ファイルを解析してプロジェクトに関する情報を取得します。このプロジェクトの cbp ファイル作成時とはコマンドライン引数を変更することも可能です。「完了」をクリックしてプロジェクトを読み込んでください。</translation>
-    </message>
-</context>
 <context>
     <name>CPlusPlus::OverviewModel</name>
     <message>
@@ -614,13 +572,6 @@
         <source>These options take effect at the next start of Qt Creator.</source>
         <translation>これらのオプションは次回の Qt Creator の起動時から有効になります。</translation>
     </message>
-    <message numerus="yes">
-        <source>&lt;html&gt;&lt;body&gt;&lt;p&gt;Specify the path to the &lt;a href=&quot;%1&quot;&gt;Debugging Tools for Windows&lt;/a&gt; (%n bit-version) here.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; Restarting Qt Creator is required for these settings to take effect.&lt;/p&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <extracomment>Label text for path configuration. Singular form is not very likely to occur ;-)</extracomment>
-        <translation type="obsolete">
-            <numerusform>&lt;html&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;%1&quot;&gt;Windows 用デバッグツール&lt;/a&gt; (%n bit版)のパスを指定してください。&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt;この設定を反映させるためには Qt Creator の再起動が必要です。&lt;/p&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</numerusform>
-        </translation>
-    </message>
     <message>
         <location/>
         <source>Cdb</source>
@@ -651,27 +602,27 @@
         <location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+58"/>
         <source>&lt;html&gt;&lt;body&gt;&lt;p&gt;Specify the path to the &lt;a href=&quot;%1&quot;&gt;Debugging Tools for Windows&lt;/a&gt; (%2) here.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; Restarting Qt Creator is required for these settings to take effect.&lt;/p&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <extracomment>Label text for path configuration. %2 is &quot;x-bit version&quot;.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;ここに &lt;a href=&quot;%1&quot;&gt;Debugging Tools for Windows&lt;/a&gt; (%2) のパスを指定してください。&lt;/p&gt;&lt;p&gt;&lt;b&gt;メモ:&lt;/b&gt; この設定を有効にするには Qt Creator を再起動する必要があります。&lt;/p&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>64-bit version</source>
-        <translation type="unfinished"></translation>
+        <translation>64 bit バージョン</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>32-bit version</source>
-        <translation type="unfinished"></translation>
+        <translation>32 bit バージョン</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/debugger/cdb/cdboptionspagewidget.ui"/>
         <source>Other options</source>
-        <translation type="unfinished"></translation>
+        <translation>その他のオプション</translation>
     </message>
     <message>
         <location/>
         <source>Verbose Symbol Loading</source>
-        <translation type="unfinished"></translation>
+        <translation>冗長なシンボル読み込み</translation>
     </message>
 </context>
 <context>
@@ -695,9 +646,9 @@
 <context>
     <name>CodePaster::CodepasterPlugin</name>
     <message>
-        <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
-        <source>&amp;CodePaster</source>
-        <translation>コード ペースター(&amp;C)</translation>
+        <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+110"/>
+        <source>&amp;Code Pasting</source>
+        <translation>コード貼り付け(&amp;C)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -705,24 +656,24 @@
         <translation>スニペットを貼り付ける...</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Alt+C,Alt+P</source>
         <translation>Alt+C,Alt+P</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Fetch Snippet...</source>
         <translation>スニペットを取り出す...</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Alt+C,Alt+F</source>
         <translation>Alt+C,Alt+F</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+87"/>
         <source>This protocol supports no listing</source>
-        <translation type="unfinished"></translation>
+        <translation>このプロトコルはリスト形式をサポートしていません</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -730,28 +681,6 @@
         <translation>リスト取得中</translation>
     </message>
 </context>
-<context>
-    <name>CodePaster::CustomFetcher</name>
-    <message>
-        <source>CodePaster Error</source>
-        <translation type="obsolete">コード ペースター エラー</translation>
-    </message>
-    <message>
-        <source>Could not fetch code</source>
-        <translation type="obsolete">コードを取得できませんでした</translation>
-    </message>
-</context>
-<context>
-    <name>CodePaster::CustomPoster</name>
-    <message>
-        <source>CodePaster Error</source>
-        <translation type="obsolete">コード ペースター エラー</translation>
-    </message>
-    <message>
-        <source>Some error occured while posting</source>
-        <translation type="obsolete">ポスト中にエラーが発生しました</translation>
-    </message>
-</context>
 <context>
     <name>CodePaster::PasteSelectDialog</name>
     <message>
@@ -762,15 +691,11 @@
     <message>
         <location/>
         <source>Protocol:</source>
-        <translation type="unfinished"></translation>
+        <translation>プロトコル:</translation>
     </message>
 </context>
 <context>
     <name>CodePaster::SettingsPage</name>
-    <message>
-        <source>CodePaster Server:</source>
-        <translation type="obsolete">コード ペースター サーバ:</translation>
-    </message>
     <message>
         <location filename="../../../src/plugins/cpaster/settingspage.ui"/>
         <source>Username:</source>
@@ -788,30 +713,34 @@
     </message>
     <message>
         <location/>
-        <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+62"/>
+        <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+67"/>
         <source>General</source>
         <translation>概要</translation>
     </message>
     <message>
         <location/>
-        <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+10"/>
         <source>CodePaster</source>
         <translation>コード ペースター</translation>
     </message>
     <message>
         <location/>
         <source>Default Protocol:</source>
-        <translation type="unfinished"></translation>
+        <translation>デフォルト プロトコル:</translation>
     </message>
     <message>
         <location/>
         <source>Pastebin.ca</source>
-        <translation type="unfinished"></translation>
+        <translation>Pastebin.ca</translation>
     </message>
     <message>
         <location/>
         <source>Pastebin.com</source>
-        <translation type="unfinished"></translation>
+        <translation>Pastebin.com</translation>
+    </message>
+    <message>
+        <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+10"/>
+        <source>Code Pasting</source>
+        <translation>コード貼り付け</translation>
     </message>
 </context>
 <context>
@@ -845,10 +774,6 @@
         <source>Skip known frames when stepping</source>
         <translation>ステップ実行時は既知のフレームをスキップする</translation>
     </message>
-    <message>
-        <source>Use tooltips while debugging</source>
-        <translation type="obsolete">デバッグ中にツールチップを使用する</translation>
-    </message>
     <message>
         <location/>
         <source>Maximal stack depth:</source>
@@ -864,10 +789,6 @@
         <source>Use alternating row colors in debug views</source>
         <translation>デバッガウィンドウで行ごとに色を変える</translation>
     </message>
-    <message>
-        <source>Checking this will enable tooltips for variable values during debugging. Since this can slow down debugging and does not provide reliable information as it does not use scope information, it is switched off by default.</source>
-        <translation type="obsolete">デバッグ中に変数の値をツールチップで表示します。&lt;br&gt;しかしデバッグ実行の速度が低下する上に、スコープを無視した不確かな情報しか表示しない為&lt;br&gt;デフォルトではチェックOFFとなっています。</translation>
-    </message>
     <message>
         <location/>
         <source>Enable reverse debugging</source>
@@ -876,12 +797,12 @@
     <message>
         <location/>
         <source>Show a message box when receiving a signal</source>
-        <translation type="unfinished"></translation>
+        <translation>シグナル受信中にメッセージボックスを表示する</translation>
     </message>
     <message>
         <location/>
         <source>Use tooltips in main editor while debugging</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッグ中のメイン エディタでツールチップを使用する</translation>
     </message>
 </context>
 <context>
@@ -1007,13 +928,13 @@ Would you like to overwrite them?</source>
     <name>Core::EditorManager</name>
     <message>
         <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+187"/>
-        <location line="+1495"/>
+        <location line="+1493"/>
         <source>Revert to Saved</source>
         <translation>保存時の状態に戻す</translation>
     </message>
     <message>
-        <location line="-1492"/>
-        <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+531"/>
+        <location line="-1490"/>
+        <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+539"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
@@ -1024,20 +945,12 @@ Would you like to overwrite them?</source>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+1294"/>
+        <location line="+1292"/>
         <source>Close Others</source>
         <translation>他を閉じる</translation>
     </message>
     <message>
-        <source>Next Document in History</source>
-        <translation type="obsolete">履歴内の次のドキュメントに移動</translation>
-    </message>
-    <message>
-        <source>Previous Document in History</source>
-        <translation type="obsolete">履歴内の前のドキュメントに移動</translation>
-    </message>
-    <message>
-        <location line="-1289"/>
+        <location line="-1287"/>
         <source>Open in External Editor</source>
         <translation>外部エディタで開く</translation>
     </message>
@@ -1097,57 +1010,32 @@ Would you like to overwrite them?</source>
         <translation>Alt+Right</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+11"/>
         <source>Split</source>
         <translation>上下に分割</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+E,2</source>
-        <translation>Ctrl+E,2</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Split Side by Side</source>
         <translation>左右に分割</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+E,3</source>
-        <translation>Ctrl+E,3</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Remove Current Split</source>
         <translation>現在の分割ウィンドウを閉じる</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+E,0</source>
-        <translation>Ctrl+E,0</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Remove All Splits</source>
         <translation>すべての分割ウィンドウを閉じる</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+E,1</source>
-        <translation>Ctrl+E,1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Goto Other Split</source>
         <translation>他の分割ウィンドウへ移動</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+E,o</source>
-        <translation>Ctrl+E,o</translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>&amp;Advanced</source>
         <translation>æ‹¡å¼µ(&amp;A)</translation>
     </message>
@@ -1159,7 +1047,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+720"/>
         <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>すべてのファイル (*)</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -1198,7 +1086,7 @@ Would you like to overwrite them?</source>
         <translation>名前を付けて保存...</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <location line="+8"/>
         <source>Failed!</source>
         <translation>エラー発生!</translation>
@@ -1214,20 +1102,20 @@ Would you like to overwrite them?</source>
         <translation>&lt;b&gt;警告:&lt;/b&gt; 読み取り専用ファイルを変更しています。</translation>
     </message>
     <message>
-        <location line="-131"/>
-        <location line="+132"/>
+        <location line="-133"/>
+        <location line="+134"/>
         <source>Make writable</source>
         <translation>書込可能にする</translation>
     </message>
     <message>
-        <location line="-1270"/>
+        <location line="-1268"/>
         <source>Next Open Document in History</source>
-        <translation type="unfinished"></translation>
+        <translation>履歴内の次のドキュメントに移動</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Previous Open Document in History</source>
-        <translation type="unfinished"></translation>
+        <translation>履歴内の前のドキュメントに移動</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1240,7 +1128,42 @@ Would you like to overwrite them?</source>
         <translation>進む</translation>
     </message>
     <message>
-        <location line="+1166"/>
+        <location line="+133"/>
+        <source>Meta+E</source>
+        <translation>Meta+E</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>%1,2</source>
+        <translation>%1,2</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1,3</source>
+        <translation>%1,3</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1,0</source>
+        <translation>%1,0</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1,1</source>
+        <translation>%1,1</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1,o</source>
+        <translation>%1,o</translation>
+    </message>
+    <message>
+        <location line="+1000"/>
         <source>Could not open the file for editing with SCC.</source>
         <translation>ファイルを SCC で編集用に開けませんでした。</translation>
     </message>
@@ -1292,23 +1215,15 @@ Would you like to overwrite them?</source>
 </context>
 <context>
     <name>Core::FileManager</name>
-    <message>
-        <source>Can&apos;t save file</source>
-        <translation type="obsolete">ファイルの保存に失敗</translation>
-    </message>
-    <message>
-        <source>Can&apos;t save changes to &apos;%1&apos;. Do you want to continue and loose your changes?</source>
-        <translation type="obsolete">&apos;%1&apos; の変更を保存できません。変更が失われますが、続行しますか?</translation>
-    </message>
     <message>
         <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+306"/>
         <source>Cannot save file</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイルの保存に失敗</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cannot save changes to &apos;%1&apos;. Do you want to continue and lose your changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; の変更を保存できません。変更が失われますが、続行しますか?</translation>
     </message>
     <message>
         <location line="+113"/>
@@ -1417,15 +1332,15 @@ Would you like to overwrite them?</source>
 </context>
 <context>
     <name>Core::Internal::EditorView</name>
-    <message id="===============EditorView====================">
-        <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-442"/>
+    <message>
+        <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="-450"/>
         <source>Go Back</source>
-        <translation type="unfinished">戻る</translation>
+        <translation>戻る</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Go Forward</source>
-        <translation type="unfinished">進む</translation>
+        <translation>進む</translation>
     </message>
     <message>
         <location line="+73"/>
@@ -1439,7 +1354,7 @@ Would you like to overwrite them?</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+221"/>
         <source>Make writable</source>
         <translation>書込可能にする</translation>
     </message>
@@ -1451,7 +1366,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+57"/>
         <source>Copy full path to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>クリップボードにフルパスをコピー</translation>
     </message>
 </context>
 <context>
@@ -1509,28 +1424,28 @@ Would you like to overwrite them?</source>
     <message>
         <location/>
         <source>When files are externally modified:</source>
-        <translation type="unfinished"></translation>
+        <translation>外部でファイルが変更された時:</translation>
     </message>
     <message>
         <location/>
         <source>Always ask</source>
-        <translation type="unfinished"></translation>
+        <translation>常に問い合わせる</translation>
     </message>
     <message>
         <location/>
         <source>Reload all modified files</source>
-        <translation type="unfinished"></translation>
+        <translation>変更されたファイルをすべて再読み込み</translation>
     </message>
     <message>
         <location/>
         <source>Ignore modifications</source>
-        <translation type="unfinished"></translation>
+        <translation>変更を無視</translation>
     </message>
 </context>
 <context>
     <name>Core::Internal::MainWindow</name>
     <message>
-        <location filename="../../../src/plugins/coreplugin/mainwindow.cpp" line="+156"/>
+        <location filename="../../../src/plugins/coreplugin/mainwindow.cpp" line="+157"/>
         <source>Qt Creator</source>
         <translation>Qt Creator</translation>
     </message>
@@ -1540,7 +1455,7 @@ Would you like to overwrite them?</source>
         <translation>アウトプット</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+162"/>
         <source>&amp;File</source>
         <translation>ファイル(&amp;F)</translation>
     </message>
@@ -1564,32 +1479,20 @@ Would you like to overwrite them?</source>
         <source>&amp;Help</source>
         <translation>ヘルプ(&amp;H)</translation>
     </message>
-    <message>
-        <source>&amp;New...</source>
-        <translation type="obsolete">新規作成(&amp;N)...</translation>
-    </message>
-    <message>
-        <source>&amp;Open...</source>
-        <translation type="obsolete">開く(&amp;O)...</translation>
-    </message>
-    <message>
-        <source>&amp;Open With...</source>
-        <translation type="obsolete">指定したエディタで開く(&amp;O)...</translation>
-    </message>
     <message>
         <location line="+62"/>
         <source>&amp;New File or Project...</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイル/プロジェクトの新規作成(&amp;N)...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Open File or Project...</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイル/プロジェクトを開く(&amp;O)...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Open File With...</source>
-        <translation type="unfinished"></translation>
+        <translation>プログラムを指定して開く(&amp;O)...</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1722,6 +1625,11 @@ Would you like to overwrite them?</source>
         <comment>Title of dialog</comment>
         <translation>新規...</translation>
     </message>
+    <message>
+        <location line="+511"/>
+        <source>Settings...</source>
+        <translation>設定...</translation>
+    </message>
 </context>
 <context>
     <name>Core::Internal::MessageOutputWindow</name>
@@ -1779,32 +1687,32 @@ Would you like to overwrite them?</source>
         <location filename="../../../src/plugins/coreplugin/editormanager/openeditorsview.cpp" line="+100"/>
         <location line="+147"/>
         <source>Open Documents</source>
-        <translation>ドキュメントを開く</translation>
+        <translation>開いているドキュメント</translation>
     </message>
     <message>
         <location line="-39"/>
         <source>Close %1</source>
-        <translation type="unfinished">%1 を閉じる</translation>
+        <translation>%1 を閉じる</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Close Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>エディタを閉じる</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Close All Except %1</source>
-        <translation type="unfinished">%1 以外のすべてを閉じる</translation>
+        <translation>%1 以外のすべてを閉じる</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Close Other Editors</source>
-        <translation type="unfinished"></translation>
+        <translation>他のエディタを閉じる</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Close All Editors</source>
-        <translation type="unfinished"></translation>
+        <translation>すべてのエディタを閉じる</translation>
     </message>
 </context>
 <context>
@@ -1895,14 +1803,10 @@ Would you like to overwrite them?</source>
 </context>
 <context>
     <name>Core::Internal::SaveItemsDialog</name>
-    <message>
-        <source>Don&apos;t Save</source>
-        <translation type="obsolete">保存しない</translation>
-    </message>
     <message>
         <location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.cpp" line="+55"/>
         <source>Do not Save</source>
-        <translation type="unfinished"></translation>
+        <translation>保存しない</translation>
     </message>
     <message>
         <location line="+44"/>
@@ -1982,360 +1886,133 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>Core::Internal::WelcomeMode</name>
+    <name>Core::ModeManager</name>
     <message>
-        <source>Tutorials</source>
-        <translation type="obsolete">チュートリアル</translation>
+        <location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+145"/>
+        <source>Switch to %1 mode</source>
+        <translation>%1 モードに切り替える</translation>
     </message>
+</context>
+<context>
+    <name>Core::ScriptManager</name>
     <message>
-        <source>Explore Qt Examples</source>
-        <translation type="obsolete">Qt のサンプルプログラムを参照</translation>
+        <location filename="../../../src/plugins/coreplugin/scriptmanager/scriptmanager.cpp" line="+228"/>
+        <source>Exception at line %1: %2
+%3</source>
+        <translation>%1 行目で例外発生: %2
+%3</translation>
     </message>
     <message>
-        <source>Open Recent Project</source>
-        <translation type="obsolete">最近使ったプロジェクトを開く</translation>
+        <location line="+66"/>
+        <source>Unknown error</source>
+        <translation>未知のエラー</translation>
     </message>
+</context>
+<context>
+    <name>Core::StandardFileWizard</name>
     <message>
-        <source>Resume Session</source>
-        <translation type="obsolete">セッションを復元</translation>
+        <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+53"/>
+        <source>New %1</source>
+        <translation>%1 の新規作成</translation>
     </message>
+</context>
+<context>
+    <name>Utils::ClassNameValidatingLineEdit</name>
     <message>
-        <source>Did You Know?</source>
-        <translation type="obsolete">ご存じですか?</translation>
+        <location filename="../../../src/libs/utils/classnamevalidatinglineedit.cpp" line="+84"/>
+        <source>The class name must not contain namespace delimiters.</source>
+        <translation>クラス名にはネームスペースの区切り文字を含めないでください。</translation>
     </message>
     <message>
-        <source>News From the Qt Labs</source>
-        <translation type="obsolete">Qt Labsからのニュース</translation>
+        <location line="+4"/>
+        <source>Please enter a class name.</source>
+        <translation>クラス名を入力してください。</translation>
     </message>
     <message>
-        <source>Qt Websites</source>
-        <translation type="obsolete">Qt の Web サイト</translation>
+        <location line="+4"/>
+        <source>The class name contains invalid characters.</source>
+        <translation>クラス名に不正な文字が含まれています。</translation>
     </message>
+</context>
+<context>
+    <name>Utils::ConsoleProcess</name>
     <message>
-        <source>http://labs.trolltech.com/blogs/feed</source>
-        <extracomment>Add localized feed here only if one exists</extracomment>
-        <translation type="obsolete">http://labs.trolltech.com/blogs/feed</translation>
+        <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+49"/>
+        <source>Cannot set up communication channel: %1</source>
+        <translation>通信チャンネルを用意できません: %1</translation>
     </message>
     <message>
-        <source>Qt Home</source>
-        <translation type="obsolete">Qt Home</translation>
+        <location line="+7"/>
+        <source>Press &lt;RETURN&gt; to close this window...</source>
+        <translation>&lt;リターン&gt;キーを押してウィンドウを閉じてください...</translation>
     </message>
     <message>
-        <source>Qt Labs</source>
-        <translation type="obsolete">Qt Labs</translation>
+        <location line="+5"/>
+        <source>Cannot create temporary file: %1</source>
+        <translation>一時ファイルを作成できません: %1</translation>
     </message>
     <message>
-        <source>Qt Git Hosting</source>
-        <translation type="obsolete">Qt Git ホスティング</translation>
+        <location line="+5"/>
+        <source>Cannot create temporary directory &apos;%1&apos;: %2</source>
+        <translation>一時ディレクトリ &apos;%1&apos; を作成できません: %2</translation>
     </message>
     <message>
-        <source>Qt Centre</source>
-        <translation type="obsolete">Qt Centre</translation>
+        <location line="+10"/>
+        <source>Cannot change to working directory &apos;%1&apos;: %2</source>
+        <translation>作業ディレクトリ &apos;%1&apos; に移動できません: %2</translation>
     </message>
     <message>
-        <source>Qt for S60 at Forum Nokia</source>
-        <translation type="obsolete">Forum Nokia の Qt for S60</translation>
+        <location line="+5"/>
+        <source>Cannot execute &apos;%1&apos;: %2</source>
+        <translation>&apos;%1&apos; を実行できません: %2</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Qt Creator - A quick tour&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Qt Creator - 簡易ガイド&lt;/b&gt;</translation>
+        <location line="-10"/>
+        <source>Unexpected output from helper program.</source>
+        <translation>ヘルパプログラムからの想定外の出力。</translation>
     </message>
     <message>
-        <source>Creating an address book</source>
-        <translation type="obsolete">アドレス帳アプリの作成</translation>
+        <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+125"/>
+        <source>The process &apos;%1&apos; could not be started: %2</source>
+        <translation>プロセス &apos;%1&apos; を開始できません: %2</translation>
     </message>
     <message>
-        <source>Understanding widgets</source>
-        <translation type="obsolete">ウィジェットを理解する</translation>
+        <location line="+70"/>
+        <source>Cannot obtain a handle to the inferior: %1</source>
+        <translation>プログラムのハンドルが取得できません: %1</translation>
     </message>
     <message>
-        <source>Building with qmake</source>
-        <translation type="obsolete">qmake でビルドする</translation>
+        <location line="+30"/>
+        <source>Cannot obtain exit status from inferior: %1</source>
+        <translation>プログラムの終了ステータスが取得できません: %1</translation>
     </message>
     <message>
-        <source>Writing test cases</source>
-        <translation type="obsolete">テストケースを作成する</translation>
+        <location filename="../../../src/libs/utils/consoleprocess_unix.cpp" line="+111"/>
+        <source>Cannot start the terminal emulator &apos;%1&apos;.</source>
+        <translation>端末エミュレータ &apos;%1&apos; を起動できません。</translation>
     </message>
     <message>
-        <source>Welcome</source>
-        <translation type="obsolete">ようこそ</translation>
+        <location line="+49"/>
+        <source>Cannot create socket &apos;%1&apos;: %2</source>
+        <translation>ソケット &apos;%1&apos; を作成できません: %2</translation>
     </message>
+</context>
+<context>
+    <name>Utils::FileNameValidatingLineEdit</name>
     <message>
-        <source>%1 (last session)</source>
-        <translation type="obsolete">%1 (最後のセッション)</translation>
+        <location filename="../../../src/libs/utils/filenamevalidatinglineedit.cpp" line="+95"/>
+        <source>The name must not be empty</source>
+        <translation>ファイル名を空にはできません</translation>
     </message>
     <message>
-        <source>Choose an example...</source>
-        <translation type="obsolete">サンプルプログラムを選ぶ...</translation>
+        <location line="+8"/>
+        <source>The name must not contain any of the characters &apos;%1&apos;.</source>
+        <translation>ファイル名に &apos;%1&apos; のどの文字も含めないでください。</translation>
     </message>
     <message>
-        <source>New Project...</source>
-        <translation type="obsolete">新しいプロジェクト...</translation>
-    </message>
-    <message>
-        <source>Cmd</source>
-        <comment>Shortcut key</comment>
-        <translation type="obsolete">Cmd</translation>
-    </message>
-    <message>
-        <source>Alt</source>
-        <comment>Shortcut key</comment>
-        <translation type="obsolete">Alt</translation>
-    </message>
-    <message>
-        <source>You can switch between Qt Creator&apos;s modes using &lt;tt&gt;Ctrl+number&lt;/tt&gt;:&lt;ul&gt;&lt;li&gt;1 - Welcome&lt;/li&gt;&lt;li&gt;2 - Edit&lt;/li&gt;&lt;li&gt;3 - Debug&lt;/li&gt;&lt;li&gt;4 - Projects&lt;/li&gt;&lt;li&gt;5 - Help&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - Output&lt;/li&gt;&lt;/ul&gt;</source>
-        <translation type="obsolete">Qt Creator のモードは&lt;tt&gt;Ctrl+数字&lt;/tt&gt;キーで変更できます:&lt;ul&gt;&lt;li&gt;1 - ようこそ&lt;/li&gt;&lt;li&gt;2 - 編集&lt;/li&gt;&lt;li&gt;3 - デバッグ&lt;/li&gt;&lt;li&gt;4 - プロジェクト&lt;/li&gt;&lt;li&gt;5 - ヘルプ&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - アウトプット&lt;/li&gt;&lt;/ul&gt;</translation>
-    </message>
-    <message>
-        <source>You can show and hide the side bar using &lt;tt&gt;%1+0&lt;tt&gt;.</source>
-        <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
-        <translation type="obsolete">&lt;tt&gt;%1+0&lt;/tt&gt;キーでサイドバーの表示/非表示を切り替えられます。</translation>
-    </message>
-    <message>
-        <source>You can start Qt Creator with a session by calling &lt;tt&gt;qtcreator &amp;lt;sessionname&amp;gt;&lt;/tt&gt;.</source>
-        <translation type="obsolete">Qt Creator の起動時にセッション名を渡す(&lt;tt&gt;qtcreator &amp;lt;セッション名&amp;gt;)とそのセッションを開始できます。</translation>
-    </message>
-    <message>
-        <source>You can return to edit mode from any other mode at any time by hitting &lt;tt&gt;Escape&lt;/tt&gt;.</source>
-        <translation type="obsolete">&lt;tt&gt;エスケープ&lt;/tt&gt;キーでいつでもほかのモードから編集モードに戻れます。</translation>
-    </message>
-    <message>
-        <source>You can switch between the output pane by hitting &lt;tt&gt;%1+n&lt;/tt&gt; where n is the number denoted on the buttons at the window bottom:&lt;ul&gt;&lt;li&gt;1 - Build Issues&lt;/li&gt;&lt;li&gt;2 - Search Results&lt;/li&gt;&lt;li&gt;3 - Application Output&lt;/li&gt;&lt;li&gt;4 - Compile Output&lt;/li&gt;&lt;/ul&gt;</source>
-        <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
-        <translation type="obsolete">アウトプット欄は&lt;tt&gt;%1+数字&lt;/tt&gt;キーで変更できます。使用する数字はウィンドウの下部のボタンに記述されています:&lt;ul&gt;&lt;li&gt;1 - ビルドの問題点&lt;/li&gt;&lt;li&gt;2 - 検索結果&lt;/li&gt;&lt;li&gt;3 - アプリケーション出力&lt;/li&gt;&lt;li&gt;4 - コンパイル出力&lt;/li&gt;&lt;/ul&gt;</translation>
-    </message>
-    <message>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</source>
-        <translation type="obsolete">メソッドやクラス、ヘルプなどを素早く検索するには&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;クイックアクセス&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;)を使用します。</translation>
-    </message>
-    <message>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;ビルド設定&lt;/a&gt;を変更して独自のビルドステップを追加できます。</translation>
-    </message>
-    <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="obsolete">セッションではプロジェクト間の&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;依存関係&lt;/a&gt;を定義できます。</translation>
-    </message>
-    <message>
-        <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
-        <translation type="obsolete">各プロジェクトの編集時の文字コードは&lt;tt&gt;プロジェクト -&gt; エディタの設定 -&gt; デフォルトの文字コード&lt;/tt&gt;で指定できます。</translation>
-    </message>
-    <message>
-        <source>You can modify the binary that is being executed when you press the &lt;tt&gt;Run&lt;/tt&gt; button: Add a &lt;tt&gt;Custom Executable&lt;/tt&gt; by clicking the &lt;tt&gt;+&lt;/tt&gt; button in &lt;tt&gt;Projects -&gt; Run Settings -&gt; Run Configuration&lt;/tt&gt; and then select the new target in the combo box.</source>
-        <translation type="obsolete">&lt;tt&gt;実行&lt;/tt&gt;ボタンを押したときに実行されるファイルは&lt;tt&gt;プロジェクト -&gt; 実行時の設定 -&gt; 実行時の条件&lt;/tt&gt;の&lt;tt&gt;+&lt;/tt&gt;ボタンで&lt;tt&gt;カスタム実行ファイル&lt;/tt&gt;を選択することで追加できます。追加した後に&lt;tt&gt;実行時の条件&lt;/tt&gt;のコンボボックスから作成した条件を選択してください。</translation>
-    </message>
-    <message>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce and Git.</source>
-        <translation type="obsolete">Qt Creator では Subversion や Perforce、Git 等のさまざまな&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;バージョン管理システム&lt;/a&gt;を使用できます。</translation>
-    </message>
-    <message>
-        <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
-        <translation type="obsolete">編集モードでは&lt;tt&gt;F2&lt;/tt&gt;キーで宣言と定義を、&lt;tt&gt;F4&lt;/tt&gt;キーでヘッダファイルとソースファイルを切り替えできます。</translation>
-    </message>
-    <message>
-        <source>You can fine tune the &lt;tt&gt;Find&lt;/tt&gt; function by selecting &amp;quot;Whole Words&amp;quot; or &amp;quot;Case Sensitive&amp;quot;. Simply click on the icons on the right end of the line edit.</source>
-        <translation type="obsolete">&lt;tt&gt;検索&lt;/tt&gt;機能は&amp;quot;単語単位で検索する&amp;quot;や&amp;quot;大文字/小文字を区別する&amp;quot;を選択することで目的に合わせて検索結果を調整できます。検索文字列を入力する欄の右端にあるアイコンをクリックすることで機能を選択できます。</translation>
-    </message>
-    <message>
-        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;外部のライブラリ&lt;/a&gt;をプロジェクトに追加した場合、Qt Creator は自動的にシンタックスハイライトやコード補完を行います。</translation>
-    </message>
-    <message>
-        <source>The code completion is CamelCase-aware. For example, to complete &lt;tt&gt;namespaceUri&lt;/tt&gt; you can just type &lt;tt&gt;nU&lt;/tt&gt; and hit &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
-        <translation type="obsolete">コード補完はキャメルケースに対応しています。たとえば&lt;tt&gt;namespaceUrl&lt;/tt&gt;を補完したい場合、&lt;tt&gt;nU&lt;/tt&gt;と入力して&lt;tt&gt;Ctrl+Space&lt;/tt&gt;を押してください。</translation>
-    </message>
-    <message>
-        <source>You can force code completion at any time using &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
-        <translation type="obsolete">&lt;tt&gt;Ctrl+Space&lt;/tt&gt;を押せば任意のタイミングでコード補完を開始することができます。</translation>
-    </message>
-</context>
-<context>
-    <name>Core::Internal::WelcomePage</name>
-    <message>
-        <source>#gradientWidget {
-  background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
-}</source>
-        <translation type="obsolete">#gradientWidget {
-  background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
-}</translation>
-    </message>
-    <message>
-        <source>#headerFrame {
-    border-image: url(:/core/images/welcomemode/center_frame_header.png) 0;
-    border-width: 0;
-}
-</source>
-        <translation type="obsolete">#headerFrame {
-    border-image: url(:/core/images/welcomemode/center_frame_header.png) 0;
-    border-width: 0;
-}
-</translation>
-    </message>
-    <message>
-        <source>Getting Started</source>
-        <translation type="obsolete">Qt Creator を始めよう</translation>
-    </message>
-    <message>
-        <source>Develop</source>
-        <translation type="obsolete">開発</translation>
-    </message>
-    <message>
-        <source>Community</source>
-        <translation type="obsolete">コミュニティ</translation>
-    </message>
-    <message>
-        <source>Examples not installed</source>
-        <translation type="obsolete">サンプルプログラムがインストールされていません</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">開く</translation>
-    </message>
-    <message>
-        <source>Manage Sessions...</source>
-        <translation type="obsolete">セッション管理...</translation>
-    </message>
-    <message>
-        <source>Create New Project...</source>
-        <translation type="obsolete">新しいプロジェクトの作成...</translation>
-    </message>
-    <message>
-        <source>Help us make Qt Creator even better</source>
-        <translation type="obsolete">Qt Creator の改善にご協力ください</translation>
-    </message>
-    <message>
-        <source>Feedback</source>
-        <translation type="obsolete">フィードバック</translation>
-    </message>
-</context>
-<context>
-    <name>Core::ModeManager</name>
-    <message>
-        <location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+145"/>
-        <source>Switch to %1 mode</source>
-        <translation>%1 モードに切り替える</translation>
-    </message>
-</context>
-<context>
-    <name>Core::ScriptManager</name>
-    <message>
-        <location filename="../../../src/plugins/coreplugin/scriptmanager/scriptmanager.cpp" line="+228"/>
-        <source>Exception at line %1: %2
-%3</source>
-        <translation>%1 行目で例外発生: %2
-%3</translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Unknown error</source>
-        <translation>未知のエラー</translation>
-    </message>
-</context>
-<context>
-    <name>Core::StandardFileWizard</name>
-    <message>
-        <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+53"/>
-        <source>New %1</source>
-        <translation>%1 の新規作成</translation>
-    </message>
-</context>
-<context>
-    <name>Utils::ClassNameValidatingLineEdit</name>
-    <message>
-        <location filename="../../../src/libs/utils/classnamevalidatinglineedit.cpp" line="+84"/>
-        <source>The class name must not contain namespace delimiters.</source>
-        <translation>クラス名にはネームスペースの区切り文字を含めないでください。</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Please enter a class name.</source>
-        <translation>クラス名を入力してください。</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>The class name contains invalid characters.</source>
-        <translation>クラス名に不正な文字が含まれています。</translation>
-    </message>
-</context>
-<context>
-    <name>Utils::ConsoleProcess</name>
-    <message>
-        <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+49"/>
-        <source>Cannot set up communication channel: %1</source>
-        <translation>通信チャンネルを用意できません: %1</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Press &lt;RETURN&gt; to close this window...</source>
-        <translation>&lt;リターン&gt;キーを押してウィンドウを閉じてください...</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Cannot create temporary file: %1</source>
-        <translation>一時ファイルを作成できません: %1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Cannot create temporary directory &apos;%1&apos;: %2</source>
-        <translation>一時ディレクトリ &apos;%1&apos; を作成できません: %2</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Cannot change to working directory &apos;%1&apos;: %2</source>
-        <translation>作業ディレクトリ &apos;%1&apos; に移動できません: %2</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Cannot execute &apos;%1&apos;: %2</source>
-        <translation>&apos;%1&apos; を実行できません: %2</translation>
-    </message>
-    <message>
-        <location line="-10"/>
-        <source>Unexpected output from helper program.</source>
-        <translation>ヘルパプログラムからの想定外の出力。</translation>
-    </message>
-    <message>
-        <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+125"/>
-        <source>The process &apos;%1&apos; could not be started: %2</source>
-        <translation>プロセス &apos;%1&apos; を開始できません: %2</translation>
-    </message>
-    <message>
-        <location line="+70"/>
-        <source>Cannot obtain a handle to the inferior: %1</source>
-        <translation>子プロセスのハンドルが取得できません: %1</translation>
-    </message>
-    <message>
-        <location line="+30"/>
-        <source>Cannot obtain exit status from inferior: %1</source>
-        <translation>子プロセスの終了ステータスが取得できません: %1</translation>
-    </message>
-    <message>
-        <location filename="../../../src/libs/utils/consoleprocess_unix.cpp" line="+111"/>
-        <source>Cannot start the terminal emulator &apos;%1&apos;.</source>
-        <translation>端末エミュレータ &apos;%1&apos; を起動できません。</translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Cannot create socket &apos;%1&apos;: %2</source>
-        <translation>ソケット &apos;%1&apos; を作成できません: %2</translation>
-    </message>
-</context>
-<context>
-    <name>Utils::FileNameValidatingLineEdit</name>
-    <message>
-        <location filename="../../../src/libs/utils/filenamevalidatinglineedit.cpp" line="+95"/>
-        <source>The name must not be empty</source>
-        <translation>ファイル名を空にはできません</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The name must not contain any of the characters &apos;%1&apos;.</source>
-        <translation>ファイル名に &apos;%1&apos; のどの文字も含めないでください。</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>The name must not contain &apos;%1&apos;.</source>
-        <translation>ファイル名に &apos;%1&apos; を含めないでください。</translation>
+        <location line="+9"/>
+        <source>The name must not contain &apos;%1&apos;.</source>
+        <translation>ファイル名に &apos;%1&apos; を含めないでください。</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -2370,7 +2047,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Utils::NewClassWidget</name>
     <message>
-        <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+392"/>
+        <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+417"/>
         <source>Invalid base class name</source>
         <translation>無効な基底クラス名</translation>
     </message>
@@ -2424,6 +2101,26 @@ Would you like to overwrite them?</source>
         <source>Path:</source>
         <translation>パス:</translation>
     </message>
+    <message>
+        <location/>
+        <source>Inherits QObject</source>
+        <translation>QObject を継承</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Type information:</source>
+        <translation>型情報:</translation>
+    </message>
+    <message>
+        <location/>
+        <source>None</source>
+        <translation>なし</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Inherits QWidget</source>
+        <translation>QWidget を継承</translation>
+    </message>
 </context>
 <context>
     <name>Utils::PathChooser</name>
@@ -2438,7 +2135,7 @@ Would you like to overwrite them?</source>
         <translation>参照...</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+123"/>
         <source>Choose a directory</source>
         <translation>ディレクトリを選択してください</translation>
     </message>
@@ -2588,7 +2285,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+4"/>
         <source>The unsaved file %1 has been changed outside Qt Creator. Do you want to reload it and discard your changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>保存されていないファイル %1 は Qt Creator以外で変更されています。再読込して、変更内容を廃棄しますか?</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2599,19 +2296,19 @@ Would you like to overwrite them?</source>
 <context>
     <name>CppEditor::Internal::CPPEditor</name>
     <message>
-        <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+608"/>
+        <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+616"/>
         <source>Sort alphabetically</source>
         <translation>アルファベット順にソート</translation>
     </message>
     <message>
-        <location line="+265"/>
+        <location line="+188"/>
         <source>This change cannot be undone.</source>
-        <translation type="unfinished"></translation>
+        <translation>この変更は正常に完了できない可能性があります。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Yes, I know what I am doing.</source>
-        <translation type="unfinished"></translation>
+        <translation>はい、分かっています。</translation>
     </message>
 </context>
 <context>
@@ -2627,7 +2324,7 @@ Would you like to overwrite them?</source>
         <translation>ヘッダー ファイルとソース ファイルの名前はクラス名を元にします</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+26"/>
         <source>Configure...</source>
         <translation>構成...</translation>
     </message>
@@ -2635,7 +2332,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>CppEditor::Internal::CppClassWizard</name>
     <message>
-        <location line="+116"/>
+        <location line="+117"/>
         <source>Error while generating file contents.</source>
         <translation>ファイル生成中にエラーが発生。</translation>
     </message>
@@ -2643,7 +2340,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>CppEditor::Internal::CppClassWizardDialog</name>
     <message>
-        <location line="-66"/>
+        <location line="-67"/>
         <source>C++ Class Wizard</source>
         <translation>C++ クラス ウィザード</translation>
     </message>
@@ -2659,7 +2356,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>CppEditor::Internal::CppPlugin</name>
     <message>
-        <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+175"/>
+        <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+190"/>
         <source>C++</source>
         <translation>C++</translation>
     </message>
@@ -2671,12 +2368,12 @@ Would you like to overwrite them?</source>
     <message>
         <location line="-1"/>
         <source>Creates a C++ header file.</source>
-        <translation>C++ のヘッダーファイルを作成する。</translation>
+        <translation>C++ のヘッダーファイルを作成します。</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Creates a C++ source file.</source>
-        <translation>C++ のソースファイルを作成する。</translation>
+        <translation>C++ のソースファイルを作成します。</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2694,7 +2391,7 @@ Would you like to overwrite them?</source>
         <translation>新しいクラスのヘッダーファイルとソースファイルを作成します。</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>Follow Symbol under Cursor</source>
         <translation>カーソル位置のシンボルの定義へ移動</translation>
     </message>
@@ -2706,17 +2403,22 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+9"/>
         <source>Find Usages</source>
-        <translation type="unfinished"></translation>
+        <translation>出現箇所を検索</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ctrl+Shift+U</source>
-        <translation type="unfinished">Ctrl+Shift+U</translation>
+        <translation>Ctrl+Shift+U</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Rename Symbol under Cursor</source>
-        <translation type="unfinished"></translation>
+        <translation>カーソル位置のシンボルの名前を変更</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Update code model</source>
+        <translation>コード モデルを更新する</translation>
     </message>
 </context>
 <context>
@@ -2744,13 +2446,13 @@ Would you like to overwrite them?</source>
     <message>
         <location/>
         <source>License Template:</source>
-        <translation type="unfinished"></translation>
+        <translation>ライセンス テンプレート:</translation>
     </message>
 </context>
 <context>
     <name>CppPreprocessor</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+542"/>
+        <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+540"/>
         <source>%1: No such file or directory</source>
         <translation>%1: そのようなファイルもしくはディレクトリはありません</translation>
     </message>
@@ -2758,9 +2460,9 @@ Would you like to overwrite them?</source>
 <context>
     <name>CppTools::Internal::CppModelManager</name>
     <message>
-        <location line="+290"/>
+        <location line="+319"/>
         <source>Scanning</source>
-        <translation type="unfinished"></translation>
+        <translation>スキャン中</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -2819,50 +2521,24 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::FindClassDeclarations</name>
+    <name>CppTools::Internal::CppToolsPlugin</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+103"/>
-        <source>Search class</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+126"/>
+        <source>&amp;C++</source>
+        <translation>C++(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/cpptools/cpptoolsplugin.h" line="+75"/>
-        <source>Class Declarations</source>
-        <translation type="unfinished"></translation>
+        <location line="+8"/>
+        <source>Switch Header/Source</source>
+        <translation>ヘッダー/ソースを切り替え</translation>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::FindFunctionCalls</name>
+    <name>CppTools::Internal::FunctionArgumentWidget</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+53"/>
-        <source>Search functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../src/plugins/cpptools/cpptoolsplugin.h" line="+25"/>
-        <source>Function calls</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CppTools::Internal::CppToolsPlugin</name>
-    <message>
-        <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+75"/>
-        <source>&amp;C++</source>
-        <translation>C++(&amp;C)</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Switch Header/Source</source>
-        <translation>ヘッダー/ソースを切り替え</translation>
-    </message>
-</context>
-<context>
-    <name>CppTools::Internal::FunctionArgumentWidget</name>
-    <message>
-        <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+433"/>
-        <source>%1 of %2</source>
-        <translation>%1/%2</translation>
+        <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+443"/>
+        <source>%1 of %2</source>
+        <translation>%1/%2</translation>
     </message>
 </context>
 <context>
@@ -2878,7 +2554,7 @@ Would you like to overwrite them?</source>
         <translation>デバッガ</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+432"/>
+        <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+654"/>
         <source>&lt;Encoding error&gt;</source>
         <translation>&lt;エンコーディングエラー&gt;</translation>
     </message>
@@ -2887,14 +2563,14 @@ Would you like to overwrite them?</source>
     <name>QtDumperHelper</name>
     <message>
         <location line="+103"/>
-        <source>Found a too-old version of the debugging helper library (%1); version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <source>Found an outdated version of the debugging helper library (%1); version %2 is required.</source>
+        <translation>旧バージョンのデバッグヘルパライブラリ(%1)が見つかりました。バージョン %2 が必要です。</translation>
     </message>
     <message numerus="yes">
         <location line="+37"/>
         <source>%n known types, Qt version: %1, Qt namespace: %2 Dumper version: %3</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>既知の型: %n, Qt バージョン: %1, Qt ネームスペース: %2, ダンパバージョン: %3</numerusform>
         </translation>
     </message>
     <message>
@@ -2902,17 +2578,11 @@ Would you like to overwrite them?</source>
         <source>&lt;none&gt;</source>
         <translation>&lt;なし&gt;</translation>
     </message>
-    <message numerus="yes">
-        <source>%n known types, Qt version: %1, Qt namespace: %2</source>
-        <translation type="obsolete">
-            <numerusform>既知の型: %n, Qt バージョン: %1, Qt ネームスペース: %2</numerusform>
-        </translation>
-    </message>
 </context>
 <context>
     <name>Debugger::Internal::AttachCoreDialog</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+136"/>
+        <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+135"/>
         <source>Select Executable</source>
         <translation>実行ファイルを選択</translation>
     </message>
@@ -2950,27 +2620,12 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+220"/>
         <source>Select start address</source>
-        <translation type="unfinished"></translation>
+        <translation>開始アドレスの選択</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Enter an address: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Debugger::MessageBox</name>
-    <message>
-        <location line="+61"/>
-        <source>Settings...</source>
-        <translation type="unfinished">設定...</translation>
-    </message>
-</context>
-<context>
-    <name>Debugger::Internal::AttachTcfDialog</name>
-    <message>
-        <source>Select Executable</source>
-        <translation type="obsolete">実行ファイルを選択</translation>
+        <translation>アドレスを入力してください:</translation>
     </message>
 </context>
 <context>
@@ -3073,7 +2728,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+0"/>
         <source>Address</source>
-        <translation type="unfinished">アドレス</translation>
+        <translation>アドレス</translation>
     </message>
     <message>
         <location line="+62"/>
@@ -3101,17 +2756,17 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+3"/>
         <source>Delete all breakpoints</source>
-        <translation type="unfinished"></translation>
+        <translation>すべてのブレークポイントを削除</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Delete breakpoints of &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; のブレークポイントを削除</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Delete breakpoints of file</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイル内のブレークポイントを削除</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -3172,7 +2827,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Debugger::Internal::CdbDebugEngine</name>
     <message>
-        <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+132"/>
+        <location filename="../../../src/plugins/debugger/cdb/cdbdebugengine.cpp" line="+133"/>
         <source>Unable to load the debugger engine library &apos;%1&apos;: %2</source>
         <translation>デバッガエンジンライブラリ &apos;%1&apos; の読込に失敗しました: %2</translation>
     </message>
@@ -3183,21 +2838,32 @@ Would you like to overwrite them?</source>
         <translation>関数 &quot;%1()&quot; の実行に失敗しました: %2</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+112"/>
         <source>Unable to resolve &apos;%1&apos; in the debugger engine library &apos;%2&apos;</source>
         <translation>デバッガエンジンライブラリ &apos;%2&apos; に関数 &apos;%1&apos; が見つかりません</translation>
     </message>
     <message>
-        <source>The dumper library &apos;%1&apos; does not exist.</source>
-        <translation type="obsolete">ダンパライブラリ &apos;%1&apos; は存在しません。</translation>
+        <location line="+349"/>
+        <source>Version: %1</source>
+        <translation>バージョン: %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&lt;html&gt;The installed version of the &lt;i&gt;Debugging Tools for Windows&lt;/i&gt; (%1) is rather old. Upgrading to version %2 is recommended for the proper display of Qt&apos;s data types.&lt;/html&gt;</source>
+        <translation>&lt;html&gt;インストール済み &lt;i&gt;Debugging Tools for Windows&lt;/i&gt; (%1) は多少バージョンが古いです。Qt のデータ型を正しく表示できるようにする為、バージョン %2 へのアップグレードをお勧めします。&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Debugger</source>
+        <translation>デバッガ</translation>
     </message>
     <message>
-        <location line="+355"/>
+        <location line="+33"/>
         <source>The dumper library was not found at %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 にダンパライブラリが見つかりません。</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+33"/>
         <source>The console stub process was unable to start &apos;%1&apos;.</source>
         <translation>コンソールスタブプロセス &apos;%1&apos; が開始できません。</translation>
     </message>
@@ -3212,14 +2878,14 @@ Would you like to overwrite them?</source>
         <translation>デバッガ実行中</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+30"/>
         <source>Attaching to a process failed for process id %1: %2</source>
         <translation>プロセスID %1 のプロセスへアタッチできません: %2</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Unable to set the image path to %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>シンボル イメージのパスを %1 に設定できません: %2</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -3227,54 +2893,54 @@ Would you like to overwrite them?</source>
         <translation>プロセス &apos;%1&apos; が実行できません: %2</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+43"/>
         <source>The process exited with exit code %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>プロセスは終了コード %1 で終了しました。</translation>
     </message>
     <message>
         <location line="+191"/>
         <source>Continuing with &apos;%1&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; を継続しています...</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Unable to continue: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>継続できませんでした: %1</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+31"/>
         <source>Reverse stepping is not implemented.</source>
-        <translation type="unfinished"></translation>
+        <translation>逆方向のステップ実行は未実装です。</translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Stepping %1</source>
-        <translation type="unfinished"></translation>
+        <location line="+6"/>
+        <source>Thread %1 cannot be stepped.</source>
+        <translation>スレッド %1 を停止できません。</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <source>Running to 0x%1...</source>
-        <translation type="unfinished"></translation>
+        <location line="+37"/>
+        <source>Stepping %1</source>
+        <translation>%1 を停止中</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="+94"/>
         <source>Running requested...</source>
-        <translation type="unfinished">実行しようとしています...</translation>
+        <translation>実行しようとしています...</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+59"/>
         <source>Running up to %1:%2...</source>
-        <translation type="unfinished"></translation>
+        <translation>%1:%2 行目まで実行しています...</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Running up to function &apos;%1()&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation>関数 &apos;%1()&apos; まで実行しています...</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Jump to line is not implemented</source>
-        <translation type="unfinished"></translation>
+        <translation>指定行まで実行 は未実装です</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -3284,7 +2950,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+239"/>
         <source>Unable to retrieve %1 bytes of memory at 0x%2: %3</source>
-        <translation type="unfinished"></translation>
+        <translation>メモリの 0x%2 から %1 bytes 分を読み取れません: %3</translation>
     </message>
     <message>
         <location line="+32"/>
@@ -3298,30 +2964,40 @@ Would you like to overwrite them?</source>
         <translation>デバッガエラー</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+27"/>
+        <source>Ignoring initial breakpoint...</source>
+        <translation>初期化中のブレークポイントを無視します...</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Interrupted in thread %1, current thread: %2</source>
+        <translation>スレッド %1 で割り込みが発生しました、現在のスレッドは %2 です</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Stopped, current thread: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>停止しました、現在のスレッド: %1</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+51"/>
         <source>Changing threads: %1 -&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>スレッドが切り替わりました: %1 -&gt; %2</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+80"/>
         <source>Thread %1: Missing debug information for top stack frame (%2).</source>
-        <translation type="unfinished"></translation>
+        <translation>スレッド %1: 最上位のスタックフレーム (%2) のデバッグ情報が見つかりません。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Thread %1: No debug information available (%2).</source>
-        <translation type="unfinished"></translation>
+        <translation>スレッド %1: 最上位のスタックフレーム (%2) に利用可能なデバッグ情報がありません。</translation>
     </message>
 </context>
 <context>
     <name>Debugger::Internal::CdbDumperHelper</name>
     <message>
-        <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+203"/>
+        <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+209"/>
         <source>injection</source>
         <translation>injection</translation>
     </message>
@@ -3346,32 +3022,32 @@ Would you like to overwrite them?</source>
         <translation>カスタムダンパライブラリ &apos;%1&apos; (%2) を読み込みました。</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+62"/>
+        <source>Stopped / Custom dumper library initialized.</source>
+        <translation>停止中 / カスタムダンパライブラリを初期化しました。</translation>
+    </message>
+    <message>
+        <location line="+77"/>
         <source>Disabling dumpers due to debuggee crash...</source>
         <translation>デバッグ対象がクラッシュしたためダンパの使用を禁止します...</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="-43"/>
         <source>The debuggee does not appear to be Qt application.</source>
         <translation>デバッグ対象は Qt のアプリケーションではありません。</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Initializing dumpers...</source>
         <translation>ダンパを初期化しています...</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Custom dumper library initialized.</source>
-        <translation>カスタムダンパライブラリを初期化しました。</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="-39"/>
         <source>The custom dumper library could not be initialized: %1</source>
         <translation>カスタムダンパライブラリが初期化できませんでした: %1</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+411"/>
         <source>Querying dumpers for &apos;%1&apos;/&apos;%2&apos; (%3)</source>
         <translation>ダンパの確認中 &apos;%1&apos;/&apos;%2&apos; (%3)</translation>
     </message>
@@ -3427,7 +3103,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Debugger::Internal::DebugMode</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+195"/>
+        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+196"/>
         <source>Debug</source>
         <translation>デバッグ</translation>
     </message>
@@ -3435,18 +3111,18 @@ Would you like to overwrite them?</source>
 <context>
     <name>Debugger::DebuggerManager</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+456"/>
+        <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+454"/>
         <source>Continue</source>
         <translation>続行</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+1198"/>
+        <location line="+1215"/>
         <source>Interrupt</source>
         <translation>割り込み</translation>
     </message>
     <message>
-        <location line="-1195"/>
+        <location line="-1212"/>
         <source>Reset Debugger</source>
         <translation>デバッガをリセット</translation>
     </message>
@@ -3460,14 +3136,6 @@ Would you like to overwrite them?</source>
         <source>Step Into</source>
         <translation>ステップ イン</translation>
     </message>
-    <message>
-        <source>Step Over Instruction</source>
-        <translation type="obsolete">ステップ飛ばし</translation>
-    </message>
-    <message>
-        <source>Step One Instruction</source>
-        <translation type="obsolete">ステップ実行</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Step Out</source>
@@ -3504,17 +3172,24 @@ Would you like to overwrite them?</source>
         <translation>逆方向</translation>
     </message>
     <message>
-        <source>Stop requested...</source>
-        <translation type="obsolete">停止させようとしています...</translation>
+        <location line="+1010"/>
+        <source>Turn off helper usage</source>
+        <translation>デバッグヘルパを使用しない</translation>
     </message>
     <message>
-        <location line="+223"/>
-        <source>Stopped.</source>
-        <translation>停止しました。</translation>
+        <location line="+6"/>
+        <source>The debugger could not load the debugging helper library.</source>
+        <translation>デバッグヘルパライブラリを読み込めませんでした。</translation>
     </message>
     <message>
-        <source>Running requested...</source>
-        <translation type="obsolete">実行しようとしています...</translation>
+        <location line="+1"/>
+        <source>The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each used Qt version separately. This can be done in the Qt preferences page by selecting a Qt installation and clicking on &apos;Rebuild&apos; in the &apos;Debugging Helper&apos; row.</source>
+        <translation>デバッグ ヘルパは Qt や STL のデータ型の値を分かりやすくする為に使われます。デバッグ ヘルパはシステムにインストールされている Qt の各バージョン、それぞれにおいてコンパイルされている必要があります。デバッグ・ヘルパをコンパイルするにはオプションの Qt バージョンのページで、使用する Qt バージョンを選択して &apos;リビルド&apos; をクリックして下さい。</translation>
+    </message>
+    <message>
+        <location line="-782"/>
+        <source>Stopped.</source>
+        <translation>停止しました。</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3528,79 +3203,52 @@ Would you like to overwrite them?</source>
         <translation>ブレークポイントの状態を変更するには、アプリケーションが完全に起動しているか停止している必要があります。</translation>
     </message>
     <message>
-        <location line="+113"/>
-        <source>Debugging VS executables is currently not enabled.</source>
-        <translation>Visual Studioで作成した実行ファイルのデバッグは現在許可されていません。</translation>
-    </message>
-    <message>
-        <source>The debugging helper is used to nicely format the values of Qt data types and some STL data types. It must be compiled for each Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on &apos;Rebuild&apos; for the debugging helper.</source>
-        <translation type="obsolete">デバッグヘルパはQtのデータ型やSTLデータ型の値を読みやすく整形するために使用されています。ヘルパは各 Qt のバージョンごとにコンパイルする必要があります。デバッグヘルパのコンパイルは Qt の設定ページでインストールされている Qt を選択し、&apos;リビルド&apos;ボタンを押して行います。</translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+177"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <source>Cannot debug &apos;%1&apos;: %2</source>
-        <translation type="obsolete">%1 をデバッグできません: %2</translation>
-    </message>
-    <message>
-        <source>Settings...</source>
-        <translation type="obsolete">設定...</translation>
-    </message>
-    <message>
-        <location line="+173"/>
+        <location line="+176"/>
         <source>Save Debugger Log</source>
         <translation>デバッガ ログを保存</translation>
     </message>
     <message>
-        <location line="+315"/>
-        <source>The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on &apos;Rebuild&apos; for the debugging helper.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+171"/>
+        <location line="+489"/>
         <source>Stop Debugger</source>
         <translation>デバッガを停止</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-179"/>
         <source>Open Qt preferences</source>
         <translation>Qt の設定画面を開く</translation>
     </message>
     <message>
-        <location line="-755"/>
+        <location line="-761"/>
         <source>Exited.</source>
-        <translation type="unfinished"></translation>
+        <translation>終了しました。</translation>
     </message>
     <message>
         <location line="+128"/>
         <source>The application requires the debugger engine &apos;%1&apos;, which is disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>アプリケーションが要求するデバッグ エンジン &apos;%1&apos; は、使用できません。</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+125"/>
         <source>Starting debugger for tool chain &apos;%1&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation>ツール チェイン &apos;%1&apos; のデバッグを開始しています...</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Cannot debug &apos;%1&apos; (tool chain: &apos;%2&apos;): %3</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; (ツール チェイン: &apos;%2&apos;) のデバッグができません: %3</translation>
     </message>
     <message>
-        <location line="+472"/>
+        <location line="+479"/>
         <source>%1 (explicitly set in the Debugger Options)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Turn helper usage off</source>
-        <translation>デバッグヘルパを使用しない</translation>
+        <translation>%1 (デバッガ オプション内で設定)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+13"/>
         <source>Continue anyway</source>
         <translation>無視して続行</translation>
     </message>
@@ -3609,11 +3257,6 @@ Would you like to overwrite them?</source>
         <source>Debugging helper missing</source>
         <translation>デバッグヘルパが見つかりません</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>The debugger did not find the debugging helper library.</source>
-        <translation>デバッグヘルパライブラリが見つかりませんでした。</translation>
-    </message>
 </context>
 <context>
     <name>Debugger::Internal::DebuggerOutputWindow</name>
@@ -3626,7 +3269,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Debugger::Internal::DebuggerPlugin</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+265"/>
+        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+323"/>
         <source>Option &apos;%1&apos; is missing the parameter.</source>
         <translation>オプション %1 に必要なパラメータが不足しています。</translation>
     </message>
@@ -3660,14 +3303,6 @@ Would you like to overwrite them?</source>
         <source>Attach to Core...</source>
         <translation>コアファイルへアタッチ...</translation>
     </message>
-    <message>
-        <source>Attach to Running Tcf Agent...</source>
-        <translation type="obsolete">実行中の TCF エージェントにアタッチします...</translation>
-    </message>
-    <message>
-        <source>This attaches to a running &apos;Target Communication Framework&apos; agent.</source>
-        <translation type="obsolete">実行中の &apos;Target Communication Framework&apos; のエージェントにアタッチします。</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Start and Attach to Remote Application...</source>
@@ -3731,7 +3366,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+17"/>
         <source>Attaching to core %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>コアファイル %1 にアタッチします。</translation>
     </message>
     <message>
         <location line="-601"/>
@@ -3741,7 +3376,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="-41"/>
         <source>Detach Debugger</source>
-        <translation>デバッガのデタッチ</translation>
+        <translation>デバッガをデタッチ</translation>
     </message>
     <message>
         <location line="+48"/>
@@ -3750,10 +3385,21 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>Debugger::Internal::DebuggerRunner</name>
+    <name>Debugger::Internal::DebuggerListener</name>
     <message>
-        <source>Debug</source>
-        <translation type="obsolete">デバッグ</translation>
+        <location line="-478"/>
+        <source>Close Debugging Session</source>
+        <translation>デバッグセッションを閉じる</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>A debugging session is still in progress. Would you like to terminate it?</source>
+        <translation>デバッグセッションは、まだ実行中です。デバッグセッションを終了しますか?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>A debugging session is still in progress. Terminating the session in the current state (%1) can leave the target in an inconsistent state. Would you still like to terminate it?</source>
+        <translation>デバッグセッションは、まだ実行中です。終了しようとしているセッションの現状態は (%1) ですが、終了すると不整合状態になる可能性があります。デバッグセッションを終了しますか?</translation>
     </message>
 </context>
 <context>
@@ -3781,32 +3427,32 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+7"/>
         <source>Show a message box when receiving a signal</source>
-        <translation type="unfinished"></translation>
+        <translation>シグナル受信中にメッセージボックスを表示する</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Log time stamps</source>
-        <translation type="unfinished"></translation>
+        <translation>タイムスタンプを表示</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Operate by instruction</source>
-        <translation type="unfinished"></translation>
+        <translation>命令で操作</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>This switches the debugger to instruction-wise operation mode. In this mode, stepping operates on single instructions and the source location view also shows the disassembled instructions.</source>
-        <translation type="unfinished"></translation>
+        <translation>このオプションでデバッガを命令操作モードに切り替えます。この操作モードにすると、ソース位置ビューと逆アセンブルビューにおけるステップの操作は1命令毎の操作になります。</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Dereference pointers automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>自動的にポインタを逆参照する</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>This switches the Locals&amp;Watchers view to automatically derefence pointers. This saves a level in the tree view, but also loses data for the now-missing intermediate level.</source>
-        <translation type="unfinished"></translation>
+        <translation>このオプションでローカル変数&amp;監視式ビューで自動的にポインタを逆参照するかどうかを切り替えます。これはツリービューの階層にも作用し、表示されていない中間レベルのデータが失われたりします。</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -3824,65 +3470,62 @@ Would you like to overwrite them?</source>
         <translation>別ウィンドウで式 &quot;%1&quot; を監視</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+47"/>
+        <source>Use code model</source>
+        <translation>コード モデルを使用する</translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Use tooltips in main editor when debugging</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッグ中のメイン エディタでツールチップを使用する</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Checking this will enable tooltips for variable values during debugging. Since this can slow down debugging and does not provide reliable information as it does not use scope information, it is switched off by default.</source>
-        <translation type="unfinished">デバッグ中に変数の値をツールチップで表示します。&lt;br&gt;しかしデバッグ実行の速度が低下する上に、スコープを無視した不確かな情報しか表示しない為&lt;br&gt;デフォルトではチェックOFFとなっています。</translation>
+        <translation>デバッグ中に変数の値をツールチップで表示します。しかしデバッグ実行の速度が低下する上に、スコープを無視した不確かな情報しか表示しない為、デフォルトではチェックOFFとなっています。</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Use tooltips in locals view when debugging</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッグ中のローカル変数と監視式 ビューでツールチップを使用する</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Checking this will enable tooltips in the locals view during debugging.</source>
-        <translation type="unfinished"></translation>
+        <translation>これをチェックするとデバッグ中、ローカル変数 ビューでツールチップが有効になります。</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Use tooltips in breakpoints view when debugging</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッグ中のブレークポイント ビューでツールチップを使用する</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Checking this will enable tooltips in the breakpoints view during debugging.</source>
-        <translation type="unfinished"></translation>
+        <translation>これをチェックするとデバッグ中、ブレークポイント ビューでツールチップが有効になります。</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Show address data in breakpoints view when debugging</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッグ中にブレークポイント ビューにアドレス データを表示する</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Checking this will show a column with address information in the breakpoint view during debugging.</source>
-        <translation type="unfinished"></translation>
+        <translation>これをチェックすると、デバッグ中にブレークポイント ビューでアドレス情報が表示されるようになります。</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Show address data in stack view when debugging</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッグ中にスタック ビューにアドレス データを表示する</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Checking this will show a column with address information in the stack view during debugging.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Expand item</source>
-        <translation type="obsolete">項目を展開</translation>
-    </message>
-    <message>
-        <source>Collapse item</source>
-        <translation type="obsolete">項目を折りたたむ</translation>
+        <translation>これをチェックすると、デバッグ中にスタック ビューでアドレス情報が表示されるようになります。</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-114"/>
         <source>Use debugging helper</source>
         <translation>デバッグヘルパを使用する</translation>
     </message>
@@ -3892,7 +3535,7 @@ Would you like to overwrite them?</source>
         <translation>デバッグヘルパをデバッグする</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+15"/>
         <source>Recheck debugging helper availability</source>
         <translation>デバッグヘルパが利用可能か再チェックする</translation>
     </message>
@@ -3901,39 +3544,11 @@ Would you like to overwrite them?</source>
         <source>Synchronize breakpoints</source>
         <translation>ブレークポイントの同期</translation>
     </message>
-    <message>
-        <source>Hexadecimal</source>
-        <translation type="obsolete">16進数</translation>
-    </message>
-    <message>
-        <source>Decimal</source>
-        <translation type="obsolete">10進数</translation>
-    </message>
-    <message>
-        <source>Octal</source>
-        <translation type="obsolete">8進数</translation>
-    </message>
-    <message>
-        <source>Binary</source>
-        <translation type="obsolete">2進数</translation>
-    </message>
-    <message>
-        <source>Raw</source>
-        <translation type="obsolete">バイナリ</translation>
-    </message>
-    <message>
-        <source>Natural</source>
-        <translation type="obsolete">自動</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Automatically quit debugger</source>
         <translation>デバッガを自動的に終了</translation>
     </message>
-    <message>
-        <source>Use tooltips when debugging</source>
-        <translation type="obsolete">デバッグ中にツールチップを使う</translation>
-    </message>
     <message>
         <location line="+55"/>
         <source>List source files</source>
@@ -3963,7 +3578,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>Debugger::Internal::DebuggingHelperOptionPage</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="-315"/>
+        <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+142"/>
         <source>Debugging Helper</source>
         <translation>デバッグヘルパ</translation>
     </message>
@@ -3973,189 +3588,115 @@ Would you like to overwrite them?</source>
         <translation>デバッグヘルパの位置を選択</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+35"/>
         <source>Ctrl+Shift+F11</source>
         <translation>Ctrl+Shift+F11</translation>
     </message>
 </context>
-<context>
-    <name>Debugger::Internal::DisassemblerHandler</name>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">アドレス</translation>
-    </message>
-    <message>
-        <source>Symbol</source>
-        <translation type="obsolete">シンボル</translation>
-    </message>
-    <message>
-        <source>Mnemonic</source>
-        <translation type="obsolete">ニーモニック</translation>
-    </message>
-</context>
-<context>
-    <name>Debugger::Internal::DisassemblerWindow</name>
-    <message>
-        <source>Disassembler</source>
-        <translation type="obsolete">逆アセンブラ</translation>
-    </message>
-    <message>
-        <source>Adjust column widths to contents</source>
-        <translation type="obsolete">内容に合わせて列幅を調整</translation>
-    </message>
-    <message>
-        <source>Always adjust column widths to contents</source>
-        <translation type="obsolete">常に内容に合わせて列幅を調整</translation>
-    </message>
-    <message>
-        <source>Reload disassembler listing</source>
-        <translation type="obsolete">逆アセンブルのリストを再読込</translation>
-    </message>
-    <message>
-        <source>Always reload disassembler listing</source>
-        <translation type="obsolete">常に逆アセンブルのリストを再読込</translation>
-    </message>
-</context>
 <context>
     <name>Debugger::Internal::GdbEngine</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+304"/>
+        <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+306"/>
         <source>The Gdb process failed to start. Either the invoked program &apos;%1&apos; is missing, or you may have insufficient permissions to invoke the program.</source>
-        <translation>gdb プロセスの開始に失敗しました。gdb コマンド &apos;%1&apos; が見つからないか、コマンドを起動する為のパーミッションがない可能性があります。</translation>
+        <translation>Gdb プロセスの開始に失敗しました。Gdb コマンド &apos;%1&apos; が見つからないか、コマンドを起動する為のパーミッションがない可能性があります。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The Gdb process crashed some time after starting successfully.</source>
-        <translation>gdb プロセスは起動に成功した後、クラッシュしました。</translation>
+        <translation>Gdb プロセスは起動に成功した後、クラッシュしました。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
-        <translation>直前のwaitFor...() 関数はタイムアウトしました。QProcessの状態に変化がありませんので、再度 waitFor...() を呼び出せます。</translation>
+        <translation>直前の waitFor...() 関数はタイムアウトしました。QProcessの状態に変化がないので、再度 waitFor...() を呼び出せます。</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>An error occurred when attempting to write to the Gdb process. For example, the process may not be running, or it may have closed its input channel.</source>
-        <translation>gdb プロセスへの要求送信時にエラーが発生しました。プロセスが既に終了しているか、入力チャネルが閉じられてしまっている可能性があります。</translation>
+        <translation>Gdb プロセスへの要求送信時にエラーが発生しました。プロセスが既に終了しているか、入力チャネルが閉じられてしまっている可能性があります。</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>An error occurred when attempting to read from the Gdb process. For example, the process may not be running.</source>
-        <translation>gdb プロセスからの応答待機中にエラーが発生しました。プロセスが既に終了している可能性があります。</translation>
-    </message>
-    <message>
-        <source>An unknown error in the Gdb process occurred. This is the default return value of error().</source>
-        <translation type="obsolete">gdb プロセス起動時に不明なエラーが発生しました。これは、error()のデフォルトの戻り値です。</translation>
-    </message>
-    <message>
-        <location line="+1016"/>
-        <source>Error</source>
-        <translation>エラー</translation>
-    </message>
-    <message>
-        <source>Debugger Error</source>
-        <translation type="obsolete">デバッガエラー</translation>
+        <translation>Gdb プロセスからの応答待機中にエラーが発生しました。プロセスが既に終了している可能性があります。</translation>
     </message>
     <message>
-        <location line="-610"/>
+        <location line="+448"/>
         <source>Stopping temporarily.</source>
         <translation>一時停止中です。</translation>
     </message>
     <message>
-        <location line="+122"/>
-        <source>Continuing after temporary stop.</source>
-        <translation>一時停止後の継続中です。</translation>
-    </message>
-    <message>
-        <source>Core file loaded.</source>
-        <translation type="obsolete">コアファイルを読み込みました。</translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+253"/>
         <source>Jumped. Stopped.</source>
         <translation>ジャンプして停止しました。</translation>
     </message>
     <message>
-        <location line="+223"/>
-        <source>Run to Function finished. Stopped.</source>
-        <translation>指定された関数まで実行し、停止しました。</translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+153"/>
         <source>Loading %1...</source>
         <translation>%1 を読み込んでいます...</translation>
     </message>
     <message>
-        <location line="-739"/>
+        <location line="-851"/>
         <source>An unknown error in the Gdb process occurred. </source>
-        <translation type="unfinished"></translation>
+        <translation>Gdb プロセス内で不明なエラーが発生しました。</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+238"/>
         <source>Running...</source>
-        <translation type="unfinished">実行しています...</translation>
+        <translation>実行しています...</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+97"/>
         <source>Stop requested...</source>
-        <translation type="unfinished">停止させようとしています...</translation>
+        <translation>停止させようとしています...</translation>
     </message>
     <message>
-        <location line="+141"/>
-        <location line="+16"/>
+        <location line="+197"/>
+        <location line="+29"/>
+        <location line="+3"/>
         <source>Executable failed</source>
-        <translation type="unfinished"></translation>
+        <translation>実行失敗</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-31"/>
         <source>Process failed to start.</source>
-        <translation type="unfinished"></translation>
+        <translation>プロセスの開始に失敗しました。</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+24"/>
+        <location line="+8"/>
         <source>Executable failed: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
-        <source>Function reached. Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>実行失敗: %1</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+228"/>
         <source>Program exited with exit code %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>プログラムは終了コード %1 で終了しました。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Program exited after receiving signal %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>シグナル %1 を受けてプログラムが終了しました。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Program exited normally.</source>
-        <translation type="unfinished"></translation>
+        <translation>プログラムは正常に終了しました。</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+163"/>
         <source>Stopped at breakpoint.</source>
         <translation>ブレークポイントで停止。</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+9"/>
         <source>&lt;p&gt;The inferior stopped because it received a signal from the Operating System.&lt;p&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;Signal name : &lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Signal meaning : &lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+1"/>
-        <source> &lt;Unknown&gt; </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;プログラムは、オペレーティング システムからのシグナルを受信した為、停止しました。&lt;p&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;シグナル名 : &lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;シグナルの意味 : &lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
         <source>Signal received</source>
-        <translation type="unfinished"></translation>
+        <translation>シグナルを受信しました</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -4163,7 +3704,7 @@ Would you like to overwrite them?</source>
         <translation>停止: &quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+64"/>
         <source>The debugger you are using identifies itself as:</source>
         <translation>使用中のデバッガ:</translation>
     </message>
@@ -4172,158 +3713,187 @@ Would you like to overwrite them?</source>
         <source>This version is not officially supported by Qt Creator.
 Debugging will most likely not work well.
 Using gdb 6.7 or later is strongly recommended.</source>
-        <translation>このバージョンのgdbはQt Creatorで公式にサポートされていません。
+        <translation>このバージョンの Gdb はQt Creatorで公式にサポートされていません。
 デバッグ実行は、ほとんど正しく動作しない可能性があります。
-gdb 6.7以降をお使いになる事を強く推奨します。</translation>
+Gdb 6.7以降をお使いになる事を強く推奨します。</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Starting executable failed</source>
-        <translation type="unfinished"></translation>
+        <location line="+265"/>
+        <source>Continuing after temporary stop...</source>
+        <translation>一時停止後の継続中です...</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Starting executable failed:
-</source>
-        <translation>実行ファイルの開始に失敗しました:
-</translation>
+        <location line="+8"/>
+        <source>Running requested...</source>
+        <translation>実行しようとしています...</translation>
     </message>
     <message>
-        <location line="+129"/>
-        <source>Running requested...</source>
-        <translation type="unfinished">実行しようとしています...</translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Step requested...</source>
-        <translation type="unfinished"></translation>
+        <translation>ステップ実行しようとしています...</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Step by instruction requested...</source>
-        <translation type="unfinished"></translation>
+        <translation>命令毎にステップ実行しようとしています...</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Finish function requested...</source>
-        <translation type="unfinished"></translation>
+        <translation>終了しようとしています...</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Step next requested...</source>
-        <translation type="unfinished"></translation>
+        <translation>続けてステップ実行しようとしています...</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+18"/>
         <source>Step next instruction requested...</source>
-        <translation type="unfinished"></translation>
+        <translation>続けて命令毎にステップ実行しようとしています...</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Run to line %1 requested...</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 行目まで実行しようとしています...</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+13"/>
         <source>Run to function %1 requested...</source>
-        <translation type="unfinished"></translation>
+        <translation>関数: %1 まで実行しようとしています...</translation>
+    </message>
+    <message>
+        <location line="+571"/>
+        <source>&lt;unknown&gt;</source>
+        <comment>address</comment>
+        <extracomment>End address of loaded module</extracomment>
+        <translation>&lt;不明&gt;</translation>
+    </message>
+    <message>
+        <location line="+145"/>
+        <source>Jumping out of bogus frame...</source>
+        <translation>偽フレームから抜け出します...</translation>
     </message>
     <message numerus="yes">
-        <location line="+1445"/>
+        <location line="+776"/>
         <source>Dumper version %1, %n custom dumpers found.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>ダンパ バージョン %1、%n 個のカスタムダンパが見つかりました。</numerusform>
         </translation>
     </message>
     <message>
-        <location line="+932"/>
+        <location line="+708"/>
+        <source>The debugging helper library was not found at %1.</source>
+        <translation>デバッグヘルパライブラリが %1 に見つかりませんでした。</translation>
+    </message>
+    <message>
+        <location line="+297"/>
         <location line="+25"/>
         <location line="+14"/>
         <source>Disassembler failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>逆アセンブル失敗: %1</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Adapter start failed</source>
-        <translation type="unfinished"></translation>
+        <location line="+33"/>
+        <source>Unable to start gdb &apos;%1&apos;: %2</source>
+        <translation>&apos;%1&apos; にある Gdb を開始できません: %2</translation>
+    </message>
+    <message>
+        <location line="+122"/>
+        <source>Gdb I/O Error</source>
+        <translation>Gdb I/O エラー</translation>
     </message>
     <message>
         <location line="+14"/>
-        <source>Inferior start preparation failed</source>
-        <translation type="unfinished"></translation>
+        <source>Unexpected Gdb Exit</source>
+        <translation>予期しない Gdb の終了</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Inferior prepared for startup.</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>The gdb process exited unexpectedly (%1).</source>
+        <translation>Gdb プロセスは予期せず終了しました (%1)。</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <source>Setting breakpoints...</source>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>crashed</source>
+        <translation>クラッシュ</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Starting inferior...</source>
-        <translation type="unfinished"></translation>
+        <location line="+0"/>
+        <source>code %1</source>
+        <translation>終了コード %1</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Inferior start failed</source>
-        <translation type="unfinished"></translation>
+        <location line="+11"/>
+        <source>Adapter start failed</source>
+        <translation>アダプタの開始が失敗しました</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Inferior shutdown failed</source>
-        <translation type="unfinished"></translation>
+        <location line="+39"/>
+        <source>Setting breakpoints...</source>
+        <translation>ブレークポイントの設定...</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Adapter crashed</source>
-        <translation type="unfinished"></translation>
+        <location line="-23"/>
+        <source>Starting inferior...</source>
+        <translation>プログラムを開始しています...</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Adapter shutdown failed</source>
-        <translation type="unfinished"></translation>
+        <location line="-3168"/>
+        <source> &lt;Unknown&gt; </source>
+        <comment>name</comment>
+        <translation> &lt;不明&gt; </translation>
     </message>
     <message>
-        <source>The upload process failed to start. Either the invoked script &apos;%1&apos; is missing, or you may have insufficient permissions to invoke the program.</source>
-        <translation type="obsolete">アップロードに失敗しました。実行するスクリプト &apos;%1&apos; が存在しないか、実行する権限がないため、プロセスが開始できません。</translation>
+        <location line="+1"/>
+        <source> &lt;Unknown&gt; </source>
+        <comment>meaning</comment>
+        <translation> &lt;不明&gt; </translation>
     </message>
     <message>
-        <source>The upload process crashed some time after starting successfully.</source>
-        <translation type="obsolete">アップロードの開始後にプロセスがクラッシュしました。</translation>
+        <location line="+132"/>
+        <source>Execution Error</source>
+        <translation>実行エラー</translation>
     </message>
     <message>
-        <source>An error occurred when attempting to write to the upload process. For example, the process may not be running, or it may have closed its input channel.</source>
-        <translation type="obsolete">アップロードプロセスへの書き込み時にエラーが発生しました。プロセスが動作していないか、入力チャネルが閉じられている可能性があります。</translation>
+        <location line="+1"/>
+        <source>Cannot continue debugged process:
+</source>
+        <translation>デバッグ プロセスを継続できません: 
+</translation>
     </message>
     <message>
-        <source>An error occurred when attempting to read from the upload process. For example, the process may not be running.</source>
-        <translation type="obsolete">アップロードプロセスからの読み込み時にエラーが発生しました。アップロードプロセスが動作していない可能性があります。</translation>
+        <location line="+3079"/>
+        <source>Inferior start failed</source>
+        <translation>プログラムを開始できませんでした</translation>
     </message>
     <message>
-        <source>An unknown error in the upload process occurred. This is the default return value of error().</source>
-        <translation type="obsolete">アップロードプロセスで不明なエラーが発生しました。error()がデフォルト値で呼び出されている場合などに生じるエラーです。</translation>
+        <location line="-2991"/>
+        <source>Inferior shutdown failed</source>
+        <translation>プログラムを終了できませんでした</translation>
+    </message>
+    <message>
+        <location line="+3011"/>
+        <source>Adapter crashed</source>
+        <translation>アダプタがクラッシュしました</translation>
     </message>
     <message>
-        <location line="-3714"/>
+        <location line="-4092"/>
         <source>Library %1 loaded.</source>
         <translation>ライブラリ &apos;%1&apos; を読み込みました。</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Library %1 unloaded.</source>
         <translation>ライブラリ &apos;%1&apos; を解放しました。</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Thread group %1 created.</source>
         <translation>スレッドグループ %1 を作成しました。</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Thread %1 created.</source>
         <translation>スレッド %1 を作成しました。</translation>
     </message>
@@ -4343,57 +3913,23 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <translation>スレッド %1 を選択しました。</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Reading %1...</source>
         <translation>%1 を読み込み中...</translation>
     </message>
     <message>
-        <source>Program exited with exit code %1</source>
-        <translation type="obsolete">プログラムは終了コード %1 で終了しました</translation>
-    </message>
-    <message>
-        <source>Program exited after receiving signal %1</source>
-        <translation type="obsolete">シグナル %1 を受けてプログラムが終了しました。</translation>
-    </message>
-    <message>
-        <source>Program exited normally</source>
-        <translation type="obsolete">プログラムは正常に終了しました。</translation>
-    </message>
-    <message>
-        <location line="+540"/>
+        <location line="+264"/>
         <source>Processing queued commands.</source>
         <translation>キューイングされたコマンドを処理しています。</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+168"/>
-        <location line="+20"/>
-        <location line="+104"/>
+        <location line="+525"/>
+        <location line="+120"/>
         <source>Stopped.</source>
         <translation>停止しました。</translation>
     </message>
     <message>
-        <source>Debugger Startup Failure</source>
-        <translation type="obsolete">デバッガの起動に失敗</translation>
-    </message>
-    <message>
-        <source>Cannot set up communication with child process: %1</source>
-        <translation type="obsolete">子プロセスと通信できません: %1</translation>
-    </message>
-    <message>
-        <source>Starting Debugger: </source>
-        <translation type="obsolete">デバッガを起動中: </translation>
-    </message>
-    <message>
-        <source>Cannot start debugger: %1</source>
-        <translation type="obsolete">デバッガの起動に失敗: %1</translation>
-    </message>
-    <message>
-        <source>Gdb Running...</source>
-        <translation type="obsolete">Gdb 実行中...</translation>
-    </message>
-    <message>
-        <location line="+2752"/>
+        <location line="+2964"/>
         <source>Cannot find debugger initialization script</source>
         <translation>デバッガ初期化スクリプトが見つかりません</translation>
     </message>
@@ -4403,71 +3939,25 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <translation>デバッガに設定されたスクリプトファイル &apos;%1&apos; にアクセスできません。もしスクリプトファイルが不要でしたら、スクリプトファイルの設定を消去してみてください。そうすればこの警告が出るのを回避できます。 </translation>
     </message>
     <message>
-        <source>Attached to running process. Stopped.</source>
-        <translation type="obsolete">実行中のプロセスにアタッチしました。停止中です。</translation>
-    </message>
-    <message>
-        <source>Connecting to remote server failed:</source>
-        <translation type="obsolete">リモートサーバへの接続に失敗しました。</translation>
-    </message>
-    <message>
-        <source>Debugger exited.</source>
-        <translation type="obsolete">デバッガを終了しました。</translation>
-    </message>
-    <message>
-        <source>&lt;could not retreive module information&gt;</source>
-        <translation type="obsolete">&lt;モジュール情報を取得できません&gt;</translation>
-    </message>
-    <message>
-        <location line="-2032"/>
+        <location line="-2167"/>
         <source>Unable to run &apos;%1&apos;: %2</source>
         <translation>&apos;%1&apos; を実行できません: %2</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <source>&lt;unknown&gt;</source>
-        <extracomment>End address of loaded module</extracomment>
-        <translation>&lt;不明&gt;</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+127"/>
         <location line="+8"/>
         <source>Retrieving data for stack view...</source>
         <translation>スタック ビュー用のデータを受信しています...</translation>
     </message>
-    <message>
-        <source>&apos;%1&apos; contains no identifier</source>
-        <translation type="obsolete">&apos;%1&apos; に識別子が見つかりません</translation>
-    </message>
-    <message>
-        <source>String literal %1</source>
-        <translation type="obsolete">文字列リテラル %1</translation>
-    </message>
-    <message>
-        <source>Cowardly refusing to evaluate expression &apos;%1&apos; with potential side effects</source>
-        <translation type="obsolete">副作用の可能性があるため、式 &apos;%1&apos; の評価を行いません</translation>
-    </message>
-    <message>
-        <location line="+402"/>
-        <source>&lt;not in scope&gt;</source>
-        <extracomment>Variable</extracomment>
-        <translation>&lt;スコープ範囲外&gt;</translation>
-    </message>
     <message numerus="yes">
-        <location line="+109"/>
+        <location line="+503"/>
         <source>Retrieving data for watch view (%n requests pending)...</source>
         <translation>
             <numerusform>監視ビュー用のデータを受信しています (%n 件の要求が保留中です)...</numerusform>
         </translation>
     </message>
-    <message numerus="yes">
-        <source>%n custom dumpers found.</source>
-        <translation type="obsolete">
-            <numerusform>%n 個のカスタムダンパが見つかりました。</numerusform>
-        </translation>
-    </message>
     <message>
-        <location line="+613"/>
+        <location line="+620"/>
         <source>&lt;0 items&gt;</source>
         <translation>&lt;項目なし&gt;</translation>
     </message>
@@ -4480,58 +3970,27 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         </translation>
     </message>
     <message>
-        <location line="+374"/>
-        <source>The dumper library was not found at %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Dumper injection loading triggered (%1)...</source>
-        <translation>ダンパ (%1) をインジェクションで読み込んでいます...</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Dumper loading (%1) failed: %2</source>
-        <translation>ダンパ (&apos;%1&apos;) の読込に失敗しました: %2</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Loading dumpers via debugger call (%1)...</source>
-        <translation>ダンパ (%1) をデバッグ呼び出しで読み込んでいます...</translation>
-    </message>
-    <message>
-        <location line="-726"/>
+        <location line="-303"/>
         <source>Finished retrieving data.</source>
         <translation>データの受信が完了しました。</translation>
     </message>
-    <message>
-        <source>Cannot evaluate expression: %1</source>
-        <translation type="obsolete">式が評価できません: %1</translation>
-    </message>
     <message>
         <location line="+43"/>
         <source>Debugging helpers not found.</source>
         <translation>デバッグヘルパが見つかりません。</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+121"/>
         <source>Custom dumper setup: %1</source>
         <translation>カスタム ダンパー 設定: %1</translation>
     </message>
     <message>
-        <location line="+290"/>
-        <source>%1 &lt;shadowed %2&gt;</source>
-        <extracomment>Variable %1 is the variable name, %2 is a simple count</extracomment>
-        <translation>%1 &lt;%2 個の隠された変数&gt;</translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+356"/>
         <source>&lt;shadowed&gt;</source>
-        <extracomment>Type of local variable or parameter shadowed by another</extracomment>
         <translation>&lt;隠された変数&gt;</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+134"/>
         <source>&lt;n/a&gt;</source>
         <translation>&lt;N/A&gt;</translation>
     </message>
@@ -4546,35 +4005,18 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <extracomment>About variable&apos;s value</extracomment>
         <translation>&lt;不明&gt;</translation>
     </message>
-    <message>
-        <location line="+16"/>
-        <source>Unknown error: </source>
-        <translation>未知のエラー:</translation>
-    </message>
-    <message>
-        <source>%1 is a typedef.</source>
-        <translation type="obsolete">%1 は typedef です。</translation>
-    </message>
-    <message>
-        <source>Retrieving data for tooltip...</source>
-        <translation type="obsolete">ツールチップ用のデータを受信しています...</translation>
-    </message>
-    <message>
-        <source>The dumper library &apos;%1&apos; does not exist.</source>
-        <translation type="obsolete">ダンパライブラリ &apos;%1&apos; は存在しません。</translation>
-    </message>
 </context>
 <context>
     <name>Debugger::Internal::GdbOptionsPage</name>
     <message>
         <location filename="../../../src/plugins/debugger/gdb/gdboptionspage.cpp" line="+8"/>
         <source>Gdb</source>
-        <translation>gdb</translation>
+        <translation>Gdb</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Choose Gdb Location</source>
-        <translation>gdb のパスを選択してください</translation>
+        <translation>Gdb のパスを選択してください</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -4690,14 +4132,10 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
 </context>
 <context>
     <name>Debugger::Internal::OutputCollector</name>
-    <message>
-        <source>Cannot create temporary file: %2</source>
-        <translation type="obsolete">一時ファイルを作成できません: %2</translation>
-    </message>
     <message>
         <location filename="../../../src/plugins/debugger/outputcollector.cpp" line="+95"/>
         <source>Cannot create temporary file: %1</source>
-        <translation type="unfinished">一時ファイルを作成できません: %1</translation>
+        <translation>一時ファイルを作成できません: %1</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -4720,11 +4158,7 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
     <message>
         <location line="+1"/>
         <source>Value (base %1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">値</translation>
+        <translation>値 (%1進表示)</translation>
     </message>
 </context>
 <context>
@@ -4737,32 +4171,32 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
     <message>
         <location line="+25"/>
         <source>Open memory editor</source>
-        <translation type="unfinished"></translation>
+        <translation>メモリ エディタを開く</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Open memory editor at %1</source>
-        <translation type="unfinished"></translation>
+        <translation>アドレス位置 %1 でメモリ エディタを開く</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Hexadecimal</source>
-        <translation type="unfinished">16進数</translation>
+        <translation>16進数</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Decimal</source>
-        <translation type="unfinished">10進数</translation>
+        <translation>10進数</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Octal</source>
-        <translation type="unfinished">8進数</translation>
+        <translation>8進数</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Binary</source>
-        <translation type="unfinished">2進数</translation>
+        <translation>2進数</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -4779,17 +4213,13 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <source>Reload register listing</source>
         <translation>レジスタのリストを再読込</translation>
     </message>
-    <message>
-        <source>Always reload register listing</source>
-        <translation type="obsolete">常にレジスタのリストを再読込</translation>
-    </message>
 </context>
 <context>
     <name>Debugger::Internal::ScriptEngine</name>
     <message>
         <location filename="../../../src/plugins/debugger/script/scriptengine.cpp" line="+244"/>
         <source>Running requested...</source>
-        <translation type="unfinished">実行しようとしています...</translation>
+        <translation>実行しようとしています...</translation>
     </message>
     <message>
         <location line="+228"/>
@@ -4815,26 +4245,15 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
 </context>
 <context>
     <name>Debugger::Internal::SourceFilesModel</name>
-    <message>
-        <source>Internal name</source>
-        <translation type="obsolete">内部名</translation>
-    </message>
-    <message>
-        <source>Full name</source>
-        <translation type="obsolete">完全名</translation>
-    </message>
-</context>
-<context>
-    <name>SourceFilesModel</name>
     <message>
         <location filename="../../../src/plugins/debugger/sourcefileswindow.cpp" line="+98"/>
         <source>Internal name</source>
-        <translation type="unfinished">内部名</translation>
+        <translation>内部名</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Full name</source>
-        <translation type="unfinished">完全名</translation>
+        <translation>完全名</translation>
     </message>
 </context>
 <context>
@@ -4863,17 +4282,17 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
 <context>
     <name>Debugger::Internal::StackHandler</name>
     <message>
-        <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+114"/>
+        <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+143"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&lt;More&gt;</source>
-        <translation>&lt;さらに&gt;</translation>
+        <translation>&lt;さらに表示&gt;</translation>
     </message>
     <message>
-        <location line="-61"/>
+        <location line="-78"/>
         <location line="+14"/>
         <source>Address:</source>
         <translation>アドレス:</translation>
@@ -4900,16 +4319,16 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <location line="-13"/>
         <location line="+14"/>
         <source>From:</source>
-        <translation type="unfinished"></translation>
+        <translation>From:</translation>
     </message>
     <message>
         <location line="-13"/>
         <location line="+14"/>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>To:</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+103"/>
         <source>Level</source>
         <translation>階層</translation>
     </message>
@@ -4939,22 +4358,22 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
     <message>
         <location line="+159"/>
         <source>Function</source>
-        <translation type="unfinished">関数</translation>
+        <translation>関数</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>File</source>
-        <translation type="unfinished">ファイル</translation>
+        <translation>ファイル</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Line</source>
-        <translation type="unfinished">行番号</translation>
+        <translation>行番号</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Address</source>
-        <translation type="unfinished">アドレス</translation>
+        <translation>アドレス</translation>
     </message>
     <message>
         <location line="-28"/>
@@ -4964,12 +4383,12 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
     <message>
         <location line="+3"/>
         <source>Thread: %1 at %2 (0x%3)</source>
-        <translation type="unfinished"></translation>
+        <translation>スレッド: %1 は %2 (0x%3) で停止中</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Thread: %1 at %2, %3:%4 (0x%5)</source>
-        <translation type="unfinished"></translation>
+        <translation>スレッド: %1 は %3:%4 行目の %2 (0x%5) で停止中</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -4985,29 +4404,29 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <translation>スタック</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+41"/>
         <source>Copy contents to clipboard</source>
         <translation>内容をクリップボードにコピー</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open memory editor</source>
-        <translation type="unfinished"></translation>
+        <translation>メモリ エディタを開く</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Open memory editor at %1</source>
-        <translation type="unfinished"></translation>
+        <translation>アドレス位置 %1 でメモリ エディタを開く</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open disassembler</source>
-        <translation type="unfinished"></translation>
+        <translation>逆アセンブラを開く</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Open disassembler at %1</source>
-        <translation type="unfinished"></translation>
+        <translation>アドレス位置 %1 で逆アセンブラを開く</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -5023,7 +4442,7 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
 <context>
     <name>Debugger::Internal::StartExternalDialog</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="-203"/>
+        <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="-142"/>
         <source>Select Executable</source>
         <translation>実行ファイルを選択</translation>
     </message>
@@ -5046,26 +4465,15 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <translation>実行ファイルを選択</translation>
     </message>
 </context>
-<context>
-    <name>Debugger::Internal::TcfEngine</name>
-    <message>
-        <source>%1.</source>
-        <translation type="obsolete">%1.</translation>
-    </message>
-    <message>
-        <source>Stopped.</source>
-        <translation type="obsolete">停止しました。</translation>
-    </message>
-</context>
 <context>
     <name>Debugger::Internal::ThreadsWindow</name>
     <message>
-        <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+53"/>
+        <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+46"/>
         <source>Thread</source>
         <translation>スレッド</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+21"/>
         <source>Adjust column widths to contents</source>
         <translation>内容に合わせて列幅を調整</translation>
     </message>
@@ -5078,15 +4486,21 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
 <context>
     <name>Debugger::Internal::WatchData</name>
     <message>
-        <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+70"/>
+        <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+72"/>
+        <location line="+250"/>
         <source>&lt;not in scope&gt;</source>
         <translation>&lt;スコープ範囲外&gt;</translation>
     </message>
+    <message>
+        <location line="+8"/>
+        <source>%1 &lt;shadowed %2&gt;</source>
+        <translation>%1 &lt;%2 個の隠された変数&gt;</translation>
+    </message>
 </context>
 <context>
     <name>Debugger::Internal::WatchHandler</name>
     <message>
-        <location line="+224"/>
+        <location line="-27"/>
         <source>Expression</source>
         <translation>式</translation>
     </message>
@@ -5108,24 +4522,20 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
     <message>
         <location line="+1"/>
         <source>Internal ID</source>
-        <translation type="unfinished"></translation>
+        <translation>内部ID</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generation</source>
-        <translation type="unfinished"></translation>
+        <translation>世代</translation>
     </message>
     <message>
-        <location line="+1074"/>
+        <location line="+1121"/>
         <source>&lt;Edit&gt;</source>
-        <translation type="unfinished">&lt;編集&gt;</translation>
-    </message>
-    <message>
-        <source>iname</source>
-        <translation type="obsolete">内部名</translation>
+        <translation>&lt;編集&gt;</translation>
     </message>
     <message>
-        <location line="-1056"/>
+        <location line="-1090"/>
         <source>Root</source>
         <translation>ルート</translation>
     </message>
@@ -5145,11 +4555,7 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <translation>監視式</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="obsolete">名前</translation>
-    </message>
-    <message>
-        <location line="-33"/>
+        <location line="-46"/>
         <source>Value</source>
         <translation>値</translation>
     </message>
@@ -5158,55 +4564,43 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <source>Type</source>
         <translation>åž‹</translation>
     </message>
-    <message>
-        <source>&lt;No Locals&gt;</source>
-        <translation type="obsolete">&lt;ローカル変数なし&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;No Tooltip&gt;</source>
-        <translation type="obsolete">&lt;ツールチップなし&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;No Watchers&gt;</source>
-        <translation type="obsolete">&lt;監視式なし&gt;</translation>
-    </message>
 </context>
 <context>
     <name>Debugger::Internal::WatchModel</name>
     <message>
-        <location line="+443"/>
+        <location line="+463"/>
         <source>decimal</source>
-        <translation type="unfinished"></translation>
+        <translation>10進数</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>hexadecimal</source>
-        <translation type="unfinished"></translation>
+        <translation>16進数</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>binary</source>
-        <translation type="unfinished"></translation>
+        <translation>2進数</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>octal</source>
-        <translation type="unfinished"></translation>
+        <translation>8進数</translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+86"/>
         <source>Name</source>
-        <translation type="unfinished">名前</translation>
+        <translation>名前</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Value</source>
-        <translation type="unfinished">値</translation>
+        <translation>値</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Type</source>
-        <translation type="unfinished">åž‹</translation>
+        <translation>åž‹</translation>
     </message>
 </context>
 <context>
@@ -5219,40 +4613,45 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
     <message>
         <location line="+95"/>
         <source>Change format for type &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; 型のフォーマットを変更</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Change format for expression &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>式 &apos;%1&apos; のフォーマットを変更</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Change format for type</source>
-        <translation type="unfinished"></translation>
+        <translation>型のフォーマットを変更</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Change format for expression</source>
-        <translation type="unfinished"></translation>
+        <translation>式のフォーマットを変更</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Select widget to watch</source>
-        <translation type="unfinished"></translation>
+        <translation>監視対象のウィジェットを選択</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Open memory editor...</source>
-        <translation type="unfinished"></translation>
+        <translation>メモリ エディタを開く...</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Open memory editor at %1</source>
-        <translation type="unfinished"></translation>
+        <translation>アドレス位置 %1 でメモリ エディタを開く</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+17"/>
+        <source>Refresh code model snapshot</source>
+        <translation>コードモデルスナップショットを更新</translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Adjust column widths to contents</source>
         <translation>内容に合わせて列幅を調整</translation>
     </message>
@@ -5262,14 +4661,10 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <translation>常に内容に合わせて列幅を調整</translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="-38"/>
         <source>Insert new watch item</source>
         <translation>新しい監視式を挿入</translation>
     </message>
-    <message>
-        <source>&lt;Edit&gt;</source>
-        <translation type="obsolete">&lt;編集&gt;</translation>
-    </message>
 </context>
 <context>
     <name>DebuggerPane</name>
@@ -5289,7 +4684,7 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
     <message>
         <location filename="../../../src/plugins/debugger/dumperoptionpage.ui"/>
         <source>This will enable nice display of Qt and Standard Library objects in the Locals&amp;Watchers view</source>
-        <translation>デバッグヘルパはローカル変数と監視式での Qt や STL の変数の値の表示を改善します。</translation>
+        <translation>デバッグヘルパを使用すると、ローカル変数と監視式 ビュー内で Qt や STL オブジェクトが分かりやすく表示されます</translation>
     </message>
     <message>
         <location/>
@@ -5321,6 +4716,16 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <source>Debugging helper</source>
         <translation>デバッグヘルパ</translation>
     </message>
+    <message>
+        <location/>
+        <source>Makes use of Qt Creator&apos;s code model to find out if a variable has already been assigned a value at the point the debugger interrupts.</source>
+        <translation>このオプションをチェックすると、変数がデバッガ割り込み時に値が代入されているかどうかを調査する為に Qt Creator のコードモデルが使用されるようになります。</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Use code model</source>
+        <translation>コード モデルを使用する</translation>
+    </message>
 </context>
 <context>
     <name>DependenciesModel</name>
@@ -5340,25 +4745,17 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
     <message>
         <location line="+143"/>
         <source>%1 has no dependencies.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 が依存しているプロジェクトはありません。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 depends on %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は %2 に依存しています。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 depends on: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Project Dependencies</source>
-        <translation type="obsolete">プロジェクトの依存関係</translation>
-    </message>
-    <message>
-        <source>Project Dependencies:</source>
-        <translation type="obsolete">プロジェクトの依存関係:</translation>
+        <translation>%1 の依存先: %2.</translation>
     </message>
 </context>
 <context>
@@ -5381,23 +4778,12 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
     <message>
         <location filename="../../../src/plugins/designer/designerconstants.h" line="+38"/>
         <source>Designer</source>
-        <translation type="unfinished">デザイナ</translation>
+        <translation>デザイナ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Class Generation</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Designer::Internal::EditorWidget</name>
-    <message>
-        <source>Action editor</source>
-        <translation type="obsolete">アクション エディタ</translation>
-    </message>
-    <message>
-        <source>Signals and slots editor</source>
-        <translation type="obsolete">シグナル/スロット エディタ</translation>
+        <translation>クラス 生成</translation>
     </message>
 </context>
 <context>
@@ -5411,7 +4797,7 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
 <context>
     <name>Designer::Internal::FormClassWizardPage</name>
     <message>
-        <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+148"/>
+        <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+149"/>
         <source>%1 - Error</source>
         <translation>%1 - エラー</translation>
     </message>
@@ -5425,30 +4811,6 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <source>Class</source>
         <translation>クラス</translation>
     </message>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">さらに</translation>
-    </message>
-    <message>
-        <source>Embedding of the UI class</source>
-        <translation type="obsolete">UIクラスの埋め込み方法</translation>
-    </message>
-    <message>
-        <source>Aggregation as a pointer member</source>
-        <translation type="obsolete">個々のメンバとして集合体</translation>
-    </message>
-    <message>
-        <source>Aggregation</source>
-        <translation type="obsolete">集合体</translation>
-    </message>
-    <message>
-        <source>Multiple Inheritance</source>
-        <translation type="obsolete">複合継承</translation>
-    </message>
-    <message>
-        <source>Support for changing languages at runtime</source>
-        <translation type="obsolete">実行時の言語変更をサポートする</translation>
-    </message>
     <message>
         <location/>
         <source>Configure...</source>
@@ -5486,53 +4848,33 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
 <context>
     <name>Designer::Internal::FormEditorW</name>
     <message>
-        <source>Designer widgetbox</source>
-        <translation type="obsolete">デザイナ ウィジェット ボックス</translation>
+        <location filename="../../../src/plugins/designer/formeditorw.cpp" line="+335"/>
+        <location line="+170"/>
+        <source>Widget Box</source>
+        <translation>ウィジェット ボックス</translation>
     </message>
     <message>
-        <source>Object inspector</source>
-        <translation type="obsolete">オブジェクト インスペクタ</translation>
-    </message>
-    <message>
-        <source>Property editor</source>
-        <translation type="obsolete">プロパティ エディタ</translation>
-    </message>
-    <message>
-        <source>Signals and slots editor</source>
-        <translation type="obsolete">シグナル/スロット エディタ</translation>
-    </message>
-    <message>
-        <source>Action editor</source>
-        <translation type="obsolete">アクション エディタ</translation>
-    </message>
-    <message>
-        <location filename="../../../src/plugins/designer/formeditorw.cpp" line="+335"/>
-        <location line="+170"/>
-        <source>Widget Box</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-165"/>
-        <location line="+169"/>
-        <source>Object Inspector</source>
-        <translation type="unfinished"></translation>
+        <location line="-165"/>
+        <location line="+169"/>
+        <source>Object Inspector</source>
+        <translation>オブジェクト インスペクタ</translation>
     </message>
     <message>
         <location line="-164"/>
         <location line="+168"/>
         <source>Property Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>プロパティ エディタ</translation>
     </message>
     <message>
         <location line="-163"/>
         <source>Signals &amp; Slots Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>シグナル/スロット エディタ</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+167"/>
         <source>Action Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>アクション エディタ</translation>
     </message>
     <message>
         <location line="-125"/>
@@ -5612,22 +4954,22 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
     <message>
         <location line="+20"/>
         <source>Views</source>
-        <translation type="unfinished"></translation>
+        <translation>ビュー</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Signals &amp;&amp; Slots Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>シグナル/スロット エディタ</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Locked</source>
-        <translation type="unfinished">固定する</translation>
+        <translation>固定する</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Reset to Default Layout</source>
-        <translation type="unfinished"></translation>
+        <translation>デフォルト レイアウトに戻す</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -5668,13 +5010,6 @@ gdb 6.7以降をお使いになる事を強く推奨します。</translation>
         <translation>%1 - エラー</translation>
     </message>
 </context>
-<context>
-    <name>Designer::Internal::FormWindowEditor</name>
-    <message>
-        <source>untitled</source>
-        <translation type="obsolete">無題</translation>
-    </message>
-</context>
 <context>
     <name>Designer::Internal::FormWindowFile</name>
     <message>
@@ -5725,13 +5060,6 @@ Rebuilding the project might help.</source>
         <translation>メソッド定義を追加できません。</translation>
     </message>
 </context>
-<context>
-    <name>Designer::Internal::SettingsPage</name>
-    <message>
-        <source>Designer</source>
-        <translation type="obsolete">デザイナ</translation>
-    </message>
-</context>
 <context>
     <name>DocSettingsPage</name>
     <message>
@@ -5750,40 +5078,6 @@ Rebuilding the project might help.</source>
         <translation>削除</translation>
     </message>
 </context>
-<context>
-    <name>DuiEditor::Internal::DuiEditorPlugin</name>
-    <message>
-        <source>Creates a Qt QML file.</source>
-        <translation type="obsolete">Qt QML ファイルを作成します。</translation>
-    </message>
-    <message>
-        <source>Qt QML File</source>
-        <translation type="obsolete">Qt QML ファイル</translation>
-    </message>
-    <message>
-        <source>Qt</source>
-        <translation type="obsolete">Qt</translation>
-    </message>
-</context>
-<context>
-    <name>DuiEditor::Internal::ScriptEditor</name>
-    <message>
-        <source>&lt;Select Symbol&gt;</source>
-        <translation type="obsolete">&lt;シンボルを選択&gt;</translation>
-    </message>
-    <message>
-        <source>Rename...</source>
-        <translation type="obsolete">名前を変更...</translation>
-    </message>
-    <message>
-        <source>New id:</source>
-        <translation type="obsolete">新しい ID:</translation>
-    </message>
-    <message>
-        <source>Rename id &apos;%1&apos;...</source>
-        <translation type="obsolete">ID &apos;%1&apos; の名前を変更...</translation>
-    </message>
-</context>
 <context>
     <name>EmbeddedPropertiesPage</name>
     <message>
@@ -6046,35 +5340,27 @@ Reason: %3</source>
 <context>
     <name>FakeVim::Internal::FakeVimHandler</name>
     <message>
-        <source>%1,%2</source>
-        <translation type="obsolete">%1,%2</translation>
-    </message>
-    <message>
-        <source>%1</source>
-        <translation type="obsolete">%1</translation>
-    </message>
-    <message>
-        <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+940"/>
+        <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+946"/>
         <source>Not implemented in FakeVim</source>
         <translation>FakeVim では実装していません</translation>
     </message>
     <message>
-        <location line="-695"/>
+        <location line="-696"/>
         <source>E20: Mark &apos;%1&apos; not set</source>
         <translation>E20: マーク &apos;%1&apos; はセットされていません</translation>
     </message>
     <message>
-        <location line="+671"/>
+        <location line="+672"/>
         <source>%1%2%</source>
-        <translation type="unfinished"></translation>
+        <translation>%1%2%</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1All</source>
-        <translation type="unfinished"></translation>
+        <translation>%1All</translation>
     </message>
     <message>
-        <location line="+1023"/>
+        <location line="+1025"/>
         <source>File &apos;%1&apos; exists (add ! to override)</source>
         <translation>ファイル &apos;%1&apos; は既に存在します ( ! を付け加えれば上書き)</translation>
     </message>
@@ -6120,11 +5406,7 @@ Reason: %3</source>
     <message>
         <location line="+78"/>
         <source>Pattern not found: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E492: Not an editor command: </source>
-        <translation type="obsolete">E492: エディタのコマンドではありません: </translation>
+        <translation>パターンが見つかりません: </translation>
     </message>
     <message>
         <location line="-7"/>
@@ -6137,16 +5419,12 @@ Reason: %3</source>
         <translation>先頭まで到達したため、末尾から検索しました</translation>
     </message>
     <message>
-        <source>E486: Pattern not found: </source>
-        <translation type="obsolete">E486: パターンが見つかりません: </translation>
-    </message>
-    <message>
-        <location line="+575"/>
+        <location line="+582"/>
         <source>Already at oldest change</source>
         <translation>これ以上、元に戻せません</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Already at newest change</source>
         <translation>これ以上、やり直せません</translation>
     </message>
@@ -6175,19 +5453,19 @@ Reason: %3</source>
     <message>
         <location line="-117"/>
         <source>Saving succeeded</source>
-        <translation type="unfinished"></translation>
+        <translation>保存に成功しました</translation>
     </message>
     <message numerus="yes">
         <location line="+2"/>
         <source>%n files not saved</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n 個のファイルは保存されていません</numerusform>
         </translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Not an editor command: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>エディタのコマンドではありません: %1</translation>
     </message>
     <message>
         <location line="+112"/>
@@ -6245,7 +5523,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>Tabulator size:</source>
-        <translation>タブの幅</translation>
+        <translation>タブの幅:</translation>
     </message>
     <message>
         <location/>
@@ -6372,11 +5650,7 @@ Reason: %3</source>
     <message>
         <location line="+17"/>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find Dialog</source>
-        <translation type="obsolete">検索ダイアログ</translation>
+        <translation>検索...</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6472,7 +5746,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -6483,7 +5757,7 @@ Reason: %3</source>
         <translation>検索結果</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+67"/>
+        <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+68"/>
         <source>No matches found!</source>
         <translation>見つかりませんでした!</translation>
     </message>
@@ -6495,17 +5769,17 @@ Reason: %3</source>
     <message>
         <location line="+2"/>
         <source>Replace with:</source>
-        <translation type="unfinished">置換文字列:</translation>
+        <translation>置換文字列:</translation>
     </message>
     <message>
         <location line="+4"/>
-        <source>Replace all occurances</source>
-        <translation type="unfinished"></translation>
+        <source>Replace all occurrences</source>
+        <translation>すべての出現箇所を置換します</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>置換</translation>
     </message>
 </context>
 <context>
@@ -6528,7 +5802,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>This is either empty or points to a file containing gdb commands that will be executed immediately after gdb starts up.</source>
-        <translation>ここは空にしておくか、gdb 起動後、直接実行される gdb コマンドを含むファイルへのパスを指定して下さいされます。</translation>
+        <translation>ここは空にしておくか、Gdb 起動後、直接実行される Gdb コマンドを含むファイルへのパスを指定して下さい。</translation>
     </message>
     <message>
         <location/>
@@ -6568,7 +5842,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>This is either a full absolute path leading to the gdb binary you intend to use or the name of a gdb binary that will be searched in your PATH.</source>
-        <translation>ここには使用したいgdbのフルパスか、PATHから検索されるgdbの実行ファイル名を指定します。</translation>
+        <translation>ここには使用したい Gdb のフルパスか、PATHから検索される Gdb の実行ファイル名を指定します。</translation>
     </message>
 </context>
 <context>
@@ -6602,17 +5876,17 @@ Reason: %3</source>
     <message>
         <location line="+38"/>
         <source>Create</source>
-        <translation type="unfinished"></translation>
+        <translation>作成</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>New configuration</source>
-        <translation type="unfinished">新しい構成</translation>
+        <translation>新しい構成</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New Configuration Name:</source>
-        <translation type="unfinished">新しい構成名:</translation>
+        <translation>新しい構成名:</translation>
     </message>
 </context>
 <context>
@@ -6625,11 +5899,7 @@ Reason: %3</source>
     <message>
         <location line="+17"/>
         <source>Tool Chain:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toolchain:</source>
-        <translation type="obsolete">ツールチェイン:</translation>
+        <translation>ツール チェイン:</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -6640,14 +5910,14 @@ Reason: %3</source>
 <context>
     <name>GenericProjectManager::Internal::GenericMakeStepConfigWidget</name>
     <message>
-        <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+189"/>
+        <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+190"/>
         <source>Override %1:</source>
         <translation>%1 の代わりに使用するコマンド:</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Make:&lt;/b&gt; %1 %2</translation>
     </message>
 </context>
 <context>
@@ -6660,7 +5930,7 @@ Reason: %3</source>
     <message>
         <location line="+1"/>
         <source>Creates a generic project, supporting any build system.</source>
-        <translation>任意のビルドシステムをサポートする標準のプロジェクトを作成する。</translation>
+        <translation>任意のビルドシステムをサポートする標準のプロジェクトを作成します。</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6805,7 +6075,7 @@ Reason: %3</source>
 <context>
     <name>Git::Internal::GitClient</name>
     <message>
-        <location filename="../../../src/plugins/git/gitclient.cpp" line="+71"/>
+        <location filename="../../../src/plugins/git/gitclient.cpp" line="+76"/>
         <source>Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work.</source>
         <translation>Qt Creator 用 git プラグイン はサーバとうまく連携できない点にご注意下さい。手動でのssh認証もうまく動きません。</translation>
     </message>
@@ -6819,19 +6089,13 @@ Reason: %3</source>
         <source>Unable to parse the file output.</source>
         <translation>ファイル出力がパースできません。</translation>
     </message>
-    <message>
-        <source>%1 Executing: %2 %3
-</source>
-        <extracomment>&lt;timestamp&gt; Executing: &lt;executable&gt; &lt;arguments&gt;</extracomment>
-        <translation type="obsolete">%1 実行中: %2 %3
-</translation>
-    </message>
     <message>
         <location line="+7"/>
         <source>Executing: %1 %2
 </source>
         <extracomment>Executing: &lt;executable&gt; &lt;arguments&gt;</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>実行中: %1 %2
+</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -6839,7 +6103,7 @@ Reason: %3</source>
         <translation>データ待機中...</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+101"/>
         <source>Git Diff</source>
         <translation>Git 差分表示</translation>
     </message>
@@ -6864,7 +6128,7 @@ Reason: %3</source>
         <translation>Git Blame %1</translation>
     </message>
     <message numerus="yes">
-        <location line="+56"/>
+        <location line="+58"/>
         <source>Unable to add %n file(s) to %1: %2</source>
         <translation>
             <numerusform>%n 個のファイルを %1 に追加できません: %2</numerusform>
@@ -6900,7 +6164,7 @@ Reason: %3</source>
         <translation>%1 で show コマンドを実行できません: %2</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+149"/>
         <source>Changes</source>
         <translation>変更あり</translation>
     </message>
@@ -6948,31 +6212,20 @@ Reason: %3</source>
         <translation>ファイルは変更されていますが、元にもどしますか?</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+26"/>
         <source>The file is not modified.</source>
         <translation>ファイルは変更されていません。</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <source>There are no modified files.</source>
         <translation>変更されたファイルはありません。</translation>
     </message>
 </context>
-<context>
-    <name>Git::Internal::GitOutputWindow</name>
-    <message>
-        <source>Git Output</source>
-        <translation type="obsolete">Git 出力</translation>
-    </message>
-    <message>
-        <source>Git</source>
-        <translation type="obsolete">Git</translation>
-    </message>
-</context>
 <context>
     <name>Git::Internal::GitPlugin</name>
     <message>
-        <location filename="../../../src/plugins/git/gitplugin.cpp" line="+232"/>
+        <location filename="../../../src/plugins/git/gitplugin.cpp" line="+233"/>
         <source>&amp;Git</source>
         <translation>Git(&amp;G)</translation>
     </message>
@@ -6987,12 +6240,12 @@ Reason: %3</source>
         <translation>&quot;%1&quot; の差分表示</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Alt+G,Alt+D</source>
         <translation>Alt+G,Alt+D</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>File Status</source>
         <translation>ファイル ステータス</translation>
     </message>
@@ -7002,12 +6255,12 @@ Reason: %3</source>
         <translation>&quot;%1&quot; 関連のステータス</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Alt+G,Alt+S</source>
         <translation>Alt+G,Alt+S</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Log File</source>
         <translation>ログファイルを表示</translation>
     </message>
@@ -7017,12 +6270,12 @@ Reason: %3</source>
         <translation>&quot;%1&quot; のログ表示</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Alt+G,Alt+L</source>
         <translation>Alt+G,Alt+L</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Blame</source>
         <translation>編集者を表示</translation>
     </message>
@@ -7032,12 +6285,12 @@ Reason: %3</source>
         <translation>&quot;%1&quot; の編集者を表示</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Alt+G,Alt+B</source>
         <translation>Alt+G,Alt+B</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Undo Changes</source>
         <translation>変更内容を元に戻す</translation>
     </message>
@@ -7047,12 +6300,12 @@ Reason: %3</source>
         <translation>&quot;%1&quot; の変更を元に戻す</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Alt+G,Alt+U</source>
         <translation>Alt+G,Alt+U</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Stage File for Commit</source>
         <translation>ファイルをコミット予定に追加</translation>
     </message>
@@ -7062,12 +6315,12 @@ Reason: %3</source>
         <translation>&quot;%1&quot; をコミット予定に追加</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Alt+G,Alt+A</source>
         <translation>Alt+G,Alt+A</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Unstage File from Commit</source>
         <translation>ファイルをコミット予定から削除</translation>
     </message>
@@ -7076,14 +6329,6 @@ Reason: %3</source>
         <source>Unstage &quot;%1&quot; from Commit</source>
         <translation>&quot;%1&quot; をコミット予定から削除</translation>
     </message>
-    <message>
-        <source>Revert...</source>
-        <translation type="obsolete">元に戻す...</translation>
-    </message>
-    <message>
-        <source>Revert &quot;%1&quot;...</source>
-        <translation type="obsolete">&quot;%1&quot; を元に戻す...</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>Diff Current Project</source>
@@ -7095,7 +6340,7 @@ Reason: %3</source>
         <translation>プロジェクト &quot;%1&quot; の差分表示</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+7"/>
         <source>Project Status</source>
         <translation>プロジェクトの状態</translation>
     </message>
@@ -7115,12 +6360,12 @@ Reason: %3</source>
         <translation>プロジェクト &quot;%1&quot; のログ</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Alt+G,Alt+K</source>
         <translation>Alt+G,Alt+K</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Undo Project Changes</source>
         <translation>プロジェクトの変更を元に戻す</translation>
     </message>
@@ -7155,12 +6400,12 @@ Reason: %3</source>
         <translation>コミット...</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Alt+G,Alt+C</source>
         <translation>Alt+G,Alt+C</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Push</source>
         <translation>Push</translation>
     </message>
@@ -7200,28 +6445,24 @@ Reason: %3</source>
         <translation>やり直す(&amp;R)</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>Could not find working directory</source>
         <translation>作業ディレクトリが見つかりませんでした</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>Revert</source>
-        <translation type="unfinished">元に戻す</translation>
+        <translation>元に戻す</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Would you like to revert all pending changes to the project?</source>
-        <translation type="unfinished"></translation>
+        <translation>すべての保留中の変更を元に戻しますか?</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Another submit is currently being executed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Another submit is currently beeing executed.</source>
-        <translation type="obsolete">別のサブミットが実行中です。</translation>
+        <translation>別のサブミットが実行中です。</translation>
     </message>
     <message>
         <location line="+30"/>
@@ -7371,12 +6612,12 @@ Reason: %3</source>
     <message>
         <location/>
         <source>Prompt to submit</source>
-        <translation type="unfinished">コミット前に確認する</translation>
+        <translation>コミット前に確認する</translation>
     </message>
     <message>
         <location/>
         <source>Omit date from annotation output</source>
-        <translation type="unfinished"></translation>
+        <translation>blame の出力結果から日付を除外する</translation>
     </message>
 </context>
 <context>
@@ -7430,7 +6671,7 @@ Reason: %3</source>
     <message>
         <location line="+0"/>
         <source>Hello World! Beautiful day today, isn&apos;t it?</source>
-        <translation>こんにちは世界! 今日はいい天気ですね。</translation>
+        <translation>こんにちは世界! 今日はいい天気ですね?</translation>
     </message>
 </context>
 <context>
@@ -7597,12 +6838,12 @@ Reason: %3</source>
     <message>
         <location line="-13"/>
         <source>Previous Page</source>
-        <translation type="unfinished"></translation>
+        <translation>前のページ</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Next Page</source>
-        <translation type="unfinished"></translation>
+        <translation>次のページ</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -7627,35 +6868,40 @@ Reason: %3</source>
     <message>
         <location line="+74"/>
         <source>Increase Font Size</source>
-        <translation type="unfinished">フォントを大きく</translation>
+        <translation>フォントを大きく</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ctrl++</source>
-        <translation type="unfinished">Ctrl++</translation>
+        <translation>Ctrl++</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Decrease Font Size</source>
-        <translation type="unfinished">フォントを小さく</translation>
+        <translation>フォントを小さく</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ctrl+-</source>
-        <translation type="unfinished">Ctrl+-</translation>
+        <translation>Ctrl+-</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Reset Font Size</source>
-        <translation type="unfinished"></translation>
+        <translation>フォントの大きさをリセット</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ctrl+0</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+0</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Go to Help Mode</source>
+        <translation>ヘルプ モードに移行</translation>
     </message>
     <message>
-        <location line="+201"/>
+        <location line="+181"/>
         <location line="+4"/>
         <location line="+146"/>
         <source>Unfiltered</source>
@@ -7905,7 +7151,7 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
     <message>
         <location filename="../../../src/tools/texteditor/mainwindow.cpp" line="+62"/>
         <source>Open Executable File</source>
-        <translation>実行可能ファイルを開く</translation>
+        <translation>実行ファイルを開く</translation>
     </message>
     <message>
         <location filename="../../../src/tools/qdebugger/mainwindow.cpp" line="-374"/>
@@ -8036,21 +7282,6 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
         <translation>変更 %1: %2</translation>
     </message>
 </context>
-<context>
-    <name>Perforce::Internal::PerforceOutputWindow</name>
-    <message>
-        <source>Perforce Output</source>
-        <translation type="obsolete">Perforce 出力</translation>
-    </message>
-    <message>
-        <source>Diff</source>
-        <translation type="obsolete">差分表示</translation>
-    </message>
-    <message>
-        <source>Perforce</source>
-        <translation type="obsolete">Perforce</translation>
-    </message>
-</context>
 <context>
     <name>Perforce::Internal::PerforcePlugin</name>
     <message>
@@ -8069,12 +7300,12 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
         <translation>&quot;%1&quot; を編集</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Alt+P,Alt+E</source>
         <translation>Alt+P,Alt+E</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Edit File</source>
         <translation>ファイルを編集</translation>
     </message>
@@ -8089,12 +7320,12 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
         <translation>&quot;%1&quot; を追加</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Alt+P,Alt+A</source>
         <translation>Alt+P,Alt+A</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Add File</source>
         <translation>ファイルを追加</translation>
     </message>
@@ -8124,12 +7355,12 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
         <translation>&quot;%1&quot; を元に戻す</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Alt+P,Alt+R</source>
         <translation>Alt+P,Alt+R</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Revert File</source>
         <translation>ファイルを元に戻す</translation>
     </message>
@@ -8155,12 +7386,12 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
         <translation>プロジェクト &quot;%1&quot; の差分表示</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Alt+P,Alt+D</source>
         <translation>Alt+P,Alt+D</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Diff Opened Files</source>
         <translation>開いているファイルの差分表示</translation>
     </message>
@@ -8170,12 +7401,12 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
         <translation>Opened</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Alt+P,Alt+O</source>
         <translation>Alt+P,Alt+O</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Submit Project</source>
         <translation>プロジェクトのサブミット</translation>
     </message>
@@ -8192,12 +7423,12 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
     <message>
         <location line="+5"/>
         <source>Update Current Project/Session</source>
-        <translation type="unfinished"></translation>
+        <translation>現在のプロジェクト/セッションをアップデート</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Update Project &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクト &quot;%1&quot; をアップデート</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -8222,29 +7453,29 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
     </message>
     <message>
         <location line="+5"/>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>Filelog Current File</source>
-        <translation>現在のファイルログ</translation>
+        <translation>現在のファイルのファイルログ</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-4"/>
         <source>Filelog &quot;%1&quot;</source>
         <translation>&quot;%1&quot; のファイルログ</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Alt+P,Alt+F</source>
         <translation>Alt+P,Alt+F</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Filelog...</source>
         <translation>ファイルログ...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Update All</source>
-        <translation type="unfinished"></translation>
+        <translation>すべてアップデート</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -8277,7 +7508,7 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
         <translation>ファイルは変更されていますが、元にもどしますか?</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+98"/>
         <source>Another submit is currently executed.</source>
         <translation>別のサブミットが実行中です。</translation>
     </message>
@@ -8315,12 +7546,7 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
         <location line="+110"/>
         <source>Executing: %1
 </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 Executing: %2
-</source>
-        <translation type="obsolete">%1 実行中: %2
+        <translation>実行中: %1
 </translation>
     </message>
     <message>
@@ -8371,7 +7597,7 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
     <message>
         <location line="+18"/>
         <source>Cannot open temporary file.</source>
-        <translation type="unfinished"></translation>
+        <translation>一時ファイルを開けません。</translation>
     </message>
     <message>
         <location line="+19"/>
@@ -8382,7 +7608,7 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
     <message>
         <location line="+6"/>
         <source>p4 submit failed (exit code %1).</source>
-        <translation type="unfinished"></translation>
+        <translation>p4 サブミットが失敗しました(終了コード %1)。</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -8473,14 +7699,10 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
         <source>Test</source>
         <translation>テスト</translation>
     </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">TextLabel</translation>
-    </message>
     <message>
         <location/>
         <source>Prompt to submit</source>
-        <translation type="unfinished">コミット前に確認する</translation>
+        <translation>コミット前に確認する</translation>
     </message>
 </context>
 <context>
@@ -8621,16 +7843,7 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
     <message>
         <location line="+35"/>
         <source>Plugin is not valid (does not derive from IPlugin)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-Library base name: %1</source>
-        <translation type="obsolete">ライブラリ名: %1</translation>
-    </message>
-    <message>
-        <source>Plugin is not valid (doesn&apos;t derive from IPlugin)</source>
-        <translation type="obsolete">無効なプラグインです (IPlugin から派生していません)</translation>
+        <translation>無効なプラグインです (IPlugin から派生していません)</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -8759,7 +7972,7 @@ Library base name: %1</source>
         <location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+68"/>
         <location line="+72"/>
         <source>&lt;UNSET&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;未定義&gt;</translation>
     </message>
     <message>
         <location line="+39"/>
@@ -8775,12 +7988,12 @@ Library base name: %1</source>
         <location line="+119"/>
         <location line="+254"/>
         <source>&lt;VARIABLE&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;変数&gt;</translation>
     </message>
     <message>
         <location line="-243"/>
         <source>&lt;VALUE&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;値&gt;</translation>
     </message>
 </context>
 <context>
@@ -8788,37 +8001,37 @@ Library base name: %1</source>
     <message>
         <location line="+163"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">編集(&amp;E)</translation>
+        <translation>編集(&amp;E)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>追加(&amp;A)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>リセット(&amp;R)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Unset</source>
-        <translation type="unfinished"></translation>
+        <translation>解除(&amp;U)</translation>
     </message>
     <message>
         <location line="+68"/>
         <source>Unset &lt;b&gt;%1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; を未定義にしました</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Set &lt;b&gt;%1&lt;/b&gt; to &lt;b&gt;%2&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; の設定値を &lt;b&gt;%2&lt;/b&gt; としました</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Summary: No changes to Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>サマリー: 環境変数は変更されていません</translation>
     </message>
 </context>
 <context>
@@ -8842,124 +8055,53 @@ Library base name: %1</source>
         <translation>ファイル パターン(&amp;P):</translation>
     </message>
 </context>
-<context>
-    <name>ProjectExplorer::Internal::ApplicationLauncher</name>
-    <message>
-        <source>Failed to start program. Path or permissions wrong?</source>
-        <translation type="obsolete">プログラムを開始できませんでした。パスかパーミッションに誤りはありませんか?</translation>
-    </message>
-    <message>
-        <source>The program has unexpectedly finished.</source>
-        <translation type="obsolete">プログラムが突然終了しました。</translation>
-    </message>
-    <message>
-        <source>Some error has occurred while running the program.</source>
-        <translation type="obsolete">プログラムを実行中にいくつかエラーが発生しました。</translation>
-    </message>
-</context>
-<context>
-    <name>ProjectExplorer::Internal::ApplicationRunConfigurationRunner</name>
-    <message>
-        <source>Run</source>
-        <translation type="obsolete">実行</translation>
-    </message>
-</context>
-<context>
-    <name>ProjectExplorer::Internal::ApplicationRunControl</name>
-    <message>
-        <source>Starting %1...</source>
-        <translation type="obsolete">%1 を起動中...</translation>
-    </message>
-    <message>
-        <source>%1 exited with code %2</source>
-        <translation type="obsolete">%1 はコード %2 で終了しました</translation>
-    </message>
-</context>
 <context>
     <name>ProjectExplorer::Internal::BuildSettingsPanel</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+80"/>
+        <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+81"/>
         <source>Build Settings</source>
         <translation>ビルド設定</translation>
     </message>
 </context>
-<context>
-    <name>ProjectExplorer::Internal::BuildSettingsPropertiesPage</name>
-    <message>
-        <source>Configurations</source>
-        <translation type="obsolete">構成</translation>
-    </message>
-    <message>
-        <source>+</source>
-        <translation type="obsolete">+</translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation type="obsolete">-</translation>
-    </message>
-</context>
 <context>
     <name>ProjectExplorer::Internal::BuildSettingsWidget</name>
     <message>
-        <source>Create &amp;New</source>
-        <translation type="obsolete">新規作成(&amp;N)</translation>
-    </message>
-    <message>
-        <location line="+116"/>
+        <location line="+137"/>
         <source>&amp;Clone Selected</source>
         <translation>選択済みの構成を複製(&amp;C)</translation>
     </message>
-    <message>
-        <source>%1 - %2</source>
-        <translation type="obsolete">%1 - %2</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="obsolete">概要</translation>
-    </message>
     <message>
         <location line="+38"/>
         <source>Build Steps</source>
         <translation>ビルド ステップ</translation>
     </message>
     <message>
-        <source>Set as Active</source>
-        <translation type="obsolete">アクティブにする</translation>
-    </message>
-    <message>
-        <source>Clone</source>
-        <translation type="obsolete">複製</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">削除</translation>
-    </message>
-    <message>
-        <source>New configuration</source>
-        <translation type="obsolete">新しい構成</translation>
-    </message>
-    <message>
-        <location line="-81"/>
+        <location line="-98"/>
         <source>Edit Build Configuration:</source>
-        <translation type="unfinished"></translation>
+        <translation>編集するビルド構成:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Add</source>
-        <translation type="unfinished">追加</translation>
+        <translation>追加</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove</source>
-        <translation type="unfinished">削除</translation>
+        <translation>削除</translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+88"/>
         <source>Clean Steps</source>
-        <translation type="unfinished"></translation>
+        <translation>クリーン ステップ</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+48"/>
+        <source>&lt;a href=&quot;#&quot;&gt;Make %1 active.&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;#&quot;&gt;%1 をアクティブにします。&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <location line="+33"/>
         <source>New Configuration Name:</source>
         <translation>新しい構成名:</translation>
     </message>
@@ -8972,49 +8114,29 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::Internal::BuildStepsPage</name>
     <message>
-        <source>1</source>
-        <translation type="obsolete">1</translation>
-    </message>
-    <message>
-        <source>+</source>
-        <translation type="obsolete">+</translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation type="obsolete">-</translation>
-    </message>
-    <message>
-        <source>^</source>
-        <translation type="obsolete">^</translation>
-    </message>
-    <message>
-        <source>v</source>
-        <translation type="obsolete">v</translation>
-    </message>
-    <message>
-        <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+61"/>
-        <source>No Build Steps</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+61"/>
+        <source>No Build Steps</source>
+        <translation>ビルド ステップなし</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Add clean step</source>
-        <translation type="unfinished"></translation>
+        <translation>クリーン ステップを追加</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Add build step</source>
-        <translation type="unfinished"></translation>
+        <translation>ビルド ステップを追加</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove clean step</source>
-        <translation type="unfinished"></translation>
+        <translation>クリーン ステップを削除</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Remove build step</source>
-        <translation type="unfinished"></translation>
+        <translation>ビルド ステップを削除</translation>
     </message>
     <message>
         <location line="+41"/>
@@ -9024,7 +8146,7 @@ Library base name: %1</source>
     <message>
         <location line="+0"/>
         <source>Clean Steps</source>
-        <translation type="unfinished"></translation>
+        <translation>クリーン ステップ</translation>
     </message>
 </context>
 <context>
@@ -9043,10 +8165,6 @@ Library base name: %1</source>
         <source>Cancel Build &amp;&amp; Close</source>
         <translation>ビルドを中止して閉じる</translation>
     </message>
-    <message>
-        <source>Don&apos;t Close</source>
-        <translation type="obsolete">閉じない</translation>
-    </message>
     <message>
         <location line="+4"/>
         <source>A project is currently being built.</source>
@@ -9060,7 +8178,7 @@ Library base name: %1</source>
     <message>
         <location line="-2"/>
         <source>Do not Close</source>
-        <translation type="unfinished"></translation>
+        <translation>閉じない</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9099,7 +8217,7 @@ Library base name: %1</source>
     <message>
         <location line="+4"/>
         <source>Executable:</source>
-        <translation>実行可能ファイル:</translation>
+        <translation>実行ファイル:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9119,37 +8237,37 @@ Library base name: %1</source>
     <message>
         <location line="+14"/>
         <source>Run Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>実行時の環境変数</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Base environment for this runconfiguration:</source>
-        <translation type="unfinished"></translation>
+        <translation>実行構成の元となる環境:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Clean Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>環境変数なし</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>System Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>システム環境変数</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Build Environment</source>
-        <translation type="unfinished">ビルド時の環境変数</translation>
+        <translation>ビルド時の環境変数</translation>
     </message>
     <message>
         <location line="+102"/>
         <source>No Executable specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>実行ファイルが指定されていません。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>実行ファイル: &lt;b&gt;%1&lt;/b&gt; %2</translation>
     </message>
 </context>
 <context>
@@ -9225,7 +8343,7 @@ Library base name: %1</source>
     <message>
         <location line="+22"/>
         <source>Switch to session</source>
-        <translation type="unfinished"></translation>
+        <translation>セッションの切替</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
@@ -9258,7 +8376,7 @@ Library base name: %1</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/outputwindow.cpp" line="+75"/>
         <source>Re-run this run-configuration</source>
-        <translation>この実行構成で最実行</translation>
+        <translation>この実行構成で再実行</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -9306,7 +8424,7 @@ Library base name: %1</source>
         <location line="+41"/>
         <source>Custom Process Step</source>
         <comment>item in combobox</comment>
-        <translation type="unfinished">独自プロセス ステップ</translation>
+        <translation>独自プロセス ステップ</translation>
     </message>
 </context>
 <context>
@@ -9314,20 +8432,16 @@ Library base name: %1</source>
     <message>
         <location line="+30"/>
         <source>&lt;b&gt;%1&lt;/b&gt; %2 %3 %4</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; %2 %3 %4</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>(disabled)</source>
-        <translation type="unfinished"></translation>
+        <translation>(使用不可)</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::ProcessStepWidget</name>
-    <message>
-        <source>Enable custom process step</source>
-        <translation type="obsolete">独自 プロセス ステップを有効にする</translation>
-    </message>
     <message>
         <location filename="../../../src/plugins/projectexplorer/processstep.ui"/>
         <source>Name:</source>
@@ -9351,7 +8465,7 @@ Library base name: %1</source>
     <message>
         <location/>
         <source>Enable Custom Process Step</source>
-        <translation type="unfinished"></translation>
+        <translation>独自 プロセス ステップを有効にする</translation>
     </message>
 </context>
 <context>
@@ -9364,11 +8478,7 @@ Library base name: %1</source>
     <message>
         <location line="+10"/>
         <source>Projects</source>
-        <translation type="unfinished">プロジェクト</translation>
-    </message>
-    <message>
-        <source>Projectexplorer</source>
-        <translation type="obsolete">プロジェクト エクスプローラー</translation>
+        <translation>プロジェクト</translation>
     </message>
 </context>
 <context>
@@ -9427,32 +8537,16 @@ Library base name: %1</source>
 </context>
 <context>
     <name>ProjectExplorer::Internal::ProjectWindow</name>
-    <message>
-        <source>Project Explorer</source>
-        <translation type="obsolete">プロジェクト エクスプローラー</translation>
-    </message>
-    <message>
-        <source>Projects</source>
-        <translation type="obsolete">プロジェクト</translation>
-    </message>
-    <message>
-        <source>Startup</source>
-        <translation type="obsolete">スタートアップ</translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="obsolete">パス</translation>
-    </message>
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+673"/>
-        <location line="+105"/>
+        <location line="+110"/>
         <source>Active Build and Run Configurations</source>
-        <translation type="unfinished"></translation>
+        <translation>アクティブなビルド構成および実行構成</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-72"/>
         <source>No project loaded.</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクトが読み込まれていません。</translation>
     </message>
 </context>
 <context>
@@ -9468,21 +8562,6 @@ Library base name: %1</source>
         <translation>追加されるファイル:</translation>
     </message>
 </context>
-<context>
-    <name>ProjectExplorer::Internal::ProjetExplorerSettingsPageUi</name>
-    <message>
-        <source>Build and Run</source>
-        <translation type="obsolete">ビルドして実行</translation>
-    </message>
-    <message>
-        <source>Save all files before Build</source>
-        <translation type="obsolete">ビルド前にすべてのファイルを保存する</translation>
-    </message>
-    <message>
-        <source>Always build Project before Running</source>
-        <translation type="obsolete">実行前に必ずプロジェクトをビルドする</translation>
-    </message>
-</context>
 <context>
     <name>ProjectExplorer::Internal::RemoveFileDialog</name>
     <message>
@@ -9519,20 +8598,21 @@ Library base name: %1</source>
     <message>
         <location line="+65"/>
         <source>Add</source>
-        <translation type="unfinished">追加</translation>
+        <translation>追加</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove</source>
-        <translation type="unfinished">削除</translation>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <location line="+138"/>
+        <source>&lt;a href=&quot;#&quot;&gt;Make %1 active.&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;#&quot;&gt;%1 をアクティブにします。&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::RunSettingsPropertiesPage</name>
-    <message>
-        <source>Run &amp;configuration:</source>
-        <translation type="obsolete">実行時の条件(&amp;C):</translation>
-    </message>
     <message>
         <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.ui"/>
         <source>+</source>
@@ -9543,14 +8623,10 @@ Library base name: %1</source>
         <source>-</source>
         <translation>-</translation>
     </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">設定</translation>
-    </message>
     <message>
         <location/>
         <source>Edit run configuration:</source>
-        <translation type="unfinished"></translation>
+        <translation>実行構成の編集:</translation>
     </message>
 </context>
 <context>
@@ -9591,18 +8667,18 @@ Library base name: %1</source>
     <message>
         <location line="+16"/>
         <source>Show Warnings</source>
-        <translation type="unfinished"></translation>
+        <translation>警告を表示</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::WinGuiProcess</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+122"/>
+        <location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+125"/>
         <source>The process could not be started!</source>
         <translation>プロセスを開始できません!</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Cannot retrieve debugging output!</source>
         <translation>デバッグ出力を受け取ることができません!</translation>
     </message>
@@ -9646,7 +8722,7 @@ Library base name: %1</source>
 <context>
     <name>ProjectExplorer::ProjectExplorerPlugin</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+256"/>
+        <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+258"/>
         <source>Projects</source>
         <translation>プロジェクト</translation>
     </message>
@@ -9703,7 +8779,7 @@ Library base name: %1</source>
     <message>
         <location line="+6"/>
         <source>Show in Explorer...</source>
-        <translation type="unfinished"></translation>
+        <translation>エクスプローラで表示...</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9713,7 +8789,7 @@ Library base name: %1</source>
     <message>
         <location line="+2"/>
         <source>Show containing folder...</source>
-        <translation type="unfinished"></translation>
+        <translation>上位のフォルダを表示...</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -9831,10 +8907,6 @@ Library base name: %1</source>
         <source>Set Run Configuration</source>
         <translation>実行構成の設定</translation>
     </message>
-    <message>
-        <source>Go to Task Window</source>
-        <translation type="obsolete">タスク ウィンドウに切り替える</translation>
-    </message>
     <message>
         <location line="+16"/>
         <source>Cancel Build</source>
@@ -9883,7 +8955,7 @@ Library base name: %1</source>
         <translation>新しいプロジェクト</translation>
     </message>
     <message>
-        <location line="+867"/>
+        <location line="+904"/>
         <source>New File</source>
         <comment>Title of dialog</comment>
         <translation>新しいファイル</translation>
@@ -9934,22 +9006,22 @@ to version control (%2)?</source>
     <message>
         <location line="+22"/>
         <source>Launching Windows Explorer failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Windows Explorer の起動に失敗</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Could not find explorer.exe in path to launch Windows Explorer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Windows Explorer を起動する為の explorer.exe にパスが通っていません。</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+18"/>
         <source>Launching a file explorer failed</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイル エクスプローラーの起動に失敗しました</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Could not find xdg-open to launch the native file explorer.</source>
-        <translation type="unfinished"></translation>
+        <translation>ネイティブなファイルエクスプローラを起動する為の xdg-open が見つかりません。</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -9972,6 +9044,49 @@ to version control (%2)?</source>
         <translation>ファイル %1 を削除できません。</translation>
     </message>
 </context>
+<context>
+    <name>ProjectExplorer::Internal::BuildConfigDialog</name>
+    <message>
+        <location line="+212"/>
+        <source>Change build configuration &amp;&amp; continue</source>
+        <translation>ビルド構成の変更 &amp;&amp; 継続</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Continue anyway</source>
+        <translation>無視して続行</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Run configuration does not match build configuration</source>
+        <translation>実行構成がビルド構成と一致していません</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The active build configuration builds a target that cannot be used by the active run configuration.</source>
+        <translation>アクティブなビルド構成は、アクティブな実行構成で使用することはできませんのでターゲットをビルドします。</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This can happen if the active build configuration uses the wrong Qt version and/or tool chain for the active run configuration (for example, running in Symbian emulator requires building with the WINSCW tool chain).</source>
+        <translation>これはアクティブな実行構成の為のアクティブなビルド構成が誤った Qt バージョン/ツールチェインを使っている場合に発生します(例えば、Symbian エミュレータの実行構成がビルド実行構成で WINSCW ツールチェインを要求している場合)。</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Choose build configuration:</source>
+        <translation>ビルド構成を選択:</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>No valid build configuration found.</source>
+        <translation>有効なビルド構成が見つかりません。</translation>
+    </message>
+</context>
 <context>
     <name>ProjectExplorer::SessionManager</name>
     <message>
@@ -9982,7 +9097,7 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>Could not restore session %1</source>
-        <translation>セッション %1 を保存できません</translation>
+        <translation>セッション %1 を復元できません</translation>
     </message>
     <message>
         <location line="+36"/>
@@ -10011,61 +9126,6 @@ to version control (%2)?</source>
         <translation>セッション (&apos;%1&apos;)</translation>
     </message>
 </context>
-<context>
-    <name>QLibrary</name>
-    <message>
-        <source>Could not mmap &apos;%1&apos;: %2</source>
-        <translation type="obsolete">&apos;%1&apos; を mmap できません: %2</translation>
-    </message>
-    <message>
-        <source>Plugin verification data mismatch in &apos;%1&apos;</source>
-        <translation type="obsolete">プラグイン &apos;%1&apos; の検証データが合いません</translation>
-    </message>
-    <message>
-        <source>Could not unmap &apos;%1&apos;: %2</source>
-        <translation type="obsolete">&apos;%1&apos; を unmap できません: %2</translation>
-    </message>
-    <message>
-        <source>The shared library was not found.</source>
-        <translation type="obsolete">共有ライブラリが見つかりません。</translation>
-    </message>
-    <message>
-        <source>The file &apos;%1&apos; is not a valid Qt plugin.</source>
-        <translation type="obsolete">ファイル &apos;%1&apos; は有効な Qt プラグインではありません。</translation>
-    </message>
-    <message>
-        <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
-        <translation type="obsolete">プラグイン &apos;%1&apos; は互換性のない Qt ライブラリ(%2.%3.%4 [%5])を使用しています。</translation>
-    </message>
-    <message>
-        <source>The plugin &apos;%1&apos; uses incompatible Qt library. Expected build key &quot;%2&quot;, got &quot;%3&quot;</source>
-        <translation type="obsolete">プラグイン &apos;%1&apos; は互換性のない Qt ライブラリを使用しています。要求されるビルドキー &quot;%2&quot; に対してライブラリのビルドキーは &quot;%3&quot; です。</translation>
-    </message>
-    <message>
-        <source>The plugin &apos;%1&apos; uses incompatible Qt library. (Cannot mix debug and release libraries.)</source>
-        <translation type="obsolete">プラグイン &apos;%1&apos; は互換性のない Qt ライブラリを使用しています。デバッグライブラリとリリースライブラリを混在して使用することはできません。</translation>
-    </message>
-    <message>
-        <source>The plugin was not loaded.</source>
-        <translation type="obsolete">プラグインは読み込めませんでした。</translation>
-    </message>
-    <message>
-        <source>Unknown error</source>
-        <translation type="obsolete">未知のエラー</translation>
-    </message>
-    <message>
-        <source>Cannot load library %1: %2</source>
-        <translation type="obsolete">ライブラリ %1 を読み込めません: %2</translation>
-    </message>
-    <message>
-        <source>Cannot unload library %1: %2</source>
-        <translation type="obsolete">ライブラリ %1 を解放できません: %2</translation>
-    </message>
-    <message>
-        <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
-        <translation type="obsolete">%2 内でシンボル &quot;%1&quot; を解決できません: %3</translation>
-    </message>
-</context>
 <context>
     <name>QMakeStep</name>
     <message>
@@ -10193,7 +9253,7 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>Creates a QML application.</source>
-        <translation>QML アプリケーションの作成を作成する。</translation>
+        <translation>QML アプリケーションを作成します。</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -10201,7 +9261,7 @@ to version control (%2)?</source>
         <translation>プロジェクト</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>The project %1 could not be opened.</source>
         <translation>プロジェクト %1 を開けませんでした。</translation>
     </message>
@@ -10209,7 +9269,7 @@ to version control (%2)?</source>
 <context>
     <name>QmlProjectManager::Internal::QmlNewProjectWizardDialog</name>
     <message>
-        <location line="-136"/>
+        <location line="-135"/>
         <source>New QML Project</source>
         <translation>新しい QML プロジェクト</translation>
     </message>
@@ -10229,7 +9289,7 @@ to version control (%2)?</source>
     <message>
         <location line="+1"/>
         <source>Creates a QML project from an existing directory of QML files.</source>
-        <translation>既存のディレクトリに存在する QML ファイルから QML プロジェクトを作成する。</translation>
+        <translation>既存のディレクトリに存在する QML ファイルから QML プロジェクトを作成します。</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -10269,25 +9329,21 @@ to version control (%2)?</source>
     <name>QmlProjectManager::Internal::QmlRunConfiguration</name>
     <message>
         <location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+339"/>
-        <location line="+101"/>
+        <location line="+107"/>
         <source>QML Viewer</source>
         <translation>QML ビューア</translation>
     </message>
-    <message>
-        <source>Could not find the qmlviewer executable, please specify one.</source>
-        <translation type="obsolete">qmlviewer の実行ファイルが見つかりません。実行ファイルを指定してください。</translation>
-    </message>
     <message>
         <location line="-31"/>
         <location line="+40"/>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>&lt;Current File&gt;</source>
         <translation>&lt;現在のファイル&gt;</translation>
     </message>
     <message>
-        <location line="-57"/>
+        <location line="-54"/>
         <source>QML Viewer arguments:</source>
-        <translation type="unfinished"></translation>
+        <translation>QML ビューアの引数:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10616,40 +9672,33 @@ to version control (%2)?</source>
 <context>
     <name>Qt4ProjectManager::Internal::ProjectLoadWizard</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+202"/>
-        <source>Import existing settings</source>
-        <translation>既存の設定をインポート</translation>
+        <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+51"/>
+        <location line="+125"/>
+        <source>Import existing build settings</source>
+        <translation>既存のビルド設定をインポート</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Qt Creator has found an already existing build in the source directory.&lt;br&gt;&lt;br&gt;&lt;b&gt;Qt Version:&lt;/b&gt; %1&lt;br&gt;&lt;b&gt;Build configuration:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;Additional QMake Arguments:&lt;/b&gt;%3</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt Creator はソース ディレクトリに既に存在するビルド構成を見つけました。&lt;br&gt;&lt;br&gt;&lt;b&gt;Qt バージョン:&lt;/b&gt; %1&lt;br&gt;&lt;b&gt;ビルド構成:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;QMake への追加引数:&lt;/b&gt; %3</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; Importing the settings will automatically add the Qt Version identified by &lt;br&gt;&lt;b&gt;%1&lt;/b&gt; to the list of Qt versions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Qt Creator has found an already existing build in the source directory.&lt;br&gt;&lt;br&gt;&lt;b&gt;Qt Version:&lt;/b&gt; %1&lt;br&gt;&lt;b&gt;Build configuration:&lt;/b&gt; %2&lt;br&gt;</source>
-        <translation type="obsolete">Qt Creator はソース ディレクトリに既に存在するビルド構成を見つけました。&lt;br&gt;&lt;br&gt;&lt;b&gt;Qt バージョン:&lt;/b&gt; %1&lt;br&gt;&lt;b&gt;ビルド構成:&lt;/b&gt; %2&lt;br&gt;</translation>
+        <translation>&lt;b&gt;注意:&lt;/b&gt; 設定をインポートすることによって&lt;b&gt;%1&lt;/br&gt;として特定される Qt を&lt;br&gt;自動的に Qt のバージョンリストに追加します。</translation>
     </message>
     <message>
         <location line="-6"/>
         <source>Import existing build settings.</source>
         <translation>既存のビルド設定をインポートする。</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;Note:&lt;/b&gt; Importing the settings will automatically add the Qt Version from:&lt;br&gt;&lt;b&gt;%1&lt;/b&gt; to the list of Qt versions.</source>
-        <translation type="obsolete">&lt;b&gt;注意:&lt;/b&gt; 設定をインポートすることによって&lt;b&gt;%1&lt;/br&gt;の Qt のバージョンを&lt;br&gt;自動的に Qt のバージョンリストに追加します。</translation>
-    </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::Qt4BuildEnvironmentWidget</name>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp" line="+51"/>
         <source>Clear system environment</source>
-        <translation type="unfinished"></translation>
+        <translation>システム環境変数を非表示にする</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -10662,27 +9711,27 @@ to version control (%2)?</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+352"/>
         <source>Headers</source>
-        <translation type="unfinished"></translation>
+        <translation>ヘッダー</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Sources</source>
-        <translation type="unfinished"></translation>
+        <translation>ソース</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Forms</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーム</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Resources</source>
-        <translation type="unfinished"></translation>
+        <translation>リソース</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Other files</source>
-        <translation type="unfinished"></translation>
+        <translation>その他のファイル</translation>
     </message>
     <message>
         <location line="+155"/>
@@ -10741,10 +9790,6 @@ to version control (%2)?</source>
         <source>Qt Version:</source>
         <translation>Qt バージョン:</translation>
     </message>
-    <message>
-        <source>Manage Qt Versions</source>
-        <translation type="obsolete">Qt のバージョンを管理する</translation>
-    </message>
     <message>
         <location/>
         <source>This Qt-Version is invalid.</source>
@@ -10771,39 +9816,35 @@ to version control (%2)?</source>
         <translation>シャドウビルド ディレクトリ</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location line="+65"/>
+        <location line="+23"/>
+        <location line="+115"/>
         <source>Default Qt Version (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>デフォルト Qt バージョン (%1)</translation>
     </message>
     <message>
-        <location line="-61"/>
+        <location line="-111"/>
         <source>No Qt Version set</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt バージョンが設定されていません</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>using Qt version: &lt;b&gt;%1&lt;/b&gt;&lt;br&gt;with tool chain &lt;b&gt;%2&lt;/b&gt;&lt;br&gt;building in &lt;b&gt;%3&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>使用する Qt バージョン: &lt;br&gt;%1&lt;/b&gt;&lt;br&gt;ツールチェイン: &lt;b&gt;%2&lt;/b&gt;&lt;br&gt;ビルドディレクトリ: &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>General</source>
         <translation>概要</translation>
     </message>
-    <message>
-        <source>Default Qt Version</source>
-        <translation type="obsolete">デフォルト Qt バージョン</translation>
-    </message>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
         <source>Manage</source>
-        <translation type="unfinished"></translation>
+        <translation>管理</translation>
     </message>
     <message>
         <location/>
         <source>Tool Chain:</source>
-        <translation type="unfinished"></translation>
+        <translation>ツール チェイン:</translation>
     </message>
 </context>
 <context>
@@ -10819,72 +9860,72 @@ to version control (%2)?</source>
     <name>Qt4ProjectManager::Internal::Qt4RunConfiguration</name>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+72"/>
-        <location line="+458"/>
+        <location line="+459"/>
         <source>Qt4RunConfiguration</source>
         <translation>Qt4 実行構成</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Could not parse %1. The Qt4 run configuration %2 can not be started.</source>
-        <translation>%1 をパースできません。Qt4 の実行時の条件設定 %2 を開始できません。</translation>
+        <translation>%1 をパースできません。Qt4 の実行構成 %2 を開始できません。</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
     <message>
-        <location line="-424"/>
+        <location line="-334"/>
+        <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2 (in terminal)</source>
+        <translation>動作中の実行ファイル: &lt;b&gt;%1&lt;/br&gt; %2 (端末内)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
+        <translation>実行ファイル: &lt;b&gt;%1&lt;/b&gt; %2</translation>
+    </message>
+    <message>
+        <location line="-91"/>
         <source>Arguments:</source>
-        <translation type="unfinished">引数:</translation>
+        <translation>引数:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Run in Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>端末内で実行</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Run Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>実行時の環境変数</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Base environment for this runconfiguration:</source>
-        <translation type="unfinished"></translation>
+        <translation>実行構成の元となる環境:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Clean Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>環境変数なし</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>System Environment</source>
-        <translation type="unfinished"></translation>
+        <translation>システム環境変数</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Build Environment</source>
-        <translation type="unfinished">ビルド時の環境変数</translation>
-    </message>
-    <message>
-        <location line="+54"/>
-        <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2 %3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>(in terminal)</source>
-        <translation type="unfinished"></translation>
+        <translation>ビルド時の環境変数</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="-57"/>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Executable:</source>
-        <translation>実行可能ファイル:</translation>
+        <translation>実行ファイル:</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -10901,14 +9942,6 @@ to version control (%2)?</source>
         <source>Working Directory:</source>
         <translation>作業ディレクトリ:</translation>
     </message>
-    <message>
-        <source>&amp;Arguments:</source>
-        <translation type="obsolete">引数(&amp;A):</translation>
-    </message>
-    <message>
-        <source>Run in &amp;Terminal</source>
-        <translation type="obsolete">端末内で実行(&amp;T)</translation>
-    </message>
     <message>
         <location line="+12"/>
         <source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
@@ -10918,80 +9951,70 @@ to version control (%2)?</source>
 <context>
     <name>Qt4ProjectManager::Internal::QtOptionsPageWidget</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+109"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+111"/>
         <source>&lt;specify a name&gt;</source>
         <translation>&lt;名前を入力&gt;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&lt;specify a qmake location&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qmake のパスを入力&gt;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Select QMake Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>QMake の実行ファイルを選択</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Select the MinGW Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>MinGW のディレクトリを選択</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Select &quot;x86build&quot; Directory from Carbide Install</source>
-        <translation type="unfinished"></translation>
+        <source>Select Carbide Install Directory</source>
+        <translation>Carbide をインストールしたディレクトリ</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+2"/>
+        <source>Select S60 SDK Root</source>
+        <translation>S60 の SDK のルートディレクトリを選択</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select the CSL Arm Toolchain (GCCE) Directory</source>
+        <translation>CSL Arm ツールチェイン (GCCE) のディレクトリを選択</translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Auto-detected</source>
-        <translation type="unfinished"></translation>
+        <translation>自動検出</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>マニュアル</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+144"/>
         <source>Building helpers</source>
-        <translation type="unfinished"></translation>
+        <translation>ヘルパビルド中</translation>
     </message>
     <message>
         <location line="+77"/>
         <source>&lt;html&gt;&lt;body&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;File:&lt;/td&gt;&lt;td&gt;&lt;pre&gt;%1&lt;/pre&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Last&amp;nbsp;modified:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Size:&lt;/td&gt;&lt;td&gt;%3 Bytes&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <extracomment>Tooltip showing the debugging helper library file.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;ファイル:&lt;/td&gt;&lt;td&gt;&lt;pre&gt;%1&lt;/pre&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;最終更新日時:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;サイズ:&lt;/td&gt;&lt;td&gt;%3 バイト&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+126"/>
         <source>The Qt Version identified by %1 is not installed. Run make install</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 で特定される Qt のバージョンはインストールされていません。 make install を実行してください</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1 does not specify a valid Qt installation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;specify a path&gt;</source>
-        <translation type="obsolete">&lt;パスを入力&gt;</translation>
-    </message>
-    <message>
-        <source>Select QTDIR</source>
-        <translation type="obsolete">QTDIR を選択してください</translation>
-    </message>
-    <message>
-        <source>Select the Qt Directory</source>
-        <translation type="obsolete">Qt のディレクトリの選択</translation>
-    </message>
-    <message>
-        <source>The Qt Version %1 is not installed. Run make install</source>
-        <translation type="obsolete">Qt バージョン %1 はインストールされていません。make install を実行してください</translation>
-    </message>
-    <message>
-        <source>%1 is not a valid Qt directory</source>
-        <translation type="obsolete">%1 は有効な Qt ディレクトリではありません</translation>
+        <translation>%1 は有効なインストール済みの Qt ではありません</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -11011,10 +10034,6 @@ to version control (%2)?</source>
         <source>Name</source>
         <translation>名前</translation>
     </message>
-    <message>
-        <source>Path</source>
-        <translation type="obsolete">パス</translation>
-    </message>
     <message>
         <location/>
         <source>Debugging Helper</source>
@@ -11035,10 +10054,6 @@ to version control (%2)?</source>
         <source>Version Name:</source>
         <translation>バージョン名:</translation>
     </message>
-    <message>
-        <source>Path:</source>
-        <translation type="obsolete">パス:</translation>
-    </message>
     <message>
         <location/>
         <source>MinGW Directory:</source>
@@ -11085,17 +10100,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>QMake Location</source>
-        <translation type="unfinished"></translation>
+        <translation>QMake のパス</translation>
     </message>
     <message>
         <location/>
         <source>QMake Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>QMake のパス:</translation>
+    </message>
+    <message>
+        <location/>
+        <source>S60 SDK:</source>
+        <translation>S60 SDK:</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Carbide Directory:</source>
+        <translation>Carbide ディレクトリ:</translation>
     </message>
     <message>
         <location/>
-        <source>MWC Directory:</source>
-        <translation type="unfinished"></translation>
+        <source>CSL/GCCE Directory:</source>
+        <translation>CSL/GCCE ディレクトリ:</translation>
     </message>
 </context>
 <context>
@@ -11207,12 +10232,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Qt4ProjectManager::MakeStep</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+80"/>
+        <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+76"/>
         <source>&lt;font color=&quot;#ff0000&quot;&gt;Could not find make command: %1 in the build environment&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;#ff0000&quot;&gt;ビルド環境に make コマンド:%1 が見つかりませんでした&lt;/font&gt;</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+56"/>
         <source>&lt;font color=&quot;#0000ff&quot;&gt;&lt;b&gt;No Makefile found, assuming project is clean.&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;#0000ff&quot;&gt;&lt;b&gt;Makefile が見つかりませんでした、プロジェクトがクリーン状態の可能性があります。&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
@@ -11220,19 +10245,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Qt4ProjectManager::MakeStepConfigWidget</name>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>Override %1:</source>
         <translation>%1 の代わりに使用するコマンド:</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+18"/>
         <source>&lt;b&gt;Make Step:&lt;/b&gt; %1 not found in the environment.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Make ステップ:&lt;/b&gt; %1 が環境変数に見つかりません。</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>&lt;b&gt;Make:&lt;/b&gt; %1 %2 in %3</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Make:&lt;/b&gt; %1 %2 (%3 ディレクトリ)</translation>
     </message>
 </context>
 <context>
@@ -11240,7 +10265,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+93"/>
         <source>Make</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -11272,19 +10297,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Qt4ProjectManager::QMakeStepConfigWidget</name>
     <message>
-        <location line="+78"/>
+        <location line="+88"/>
         <source>&lt;b&gt;QMake:&lt;/b&gt; No Qt version set. QMake can not be run.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;QMake:&lt;/b&gt; Qt バージョンが設定されていません。 QMake を実行できません。</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>&lt;b&gt;QMake:&lt;/b&gt; %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;QMake:&lt;/b&gt; %1 %2</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>No valid Qt version set.</source>
-        <translation type="unfinished"></translation>
+        <translation>有効な Qt バージョンが設定されていません。</translation>
     </message>
 </context>
 <context>
@@ -11292,7 +10317,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+38"/>
         <source>QMake</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -11332,7 +10357,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Qt4ProjectManager::QtVersionManager</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+326"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+347"/>
         <source>&lt;not found&gt;</source>
         <translation>&lt;見つかりません&gt;</translation>
     </message>
@@ -11340,11 +10365,55 @@ p, li { white-space: pre-wrap; }
         <location line="+6"/>
         <location line="+6"/>
         <source>Qt in PATH</source>
-        <translation type="unfinished"></translation>
+        <translation>PATH に含まれる Qt</translation>
+    </message>
+    <message>
+        <location line="+144"/>
+        <source>Name:</source>
+        <translation>名前:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Source:</source>
+        <translation>ソース:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>mkspec:</source>
+        <translation>mkspec:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>qmake:</source>
+        <translation>qmake:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Default:</source>
+        <translation>デフォルト:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Compiler:</source>
+        <translation>コンパイラ:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Version:</source>
+        <translation>バージョン:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Debugging helper:</source>
+        <translation>デバッグヘルパ:</translation>
     </message>
+</context>
+<context>
+    <name>QApplication</name>
     <message>
-        <source>Auto-detected Qt</source>
-        <translation type="obsolete">自動検出した Qt</translation>
+        <location line="+870"/>
+        <source>The Qt Version has no toolchain.</source>
+        <translation>Qt バージョンのツールチェインが見つかりません。</translation>
     </message>
 </context>
 <context>
@@ -11412,12 +10481,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>QtScriptTools Module</source>
-        <translation type="unfinished"></translation>
+        <translation>QtScriptTools モジュール</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Additional Qt Script components</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt Script の追加機能</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -11472,12 +10541,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>QtMultimedia Module</source>
-        <translation type="unfinished"></translation>
+        <translation>QtMultimedia モジュール</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Classes for low-level multimedia functionality</source>
-        <translation type="unfinished"></translation>
+        <translation>ローレベルなマルチメディア機能のためのクラス</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -11510,20 +10579,12 @@ p, li { white-space: pre-wrap; }
         <translation>D-Bus を使ったIPCを実現する為のクラスです</translation>
     </message>
 </context>
-<context>
-    <name>QtScriptEditor::Internal::QtScriptEditorActionHandler</name>
-    <message>
-        <location filename="../../../src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp" line="+96"/>
-        <source>Qt Script Error</source>
-        <translation>Qt スクリプト エラー</translation>
-    </message>
-</context>
 <context>
     <name>QtScriptEditor::Internal::QtScriptEditorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/qtscripteditor/qtscripteditorplugin.cpp" line="+97"/>
+        <location filename="../../../src/plugins/qtscripteditor/qtscripteditorplugin.cpp" line="+102"/>
         <source>Creates a Qt Script file.</source>
-        <translation>Qt スクリプトファイルを作成する。</translation>
+        <translation>Qt スクリプトファイルを作成します。</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -11535,21 +10596,11 @@ p, li { white-space: pre-wrap; }
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
-    <message>
-        <location line="+56"/>
-        <source>Run</source>
-        <translation>実行</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
 </context>
 <context>
     <name>QtScriptEditor::Internal::ScriptEditor</name>
     <message>
-        <location filename="../../../src/plugins/qtscripteditor/qtscripteditor.cpp" line="+228"/>
+        <location filename="../../../src/plugins/qtscripteditor/qtscripteditor.cpp" line="+229"/>
         <source>&lt;Select Symbol&gt;</source>
         <translation>&lt;シンボルを選択&gt;</translation>
     </message>
@@ -11704,7 +10755,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
-        <translation>ドキュメントを開く</translation>
+        <translation>開いているドキュメント</translation>
     </message>
 </context>
 <context>
@@ -11752,45 +10803,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>Locator::Internal::SettingsDialog</name>
-    <message>
-        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
-        <source>Configure Filters</source>
-        <translation>フィルタ設定</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Add</source>
-        <translation>追加</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Remove</source>
-        <translation>削除</translation>
-    </message>
-    <message>
-        <location/>
-        <source> min</source>
-        <translation> 分</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Refresh now!</source>
-        <translation>今すぐ更新!</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Edit...</source>
-        <translation>編集...</translation>
-    </message>
-    <message>
-        <location/>
-        <source>Refresh Interval:</source>
-        <translation>æ›´æ–°é–“éš”:</translation>
-    </message>
-</context>
-<context>
-    <name>Locator::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
         <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
@@ -11855,7 +10868,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+4"/>
         <source>Case &amp;Sensitive</source>
-        <translation>大文字/小文字を区別(&amp;C)</translation>
+        <translation>大文字/小文字を区別(&amp;S)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -11938,7 +10951,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/resourceeditor/resourceeditorplugin.cpp" line="+77"/>
         <source>Creates a Qt Resource file (.qrc).</source>
-        <translation>Qt リソースファイル(.qrc)を作成する。</translation>
+        <translation>Qt リソースファイル(.qrc)を作成します。</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12228,7 +11241,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/debugger/startexternaldialog.ui"/>
         <source>Executable:</source>
-        <translation>実行可能ファイル:</translation>
+        <translation>実行ファイル:</translation>
     </message>
     <message>
         <location/>
@@ -12304,7 +11317,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location filename="../../../src/plugins/subversion/settingspage.ui"/>
         <source>Prompt to submit</source>
-        <translation type="unfinished">コミット前に確認する</translation>
+        <translation>コミット前に確認する</translation>
     </message>
 </context>
 <context>
@@ -12315,17 +11328,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <translation>Subversion コマンド</translation>
     </message>
 </context>
-<context>
-    <name>Subversion::Internal::SubversionOutputWindow</name>
-    <message>
-        <source>Subversion Output</source>
-        <translation type="obsolete">Subversion 出力</translation>
-    </message>
-    <message>
-        <source>Subversion</source>
-        <translation type="obsolete">Subversion</translation>
-    </message>
-</context>
 <context>
     <name>Subversion::Internal::SubversionPlugin</name>
     <message>
@@ -12344,12 +11346,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <translation>&quot;%1&quot; を追加</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Alt+S,Alt+A</source>
         <translation>Alt+S,Alt+A</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Delete</source>
         <translation>削除</translation>
     </message>
@@ -12384,12 +11386,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <translation>&quot;%1&quot; の差分表示</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Alt+S,Alt+D</source>
         <translation>Alt+S,Alt+D</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
         <source>Commit All Files</source>
         <translation>すべてのファイルをコミット</translation>
     </message>
@@ -12404,14 +11406,14 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <translation>&quot;%1&quot; をコミット</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Alt+S,Alt+C</source>
         <translation>Alt+S,Alt+C</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
         <source>Filelog Current File</source>
-        <translation>現在のファイルログ</translation>
+        <translation>現在のファイルのファイルログ</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -12484,23 +11486,20 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <translation>ファイルは変更されていますが、元にもどしますか?</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+81"/>
         <source>The commit list spans several repositories (%1). Please commit them one by one.</source>
-        <translation type="unfinished"></translation>
+        <translation>複数のリポジトリ (%1) に対するコミットリストです。1つずつコミットしてください。</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+286"/>
         <source>Executing: %1 %2
 </source>
         <extracomment>Executing: &lt;executable&gt; &lt;arguments&gt;</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The commit list spans several respositories (%1). Please commit them one by one.</source>
-        <translation type="obsolete">複数のリポジトリ (%1) に対するコミットリストです。1つずつコミットしてください。</translation>
+        <translation>実行中: %1 %2
+</translation>
     </message>
     <message>
-        <location line="-265"/>
+        <location line="-268"/>
         <source>Another commit is currently being executed.</source>
         <translation>別のコミットが実行中です。</translation>
     </message>
@@ -12515,7 +11514,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <translation>一時ファイルを作成できません: %1</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+189"/>
         <source>Describe</source>
         <translation>説明</translation>
     </message>
@@ -12527,14 +11526,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+47"/>
         <source>No subversion executable specified!</source>
-        <translation>subvesion 実行可能ファイルが指定されていません!</translation>
-    </message>
-    <message>
-        <source>%1 Executing: %2 %3
-</source>
-        <extracomment>&lt;timestamp&gt; Executing: &lt;executable&gt; &lt;arguments&gt;</extracomment>
-        <translation type="obsolete">%1 実行中: %2 %3
-</translation>
+        <translation>subvesion 実行ファイルが指定されていません!</translation>
     </message>
     <message>
         <location line="+37"/>
@@ -12569,7 +11561,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <name>TextEditor::BaseFileFind</name>
     <message>
         <location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+119"/>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>%1 found</source>
         <translation>一致 %1 件</translation>
     </message>
@@ -12600,7 +11592,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
 <context>
     <name>TextEditor::BaseTextEditor</name>
     <message>
-        <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+252"/>
+        <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+254"/>
         <source>Print Document</source>
         <translation>ドキュメントを印刷</translation>
     </message>
@@ -12618,7 +11610,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
 <context>
     <name>TextEditor::BaseTextEditorEditable</name>
     <message>
-        <location line="+4283"/>
+        <location line="+4324"/>
         <source>Line: %1, Col: %2</source>
         <translation>行番号: %1, 列位置: %2</translation>
     </message>
@@ -12796,66 +11788,60 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Mark text changes</source>
-        <translation type="unfinished"></translation>
+        <translation>テキストの変更をマークする</translation>
     </message>
 </context>
 <context>
     <name>TextEditor::FontSettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+312"/>
+        <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+314"/>
         <source>Font &amp; Colors</source>
         <translation>フォント &amp; 色</translation>
     </message>
     <message>
         <location line="+124"/>
         <source>Copy Color Scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>カラースキームをコピー</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Color Scheme name:</source>
-        <translation type="unfinished"></translation>
+        <translation>カラースキーム名:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>%1 (copy)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (コピー)</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Delete Color Scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>カラースキームを削除</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Are you sure you want to delete this color scheme permanently?</source>
-        <translation type="unfinished"></translation>
+        <translation>このカラースキームを完全に削除しますか?</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Delete</source>
-        <translation type="unfinished">削除</translation>
+        <translation>削除</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Color Scheme Changed</source>
-        <translation type="unfinished"></translation>
+        <translation>変更されたカラースキーム</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The color scheme &quot;%1&quot; was modified, do you want to save the changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>このカラースキーム &quot;%1&quot; は変更されています。変更内容をセーブしますか?</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Discard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-        This is only an example.</source>
-        <translation type="obsolete">
-        This is only an example.</translation>
+        <translation>廃棄</translation>
     </message>
 </context>
 <context>
@@ -12935,34 +11921,6 @@ The following encodings are likely to fit:</source>
         <source>Size:</source>
         <translation>サイズ:</translation>
     </message>
-    <message>
-        <source>Bold</source>
-        <translation type="obsolete">太字</translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="obsolete">斜体</translation>
-    </message>
-    <message>
-        <source>Background:</source>
-        <translation type="obsolete">背景色:</translation>
-    </message>
-    <message>
-        <source>Foreground:</source>
-        <translation type="obsolete">前景色:</translation>
-    </message>
-    <message>
-        <source>Erase background</source>
-        <translation type="obsolete">背景色をクリア</translation>
-    </message>
-    <message>
-        <source>x</source>
-        <translation type="obsolete">x</translation>
-    </message>
-    <message>
-        <source>Preview:</source>
-        <translation type="obsolete">プレビュー:</translation>
-    </message>
     <message>
         <location/>
         <source>Font</source>
@@ -12981,12 +11939,12 @@ The following encodings are likely to fit:</source>
     <message>
         <location/>
         <source>Copy...</source>
-        <translation type="unfinished"></translation>
+        <translation>コピー...</translation>
     </message>
     <message>
         <location/>
         <source>Delete</source>
-        <translation type="unfinished">削除</translation>
+        <translation>削除</translation>
     </message>
 </context>
 <context>
@@ -13007,7 +11965,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location filename="../../../src/plugins/texteditor/texteditorplugin.cpp" line="+94"/>
         <source>Creates a text file (.txt).</source>
-        <translation>テキストファイル(.txt)を作成する。</translation>
+        <translation>テキストファイル(.txt)を作成します。</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -13037,12 +11995,12 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+6"/>
         <source>Triggers a quick fix in this scope</source>
-        <translation type="unfinished"></translation>
+        <translation>スコープ内で簡易修正する場合のトリガー</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Alt+Return</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+Return</translation>
     </message>
 </context>
 <context>
@@ -13073,17 +12031,27 @@ The following encodings are likely to fit:</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>&amp;Visualize Whitespace</source>
-        <translation>空白の可視化(&amp;V)</translation>
+        <location line="+5"/>
+        <source>Meta</source>
+        <translation>Meta</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ctrl</source>
+        <translation>Ctrl</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Ctrl+E, Ctrl+V</source>
-        <translation>Ctrl+E, Ctrl+V</translation>
+        <source>%1+E, R</source>
+        <translation>%1+E, R</translation>
     </message>
     <message>
         <location line="+5"/>
+        <source>&amp;Visualize Whitespace</source>
+        <translation>空白の可視化(&amp;V)</translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Clean Whitespace</source>
         <translation>空白の除去</translation>
     </message>
@@ -13093,12 +12061,7 @@ The following encodings are likely to fit:</source>
         <translation>文字の折り返しを有効にする(&amp;W)</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Ctrl+E, Ctrl+W</source>
-        <translation>Ctrl+E, Ctrl+W</translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>(Un)Comment &amp;Selection</source>
         <translation>選択範囲のコメント/非コメント化(&amp;S)</translation>
     </message>
@@ -13118,17 +12081,22 @@ The following encodings are likely to fit:</source>
         <translation>Shift+Del</translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-38"/>
         <source>&amp;Rewrap Paragraph</source>
-        <translation type="unfinished"></translation>
+        <translation>段落の折り返しを再構築(&amp;R)</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Ctrl+E, R</source>
-        <translation type="unfinished"></translation>
+        <location line="+11"/>
+        <source>%1+E, %2+V</source>
+        <translation>%1+E, %2+V</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+14"/>
+        <source>%1+E, %2+W</source>
+        <translation>%1+E, %2+W</translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Cut &amp;Line</source>
         <translation>一行切り取り(&amp;L)</translation>
     </message>
@@ -13200,7 +12168,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+4"/>
         <source>Goto Block Start With Selection</source>
-        <translation>選択範囲内のブロックの開始位置に移動</translation>
+        <translation>ブロックの開始位置に移動し、選択状態にする</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -13210,7 +12178,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+3"/>
         <source>Goto Block End With Selection</source>
-        <translation>選択範囲内のブロックの終了位置に移動</translation>
+        <translation>ブロックの終了位置に移動し、選択状態にする</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -13232,10 +12200,6 @@ The following encodings are likely to fit:</source>
         <source>Select Block Down</source>
         <translation>選択したブロックを下へ</translation>
     </message>
-    <message>
-        <source>Ctrl+Shift+U</source>
-        <translation type="obsolete">Ctrl+Shift+U</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Move Line Up</source>
@@ -13278,7 +12242,7 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;行番号&gt;</translation>
     </message>
 </context>
@@ -13332,17 +12296,17 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+4"/>
         <source>Occurrences</source>
-        <translation type="unfinished"></translation>
+        <translation>ローカル変数</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Unused Occurrence</source>
-        <translation type="unfinished"></translation>
+        <translation>未使用のローカル変数</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Renaming Occurrence</source>
-        <translation type="unfinished"></translation>
+        <translation>改名中のローカル変数</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -13397,7 +12361,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+1"/>
         <source>Visual Whitespace</source>
-        <translation type="unfinished"></translation>
+        <translation>空白の可視化</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -13548,7 +12512,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+313"/>
         <source>Prompt to submit</source>
-        <translation type="unfinished">コミット前に確認する</translation>
+        <translation>コミット前に確認する</translation>
     </message>
     <message>
         <location line="+59"/>
@@ -13583,10 +12547,6 @@ The following encodings are likely to fit:</source>
         <source>Common</source>
         <translation>共通</translation>
     </message>
-    <message>
-        <source>Prompt to submit</source>
-        <translation type="obsolete">コミット前に確認する</translation>
-    </message>
     <message>
         <location/>
         <source>Wrap submit message at:</source>
@@ -13628,7 +12588,7 @@ name &lt;email&gt; alias &lt;email&gt;</source>
 <context>
     <name>VCSManager</name>
     <message>
-        <location filename="../../../src/plugins/coreplugin/vcsmanager.cpp" line="+132"/>
+        <location filename="../../../src/plugins/coreplugin/vcsmanager.cpp" line="+144"/>
         <source>Version Control</source>
         <translation>バージョン管理</translation>
     </message>
@@ -13640,25 +12600,6 @@ Note: This might remove the local file.</source>
 注意: ローカルにあるファイルも一緒に削除されます。</translation>
     </message>
 </context>
-<context>
-    <name>View</name>
-    <message>
-        <source>Paste</source>
-        <translation type="obsolete">貼り付け</translation>
-    </message>
-    <message>
-        <source>&lt;Username&gt;</source>
-        <translation type="obsolete">&lt;ユーザ名&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;Description&gt;</source>
-        <translation type="obsolete">&lt;説明&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;Comment&gt;</source>
-        <translation type="obsolete">&lt;コメント&gt;</translation>
-    </message>
-</context>
 <context>
     <name>ViewDialog</name>
     <message>
@@ -13686,20 +12627,6 @@ Note: This might remove the local file.</source>
         <source>&lt;Description&gt;</source>
         <translation>&lt;説明&gt;</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&amp;lt;Comment&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&amp;lt;コメント&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Parts to send to codepaster</source>
-        <translation type="obsolete">コード ペースターに送る部品</translation>
-    </message>
     <message>
         <location/>
         <source>Patch 1</source>
@@ -13713,7 +12640,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Protocol:</source>
-        <translation type="unfinished"></translation>
+        <translation>プロトコル:</translation>
     </message>
     <message>
         <location/>
@@ -13722,12 +12649,16 @@ p, li { white-space: pre-wrap; }
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt;&quot;&gt;&amp;lt;Comment&amp;gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt;&quot;&gt;&amp;lt;コメント&amp;gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location/>
         <source>Parts to send to server</source>
-        <translation type="unfinished"></translation>
+        <translation>サーバに送る部品</translation>
     </message>
 </context>
 <context>
@@ -13763,17 +12694,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/libs/utils/checkablemessagebox.ui"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>ダイアログ</translation>
     </message>
     <message>
         <location/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location/>
         <source>CheckBox</source>
-        <translation type="unfinished"></translation>
+        <translation>チェックボックス</translation>
     </message>
 </context>
 <context>
@@ -13781,12 +12712,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cpaster/pastebindotcomsettings.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーム</translation>
     </message>
     <message>
         <location/>
         <source>Server Prefix:</source>
-        <translation type="unfinished"></translation>
+        <translation>サーバ プレフィクス:</translation>
     </message>
     <message>
         <location/>
@@ -13796,7 +12727,12 @@ p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://pastebin.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;pastebin.com&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; allows to send posts to custom subdomains (eg. qtcreator.pastebin.com). Fill in the desired prefix.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Note that the plugin will use this for posting as well as fetching.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://pastebin.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;pastebin.com&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; は独自サブドメインに送信する事を許可しています(例:qtcreator.pastebin.com)。希望するプレフィクスを入力してください。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;メモ:プラグインは送信時だけでなく受信時にもこのプレフィクスを使用します。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
 <context>
@@ -13804,37 +12740,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/settingspage.ui"/>
         <source>Prompt to submit</source>
-        <translation type="unfinished">コミット前に確認する</translation>
+        <translation>コミット前に確認する</translation>
     </message>
     <message>
         <location/>
         <source>When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit id). Otherwise, only the respective file will be displayed.</source>
-        <translation type="unfinished"></translation>
+        <translation>このオプションをチェックしている場合、アノテーション ビュー内でリビジョン番号をクリックした時に、該当するコミットで変更されたファイル(コミットIDで紐づいているもの)をすべて表示します。チェックしていない場合は、それぞれのファイルだけを表示します。</translation>
     </message>
     <message>
         <location/>
         <source>Describe all files matching commit id:</source>
-        <translation type="unfinished"></translation>
+        <translation>コミットIDで紐づいているすべてのファイルを表示する</translation>
     </message>
     <message>
         <location/>
         <source>CVS Command:</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS コマンド:</translation>
     </message>
     <message>
         <location/>
         <source>CVS Root:</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS ルート:</translation>
     </message>
     <message>
         <location/>
         <source>Diff Options:</source>
-        <translation type="unfinished"></translation>
+        <translation>差分表示オプション:</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/cvs/settingspage.cpp" line="+84"/>
         <source>CVS</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS</translation>
     </message>
 </context>
 <context>
@@ -13842,47 +12778,42 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/gdb/trkoptionswidget.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーム</translation>
     </message>
     <message>
         <location/>
         <source>Gdb</source>
-        <translation type="unfinished">gdb</translation>
+        <translation>Gdb</translation>
     </message>
     <message>
         <location/>
         <source>Symbian ARM gdb location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location/>
-        <source>Cygwin location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Symbian ARM 用 Gdb へのパス:</translation>
     </message>
     <message>
         <location/>
         <source>Communication</source>
-        <translation type="unfinished"></translation>
+        <translation>通信</translation>
     </message>
     <message>
         <location/>
         <source>Serial Port</source>
-        <translation type="unfinished"></translation>
+        <translation>シリアルポート</translation>
     </message>
     <message>
         <location/>
         <source>Bluetooth</source>
-        <translation type="unfinished"></translation>
+        <translation>Bluetooth</translation>
     </message>
     <message>
         <location/>
         <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <translation>ポート:</translation>
     </message>
     <message>
         <location/>
         <source>Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>デバイス:</translation>
     </message>
 </context>
 <context>
@@ -13890,42 +12821,42 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/designer/cpp/cppsettingspagewidget.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーム</translation>
     </message>
     <message>
         <location/>
         <source>Embedding of the UI Class</source>
-        <translation type="unfinished"></translation>
+        <translation>UIクラスの埋め込み方法</translation>
     </message>
     <message>
         <location/>
         <source>Aggregation as a pointer member</source>
-        <translation type="unfinished">個々のメンバとして集合体</translation>
+        <translation>ポインタ型のメンバとして集約</translation>
     </message>
     <message>
         <location/>
         <source>Aggregation</source>
-        <translation type="unfinished">集合体</translation>
+        <translation>集約</translation>
     </message>
     <message>
         <location/>
         <source>Multiple Inheritance</source>
-        <translation type="unfinished">複合継承</translation>
+        <translation>多重継承</translation>
     </message>
     <message>
         <location/>
         <source>Code Generation</source>
-        <translation type="unfinished"></translation>
+        <translation>コード生成</translation>
     </message>
     <message>
         <location/>
         <source>Support for changing languages at runtime</source>
-        <translation type="unfinished">実行時の言語変更をサポートする</translation>
+        <translation>実行時の言語変更をサポートする</translation>
     </message>
     <message>
         <location/>
         <source>Use Qt module name in #include-directive</source>
-        <translation type="unfinished"></translation>
+        <translation>#include ディレクティブで Qt モジュール名を使う</translation>
     </message>
 </context>
 <context>
@@ -13933,27 +12864,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitorioushostwidget.ui"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitorioushostwidget.cpp" line="+86"/>
         <source>&lt;New Host&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;新しいホスト&gt;</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Host</source>
-        <translation type="unfinished"></translation>
+        <translation>ホスト</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Projects</source>
-        <translation type="unfinished">プロジェクト</translation>
+        <translation>プロジェクト</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>説明</translation>
     </message>
 </context>
 <context>
@@ -13961,32 +12892,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousprojectwidget.ui"/>
         <source>WizardPage</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィザードページ</translation>
     </message>
     <message>
         <location/>
         <source>Filter:</source>
-        <translation type="unfinished">フィルタ:</translation>
+        <translation>フィルタ:</translation>
     </message>
     <message>
         <location/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location/>
         <source>Keep updating</source>
-        <translation type="unfinished"></translation>
+        <translation>更新し続ける</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousprojectwidget.cpp" line="+84"/>
         <source>Project</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクト</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>説明</translation>
     </message>
 </context>
 <context>
@@ -13994,62 +12925,62 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousrepositorywizardpage.ui"/>
         <source>WizardPage</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィザードページ</translation>
     </message>
     <message>
         <location/>
         <source>Filter:</source>
-        <translation type="unfinished">フィルタ:</translation>
+        <translation>フィルタ:</translation>
     </message>
     <message>
         <location/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp" line="+83"/>
         <source>Name</source>
-        <translation type="unfinished">名前</translation>
+        <translation>名前</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Owner</source>
-        <translation type="unfinished"></translation>
+        <translation>オーナー</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>説明</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Choose a repository of the project &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクト &apos;%1&apos; のリポジトリを選択してください。</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Mainline Repositories</source>
-        <translation type="unfinished"></translation>
+        <translation>Mainline リポジトリ</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Clones</source>
-        <translation type="unfinished"></translation>
+        <translation>Clones</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Baseline Repositories</source>
-        <translation type="unfinished"></translation>
+        <translation>Baseline リポジトリ</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Shared Project Repositories</source>
-        <translation type="unfinished"></translation>
+        <translation>共有プロジェクト リポジトリ</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Personal Repositories</source>
-        <translation type="unfinished"></translation>
+        <translation>パーソナル リポジトリ</translation>
     </message>
 </context>
 <context>
@@ -14057,107 +12988,107 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/help/generalsettingspage.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーム</translation>
     </message>
     <message>
         <location/>
         <source>Font</source>
-        <translation type="unfinished">フォント</translation>
+        <translation>フォント</translation>
     </message>
     <message>
         <location/>
         <source>Family:</source>
-        <translation type="unfinished">フォント名:</translation>
+        <translation>フォント名:</translation>
     </message>
     <message>
         <location/>
         <source>Style:</source>
-        <translation type="unfinished"></translation>
+        <translation>スタイル:</translation>
     </message>
     <message>
         <location/>
         <source>Size:</source>
-        <translation type="unfinished">サイズ:</translation>
+        <translation>サイズ:</translation>
     </message>
     <message>
         <location/>
         <source>Startup</source>
-        <translation type="unfinished">スタートアップ</translation>
+        <translation>スタートアップ</translation>
     </message>
     <message>
         <location/>
         <source>On context help:</source>
-        <translation type="unfinished"></translation>
+        <translation>コンテキスト ヘルプを開く時:</translation>
     </message>
     <message>
         <location/>
         <source>Show side-by-side if possible</source>
-        <translation type="unfinished"></translation>
+        <translation>可能であれば並べて表示</translation>
     </message>
     <message>
         <location/>
         <source>Always show side-by-side</source>
-        <translation type="unfinished"></translation>
+        <translation>常に並べて表示</translation>
     </message>
     <message>
         <location/>
         <source>Always start full help</source>
-        <translation type="unfinished"></translation>
+        <translation>常にフルサイズで表示</translation>
     </message>
     <message>
         <location/>
         <source>On help start:</source>
-        <translation type="unfinished"></translation>
+        <translation>ヘルプを開く時:</translation>
     </message>
     <message>
         <location/>
         <source>Show my home page</source>
-        <translation type="unfinished"></translation>
+        <translation>ホームページを開く</translation>
     </message>
     <message>
         <location/>
         <source>Show a blank page</source>
-        <translation type="unfinished"></translation>
+        <translation>空白ページを開く</translation>
     </message>
     <message>
         <location/>
         <source>Show my tabs from last session</source>
-        <translation type="unfinished"></translation>
+        <translation>最後のセッションで開いていたタブを開く</translation>
     </message>
     <message>
         <location/>
         <source>Home Page:</source>
-        <translation type="unfinished"></translation>
+        <translation>ホームページ:</translation>
     </message>
     <message>
         <location/>
         <source>Use &amp;Current Page</source>
-        <translation type="unfinished"></translation>
+        <translation>現在のページを使用(&amp;C)</translation>
     </message>
     <message>
         <location/>
         <source>Use &amp;Blank Page</source>
-        <translation type="unfinished"></translation>
+        <translation>空白ページを使用(&amp;B)</translation>
     </message>
     <message>
         <location/>
         <source>Restore to Default</source>
-        <translation type="unfinished"></translation>
+        <translation>デフォルトに戻す</translation>
     </message>
     <message>
         <location/>
         <source>Help Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>ヘルプ ブックマーク</translation>
     </message>
     <message>
         <location/>
         <source>Import...</source>
-        <translation type="unfinished">インポート...</translation>
+        <translation>インポート...</translation>
     </message>
     <message>
         <location/>
         <source>Export...</source>
-        <translation type="unfinished">エクスポート...</translation>
+        <translation>エクスポート...</translation>
     </message>
 </context>
 <context>
@@ -14165,32 +13096,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.ui"/>
         <source>Build and Run</source>
-        <translation type="unfinished">ビルドして実行</translation>
+        <translation>ビルドして実行</translation>
     </message>
     <message>
         <location/>
         <source>Save all files before Build</source>
-        <translation type="unfinished">ビルド前にすべてのファイルを保存する</translation>
+        <translation>ビルド前にすべてのファイルを保存する</translation>
     </message>
     <message>
         <location/>
         <source>Always build Project before Running</source>
-        <translation type="unfinished">実行前に必ずプロジェクトをビルドする</translation>
+        <translation>実行前に必ずプロジェクトをビルドする</translation>
     </message>
     <message>
         <location/>
         <source>Show Compiler Output on building</source>
-        <translation type="unfinished"></translation>
+        <translation>ビルド中のコンパイラが出力する内容を表示</translation>
     </message>
     <message>
         <location/>
         <source>Use jom instead of nmake</source>
-        <translation type="unfinished"></translation>
+        <translation>nmake の代わりに jom を使用する</translation>
     </message>
     <message>
         <location/>
         <source>&lt;i&gt;jom&lt;/i&gt; is a drop-in replacement for &lt;i&gt;nmake&lt;/i&gt; which distributes the compilation process to multiple CPU cores. For more details, see the &lt;a href=&quot;http://qt.gitorious.org/qt-labs/jom/&quot;&gt;jom Homepage&lt;/a&gt;. Disable it if you experience problems with your builds.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;i&gt;jom&lt;/i&gt; は、マルチコアCPU環境下における分散コンパイルの為に &lt;i&gt;nmake&lt;/i&gt; の一時的な代替ツールです。詳しい情報は、&lt;a href=&quot;http://qt.gitorious.org/qt-labs/jom/&quot;&gt;jom Homepage&lt;/a&gt; を参照して下さい。お使いの環境で問題が発生した場合は、使用しないようにしてください。</translation>
     </message>
 </context>
 <context>
@@ -14198,37 +13129,42 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーム</translation>
     </message>
     <message>
         <location/>
         <source>Manage Sessions...</source>
-        <translation type="unfinished">セッション管理...</translation>
+        <translation>セッション管理...</translation>
     </message>
     <message>
         <location/>
         <source>Create New Project...</source>
-        <translation type="unfinished">新しいプロジェクトの作成...</translation>
+        <translation>新しいプロジェクトの作成...</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.cpp" line="+79"/>
         <source>Open Recent Project</source>
-        <translation type="unfinished">最近使ったプロジェクトを開く</translation>
+        <translation>最近使ったプロジェクトを開く</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Resume Session</source>
-        <translation type="unfinished">セッションを復元</translation>
+        <translation>セッションを復元</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>%1 (last session)</source>
-        <translation type="unfinished">%1 (最後のセッション)</translation>
+        <translation>%1 (最後のセッション)</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+3"/>
+        <source>%1 (current session)</source>
+        <translation>%1 (現在のセッション)</translation>
+    </message>
+    <message>
+        <location line="+46"/>
         <source>New Project...</source>
-        <translation type="unfinished">新しいプロジェクト...</translation>
+        <translation>新しいプロジェクト...</translation>
     </message>
 </context>
 <context>
@@ -14236,7 +13172,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/projectexplorer/projectwelcomeplugin.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーム</translation>
     </message>
 </context>
 <context>
@@ -14244,132 +13180,132 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーム</translation>
     </message>
     <message>
         <location/>
         <source>The header file</source>
-        <translation type="unfinished"></translation>
+        <translation>ヘッダーファイル</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Sources</source>
-        <translation type="unfinished"></translation>
+        <translation>ソース(&amp;S)</translation>
     </message>
     <message>
         <location/>
         <source>Widget librar&amp;y:</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィジェットライブラリ(&amp;Y):</translation>
     </message>
     <message>
         <location/>
         <source>Widget project &amp;file:</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィジェットプロジェクトファイル(&amp;F):</translation>
     </message>
     <message>
         <location/>
         <source>Widget h&amp;eader file:</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィジェットヘッダーファイル(&amp;E):</translation>
     </message>
     <message>
         <location/>
         <source>The header file has to be specified in source code.</source>
-        <translation type="unfinished"></translation>
+        <translation>ソースコード内で指定するヘッダーファイル。</translation>
     </message>
     <message>
         <location/>
         <source>Widge&amp;t source file:</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィジェットソースファイル(&amp;T):</translation>
     </message>
     <message>
         <location/>
         <source>Widget &amp;base class:</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィジェット基底クラス(&amp;B):</translation>
     </message>
     <message>
         <location/>
         <source>QWidget</source>
-        <translation type="unfinished"></translation>
+        <translation>QWidget</translation>
     </message>
     <message>
         <location/>
         <source>Plugin class &amp;name:</source>
-        <translation type="unfinished"></translation>
+        <translation>プラグインクラス名(&amp;N):</translation>
     </message>
     <message>
         <location/>
         <source>Plugin &amp;header file:</source>
-        <translation type="unfinished"></translation>
+        <translation>プラグインヘッダーファイル(&amp;H):</translation>
     </message>
     <message>
         <location/>
         <source>Plugin sou&amp;rce file:</source>
-        <translation type="unfinished"></translation>
+        <translation>プラグインソースファイル(&amp;R):</translation>
     </message>
     <message>
         <location/>
         <source>Icon file:</source>
-        <translation type="unfinished"></translation>
+        <translation>アイコンファイル:</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Link library</source>
-        <translation type="unfinished"></translation>
+        <translation>ライブラリをリンク(&amp;L)</translation>
     </message>
     <message>
         <location/>
         <source>Create s&amp;keleton</source>
-        <translation type="unfinished"></translation>
+        <translation>スケルトンを作成(&amp;K)</translation>
     </message>
     <message>
         <location/>
         <source>Include pro&amp;ject</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクトをインクルード(&amp;J)</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Description</source>
-        <translation type="unfinished"></translation>
+        <translation>説明(&amp;D)</translation>
     </message>
     <message>
         <location/>
         <source>G&amp;roup:</source>
-        <translation type="unfinished"></translation>
+        <translation>グループ(&amp;R):</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Tooltip:</source>
-        <translation type="unfinished"></translation>
+        <translation>ツールチップ(&amp;T):</translation>
     </message>
     <message>
         <location/>
         <source>W&amp;hat&apos;s this:</source>
-        <translation type="unfinished"></translation>
+        <translation>これは何(&amp;H):</translation>
     </message>
     <message>
         <location/>
         <source>The widget is a &amp;container</source>
-        <translation type="unfinished"></translation>
+        <translation>コンテナウィジェット(&amp;C)</translation>
     </message>
     <message>
         <location/>
         <source>Property defa&amp;ults</source>
-        <translation type="unfinished"></translation>
+        <translation>プロパティのデフォルト(&amp;U)</translation>
     </message>
     <message>
         <location/>
         <source>dom&amp;XML:</source>
-        <translation type="unfinished"></translation>
+        <translation>dom &amp;XML:</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp" line="+44"/>
         <source>Select Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>アイコンを選択</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
-        <translation type="unfinished"></translation>
+        <translation>アイコンファイル (*.png *.ico *.jpg *.xpm *.tif *.svg)</translation>
     </message>
 </context>
 <context>
@@ -14377,47 +13313,47 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui"/>
         <source>WizardPage</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィザードページ</translation>
     </message>
     <message>
         <location/>
         <source>Plugin and Collection Class Information</source>
-        <translation type="unfinished"></translation>
+        <translation>プラグインおよびコレクションクラスの情報</translation>
     </message>
     <message>
         <location/>
         <source>Specify the properties of the plugin library and the collection class.</source>
-        <translation type="unfinished"></translation>
+        <translation>プラグインライブラリおよびコレクションクラスのプロパティを指定してください。</translation>
     </message>
     <message>
         <location/>
         <source>Collection class:</source>
-        <translation type="unfinished"></translation>
+        <translation>コレクションクラス:</translation>
     </message>
     <message>
         <location/>
         <source>Collection header file:</source>
-        <translation type="unfinished"></translation>
+        <translation>コレクションヘッダーファイル:</translation>
     </message>
     <message>
         <location/>
         <source>Collection source file:</source>
-        <translation type="unfinished"></translation>
+        <translation>コレクションソースファイル:</translation>
     </message>
     <message>
         <location/>
         <source>Plugin name:</source>
-        <translation type="unfinished"></translation>
+        <translation>プラグイン名:</translation>
     </message>
     <message>
         <location/>
         <source>Resource file:</source>
-        <translation type="unfinished"></translation>
+        <translation>リソースファイル:</translation>
     </message>
     <message>
         <location/>
         <source>icons.qrc</source>
-        <translation type="unfinished"></translation>
+        <translation>icons.qrc</translation>
     </message>
 </context>
 <context>
@@ -14425,22 +13361,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui"/>
         <source>Custom Qt Widget Wizard</source>
-        <translation type="unfinished"></translation>
+        <translation>カスタム Qt ウィジェットウィザード</translation>
     </message>
     <message>
         <location/>
         <source>Custom Widget List</source>
-        <translation type="unfinished"></translation>
+        <translation>カスタムウィジェットリスト</translation>
     </message>
     <message>
         <location/>
         <source>Widget &amp;Classes:</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィジェットクラス(&amp;C):</translation>
     </message>
     <message>
         <location/>
         <source>Specify the list of custom widgets and their properties.</source>
-        <translation type="unfinished"></translation>
+        <translation>カスタムウィジェットのリストとプロパティを指定。</translation>
     </message>
 </context>
 <context>
@@ -14448,163 +13384,191 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーム</translation>
     </message>
     <message>
         <location/>
         <source>Examples not installed</source>
-        <translation type="unfinished">サンプルプログラムがインストールされていません</translation>
+        <translation>サンプルプログラムがインストールされていません</translation>
     </message>
     <message>
         <location/>
         <source>Open</source>
-        <translation type="unfinished">開く</translation>
+        <translation>開く</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+56"/>
+        <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+62"/>
         <source>Tutorials</source>
-        <translation type="unfinished">チュートリアル</translation>
+        <translation>チュートリアル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Explore Qt Examples</source>
-        <translation type="unfinished">Qt のサンプルプログラムを参照</translation>
+        <translation>Qt のサンプルプログラムを参照</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Did You Know?</source>
-        <translation type="unfinished">ご存じですか?</translation>
+        <translation>ご存じですか?</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&lt;b&gt;Qt Creator - A quick tour&lt;/b&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Qt Creator - 簡易ガイド&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Qt Creator - 簡易ガイド&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Creating an address book</source>
-        <translation type="unfinished">アドレス帳アプリの作成</translation>
+        <translation>アドレス帳アプリの作成</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Understanding widgets</source>
-        <translation type="unfinished">ウィジェットを理解する</translation>
+        <translation>ウィジェットを理解する</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Building with qmake</source>
-        <translation type="unfinished">qmake でビルドする</translation>
+        <translation>qmake でビルドする</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Writing test cases</source>
-        <translation type="unfinished">テストケースを作成する</translation>
+        <translation>テストケースを作成します</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Choose an example...</source>
-        <translation type="unfinished">サンプルプログラムを選ぶ...</translation>
+        <translation>サンプルプログラムを選ぶ...</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+81"/>
+        <source>Copy Project to writable Location?</source>
+        <translation>プロジェクトを書き込み可能なパスへコピーしますか?</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&lt;p&gt;The project you are about to open is located in the write-protected location:&lt;/p&gt;&lt;blockquote&gt;%1&lt;/blockquote&gt;&lt;p&gt;Please select a writable location below and click &quot;Copy Project and Open&quot; to open a modifiable copy of the project or click &quot;Keep Project and Open&quot; to open the project in location.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You will not be able to alter or compile your project in the current location.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;開こうとしているプロジェクトは書き込み不能なパスにあります:&lt;/p&gt;&lt;blockquote&gt;%1&lt;/blockquote&gt;&lt;p&gt;プロジェクトの編集可能なコピーを開くには、書き込み可能なパスを下記に指定して「プロジェクトをコピーして開く」を選択してください。このパスでプロジェクトを開くには「プロジェクトをコピーせずに開く」を選択してください。&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt; このパスでプロジェクトを開いた場合、編集やコンパイルはできません。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Location:</source>
+        <translation>パス(&amp;L):</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Copy Project and Open</source>
+        <translation>プロジェクトをコピーして開く(&amp;C)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Keep Project and Open</source>
+        <translation>プロジェクトをコピーせずに開く(&amp;K)</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Warning</source>
+        <translation>警告</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The specified location already exists. Please specify a valid location.</source>
+        <translation>指定されたパスは既に存在します。有効なパスを入力してください。</translation>
+    </message>
+    <message>
+        <location line="+61"/>
         <location line="+7"/>
         <source>Cmd</source>
         <comment>Shortcut key</comment>
-        <translation type="unfinished">Cmd</translation>
+        <translation>Cmd</translation>
     </message>
     <message>
         <location line="-5"/>
         <source>Alt</source>
         <comment>Shortcut key</comment>
-        <translation type="unfinished">Alt</translation>
+        <translation>Alt</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Ctrl</source>
         <comment>Shortcut key</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You can switch between Qt Creator&apos;s modes using &lt;tt&gt;Ctrl+number&lt;/tt&gt;:&lt;ul&gt;&lt;li&gt;1 - Welcome&lt;/li&gt;&lt;li&gt;2 - Edit&lt;/li&gt;&lt;li&gt;3 - Debug&lt;/li&gt;&lt;li&gt;4 - Projects&lt;/li&gt;&lt;li&gt;5 - Help&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - Output&lt;/li&gt;&lt;/ul&gt;</source>
-        <translation type="unfinished">Qt Creator のモードは&lt;tt&gt;Ctrl+数字&lt;/tt&gt;キーで変更できます:&lt;ul&gt;&lt;li&gt;1 - ようこそ&lt;/li&gt;&lt;li&gt;2 - 編集&lt;/li&gt;&lt;li&gt;3 - デバッグ&lt;/li&gt;&lt;li&gt;4 - プロジェクト&lt;/li&gt;&lt;li&gt;5 - ヘルプ&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - アウトプット&lt;/li&gt;&lt;/ul&gt;</translation>
+        <translation>Qt Creator のモードは&lt;tt&gt;Ctrl+数字&lt;/tt&gt;キーで変更できます:&lt;ul&gt;&lt;li&gt;1 - ようこそ&lt;/li&gt;&lt;li&gt;2 - 編集&lt;/li&gt;&lt;li&gt;3 - デバッグ&lt;/li&gt;&lt;li&gt;4 - プロジェクト&lt;/li&gt;&lt;li&gt;5 - ヘルプ&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - アウトプット&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You can show and hide the side bar using &lt;tt&gt;%1+0&lt;tt&gt;.</source>
-        <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
-        <translation type="unfinished">&lt;tt&gt;%1+0&lt;/tt&gt;キーでサイドバーの表示/非表示を切り替えられます。</translation>
+        <translation>&lt;tt&gt;%1+0&lt;/tt&gt;キーでサイドバーの表示/非表示を切り替えられます。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can fine tune the &lt;tt&gt;Find&lt;/tt&gt; function by selecting &amp;quot;Whole Words&amp;quot; or &amp;quot;Case Sensitive&amp;quot;. Simply click on the icons on the right end of the line edit.</source>
-        <translation type="unfinished">&lt;tt&gt;検索&lt;/tt&gt;機能は&amp;quot;単語単位で検索する&amp;quot;や&amp;quot;大文字/小文字を区別する&amp;quot;を選択することで目的に合わせて検索結果を調整できます。検索文字列を入力する欄の右端にあるアイコンをクリックすることで機能を選択できます。</translation>
+        <translation>&lt;tt&gt;検索&lt;/tt&gt;機能は&amp;quot;単語単位で検索する&amp;quot;や&amp;quot;大文字/小文字を区別する&amp;quot;を選択することで目的に合わせて検索結果を調整できます。検索文字列を入力する欄の右端にあるアイコンをクリックすることで機能を選択できます。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation type="unfinished">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;外部のライブラリ&lt;/a&gt;をプロジェクトに追加した場合、Qt Creator は自動的にシンタックスハイライトやコード補完を行います。</translation>
+        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;外部のライブラリ&lt;/a&gt;をプロジェクトに追加した場合、Qt Creator は自動的にシンタックスハイライトやコード補完を行います。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The code completion is CamelCase-aware. For example, to complete &lt;tt&gt;namespaceUri&lt;/tt&gt; you can just type &lt;tt&gt;nU&lt;/tt&gt; and hit &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
-        <translation type="unfinished">コード補完はキャメルケースに対応しています。たとえば&lt;tt&gt;namespaceUrl&lt;/tt&gt;を補完したい場合、&lt;tt&gt;nU&lt;/tt&gt;と入力して&lt;tt&gt;Ctrl+Space&lt;/tt&gt;を押してください。</translation>
+        <translation>コード補完はキャメルケースに対応しています。たとえば&lt;tt&gt;namespaceUrl&lt;/tt&gt;を補完したい場合、&lt;tt&gt;nU&lt;/tt&gt;と入力して&lt;tt&gt;Ctrl+Space&lt;/tt&gt;を押してください。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You can force code completion at any time using &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
-        <translation type="unfinished">&lt;tt&gt;Ctrl+Space&lt;/tt&gt;を押せば任意のタイミングでコード補完を開始することができます。</translation>
+        <translation>&lt;tt&gt;Ctrl+Space&lt;/tt&gt;を押せば任意のタイミングでコード補完を開始することができます。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can start Qt Creator with a session by calling &lt;tt&gt;qtcreator &amp;lt;sessionname&amp;gt;&lt;/tt&gt;.</source>
-        <translation type="unfinished">Qt Creator の起動時にセッション名を渡す(&lt;tt&gt;qtcreator &amp;lt;セッション名&amp;gt;)とそのセッションを開始できます。</translation>
+        <translation>Qt Creator の起動時にセッション名を渡す(&lt;tt&gt;qtcreator &amp;lt;セッション名&amp;gt;)とそのセッションを開始できます。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can return to edit mode from any other mode at any time by hitting &lt;tt&gt;Escape&lt;/tt&gt;.</source>
-        <translation type="unfinished">&lt;tt&gt;エスケープ&lt;/tt&gt;キーでいつでもほかのモードから編集モードに戻れます。</translation>
+        <translation>&lt;tt&gt;エスケープ&lt;/tt&gt;キーでいつでもほかのモードから編集モードに戻れます。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You can switch between the output pane by hitting &lt;tt&gt;%1+n&lt;/tt&gt; where n is the number denoted on the buttons at the window bottom:&lt;ul&gt;&lt;li&gt;1 - Build Issues&lt;/li&gt;&lt;li&gt;2 - Search Results&lt;/li&gt;&lt;li&gt;3 - Application Output&lt;/li&gt;&lt;li&gt;4 - Compile Output&lt;/li&gt;&lt;/ul&gt;</source>
-        <extracomment>%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)</extracomment>
-        <translation type="unfinished">アウトプット欄は&lt;tt&gt;%1+数字&lt;/tt&gt;キーで変更できます。使用する数字はウィンドウの下部のボタンに記述されています:&lt;ul&gt;&lt;li&gt;1 - ビルドの問題点&lt;/li&gt;&lt;li&gt;2 - 検索結果&lt;/li&gt;&lt;li&gt;3 - アプリケーション出力&lt;/li&gt;&lt;li&gt;4 - コンパイル出力&lt;/li&gt;&lt;/ul&gt;</translation>
+        <translation>アウトプット欄は&lt;tt&gt;%1+数字&lt;/tt&gt;キーで変更できます。使用する数字はウィンドウの下部のボタンに記述されています:&lt;ul&gt;&lt;li&gt;1 - ビルドの問題点&lt;/li&gt;&lt;li&gt;2 - 検索結果&lt;/li&gt;&lt;li&gt;3 - アプリケーション出力&lt;/li&gt;&lt;li&gt;4 - コンパイル出力&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
-        <translation type="unfinished"></translation>
+        <translation>メソッドやクラス、ヘルプなどを素早く検索するには&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;クイックアクセス&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;)を使用します。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="unfinished">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;ビルド設定&lt;/a&gt;を変更して独自のビルドステップを追加できます。</translation>
+        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;ビルド設定&lt;/a&gt;を変更して独自のビルドステップを追加できます。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="unfinished">セッションではプロジェクト間の&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;依存関係&lt;/a&gt;を定義できます。</translation>
+        <translation>セッションではプロジェクト間の&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;依存関係&lt;/a&gt;を定義できます。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
-        <translation type="unfinished">各プロジェクトの編集時の文字コードは&lt;tt&gt;プロジェクト -&gt; エディタの設定 -&gt; デフォルトの文字コード&lt;/tt&gt;で指定できます。</translation>
+        <translation>各プロジェクトの編集時の文字コードは&lt;tt&gt;プロジェクト -&gt; エディタの設定 -&gt; デフォルトの文字コード&lt;/tt&gt;で指定できます。</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>You can modify the binary that is being executed when you press the &lt;tt&gt;Run&lt;/tt&gt; button: Add a &lt;tt&gt;Custom Executable&lt;/tt&gt; by clicking the &lt;tt&gt;+&lt;/tt&gt; button in &lt;tt&gt;Projects -&gt; Run Settings -&gt; Run Configuration&lt;/tt&gt; and then select the new target in the combo box.</source>
-        <translation type="unfinished">&lt;tt&gt;実行&lt;/tt&gt;ボタンを押したときに実行されるファイルは&lt;tt&gt;プロジェクト -&gt; 実行時の設定 -&gt; 実行時の条件&lt;/tt&gt;の&lt;tt&gt;+&lt;/tt&gt;ボタンで&lt;tt&gt;カスタム実行ファイル&lt;/tt&gt;を選択することで追加できます。追加した後に&lt;tt&gt;実行時の条件&lt;/tt&gt;のコンボボックスから作成した条件を選択してください。</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt Creator では Subversion や Perforce、CVS、Git 等のさまざまな&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;バージョン管理システム&lt;/a&gt;を使用できます。</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
-        <translation type="unfinished">編集モードでは&lt;tt&gt;F2&lt;/tt&gt;キーで宣言と定義を、&lt;tt&gt;F4&lt;/tt&gt;キーでヘッダファイルとソースファイルを切り替えできます。</translation>
+        <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; follows symbol definition, &lt;tt&gt;Shift+F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
+        <translation>編集モードでは&lt;tt&gt;F2&lt;/tt&gt;キーでシンボルの宣言を表示し、&lt;tt&gt;Shift+F2&lt;/tt&gt;で宣言と定義を、&lt;tt&gt;F4&lt;/tt&gt;キーでヘッダファイルとソースファイルを切り替えできます。</translation>
     </message>
 </context>
 <context>
@@ -14612,32 +13576,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーム</translation>
     </message>
     <message>
         <location/>
         <source>Installed S60 SDKs:</source>
-        <translation type="unfinished"></translation>
+        <translation>インストール済みの S60 の SDK:</translation>
     </message>
     <message>
         <location/>
         <source>SDK Location</source>
-        <translation type="unfinished"></translation>
+        <translation>SDK のパス</translation>
     </message>
     <message>
         <location/>
         <source>Qt Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt のパス</translation>
     </message>
     <message>
         <location/>
         <source>Refresh</source>
-        <translation type="unfinished">æ›´æ–°</translation>
+        <translation>æ›´æ–°</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+91"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+96"/>
         <source>S60 SDKs</source>
-        <translation type="unfinished"></translation>
+        <translation>S60 の SDK</translation>
     </message>
 </context>
 <context>
@@ -14645,32 +13609,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/texteditor/colorschemeedit.ui"/>
         <source>Bold</source>
-        <translation type="unfinished">太字</translation>
+        <translation>太字</translation>
     </message>
     <message>
         <location/>
         <source>Italic</source>
-        <translation type="unfinished">斜体</translation>
+        <translation>斜体</translation>
     </message>
     <message>
         <location/>
         <source>Background:</source>
-        <translation type="unfinished">背景色:</translation>
+        <translation>背景色:</translation>
     </message>
     <message>
         <location/>
         <source>Foreground:</source>
-        <translation type="unfinished">前景色:</translation>
+        <translation>前景色:</translation>
     </message>
     <message>
         <location/>
         <source>Erase background</source>
-        <translation type="unfinished">背景色をクリア</translation>
+        <translation>背景色をクリア</translation>
     </message>
     <message>
         <location/>
         <source>x</source>
-        <translation type="unfinished">x</translation>
+        <translation>x</translation>
     </message>
 </context>
 <context>
@@ -14678,17 +13642,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/vcsbase/basecheckoutwizardpage.ui"/>
         <source>WizardPage</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィザードページ</translation>
     </message>
     <message>
         <location/>
         <source>Checkout Directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>チェックアウト ディレクトリ:</translation>
     </message>
     <message>
         <location/>
         <source>Path:</source>
-        <translation type="unfinished">パス:</translation>
+        <translation>パス:</translation>
     </message>
 </context>
 <context>
@@ -14696,48 +13660,53 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.ui"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーム</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+46"/>
+        <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+47"/>
         <source>News From the Qt Labs</source>
-        <translation type="unfinished">Qt Labsからのニュース</translation>
+        <translation>Qt Labsからのニュース</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Websites</source>
-        <translation type="unfinished">Qt の Web サイト</translation>
+        <translation>Qt の Web サイト</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>http://labs.trolltech.com/blogs/feed</source>
         <extracomment>Add localized feed here only if one exists</extracomment>
-        <translation type="unfinished">http://labs.trolltech.com/blogs/feed</translation>
+        <translation>http://labs.trolltech.com/blogs/feed</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Qt Home</source>
-        <translation type="unfinished">Qt Home</translation>
+        <translation>Qt Home</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Labs</source>
-        <translation type="unfinished">Qt Labs</translation>
+        <translation>Qt Labs</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Git Hosting</source>
-        <translation type="unfinished">Qt Git ホスティング</translation>
+        <translation>Qt Git ホスティング</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Centre</source>
-        <translation type="unfinished">Qt Centre</translation>
+        <translation>Qt Centre</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Qt Apps</source>
+        <translation>Qt Apps</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Qt for S60 at Forum Nokia</source>
-        <translation type="unfinished">Forum Nokia の Qt for S60</translation>
+        <source>Qt for Symbian at Forum Nokia</source>
+        <translation>Forum Nokia の Qt for Symbian</translation>
     </message>
 </context>
 <context>
@@ -14747,7 +13716,7 @@ p, li { white-space: pre-wrap; }
         <source>#gradientWidget {
   background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
 }</source>
-        <translation type="unfinished">#gradientWidget {
+        <translation>#gradientWidget {
   background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
 }</translation>
     </message>
@@ -14758,22 +13727,26 @@ p, li { white-space: pre-wrap; }
     border-width: 0;
 }
 </source>
-        <translation type="unfinished"></translation>
+        <translation>#headerFrame {
+    border-image: url(:/welcome/images/center_frame_header.png) 0;
+    border-width: 0;
+}
+</translation>
     </message>
     <message>
         <location/>
         <source>Help us make Qt Creator even better</source>
-        <translation type="unfinished">Qt Creator の改善にご協力ください</translation>
+        <translation>Qt Creator の改善にご協力ください</translation>
     </message>
     <message>
         <location/>
         <source>Feedback</source>
-        <translation type="unfinished">フィードバック</translation>
+        <translation>フィードバック</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+115"/>
+        <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+116"/>
         <source>Welcome</source>
-        <translation type="unfinished">ようこそ</translation>
+        <translation>ようこそ</translation>
     </message>
 </context>
 <context>
@@ -14781,7 +13754,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/libs/utils/detailsbutton.cpp" line="+19"/>
         <source>Show Details</source>
-        <translation type="unfinished"></translation>
+        <translation>詳細を表示</translation>
     </message>
 </context>
 <context>
@@ -14789,22 +13762,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/coreplugin/coreconstants.h" line="+94"/>
         <source>Plain Text Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>テキスト エディタ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Binary Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>バイナリ エディタ</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/cppeditor/cppeditorconstants.h" line="+39"/>
         <source>C++ Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>C++ エディタ</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerconstants.h" line="+42"/>
         <source>.pro File Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>.pro ファイル エディタ</translation>
     </message>
 </context>
 <context>
@@ -14812,34 +13785,53 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/coreplugin/dialogs/settingsdialog.cpp" line="+58"/>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>設定</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Options</source>
-        <translation type="unfinished">オプション</translation>
+        <translation>オプション</translation>
     </message>
 </context>
 <context>
     <name>CodePaster::CodePasterProtocol</name>
     <message>
-        <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+129"/>
+        <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+70"/>
+        <source>No Server defined in the CodePaster preferences.</source>
+        <translation>コードペースターの設定にサーバが定義されていません。</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>No Server defined in the CodePaster options.</source>
+        <translation>コードペースターの設定にサーバが定義されていません。</translation>
+    </message>
+    <message>
+        <location line="+83"/>
         <source>No such paste</source>
-        <translation type="unfinished"></translation>
+        <translation>貼り付けるものがありません</translation>
     </message>
 </context>
 <context>
     <name>CodePaster::CodePasterSettingsPage</name>
     <message>
         <location filename="../../../src/plugins/cpaster/codepastersettings.cpp" line="+59"/>
-        <location line="+10"/>
         <source>CodePaster</source>
-        <translation type="unfinished">コード ペースター</translation>
+        <translation>コード ペースター</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Code Pasting</source>
+        <translation>コード貼り付け</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Server:</source>
-        <translation type="unfinished"></translation>
+        <translation>サーバ:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com).</source>
+        <translation>メモ: コードペースター サービスを提供するホスト名を、プロトコルを含まず(例:codepaster.mycompany.com)に指定してください。</translation>
     </message>
 </context>
 <context>
@@ -14847,7 +13839,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cpaster/pastebindotcomprotocol.cpp" line="+106"/>
         <source>Error during paste</source>
-        <translation type="unfinished"></translation>
+        <translation>貼り付け中にエラー</translation>
     </message>
 </context>
 <context>
@@ -14855,12 +13847,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cpaster/pastebindotcomsettings.cpp" line="+53"/>
         <source>Pastebin.com</source>
-        <translation type="unfinished"></translation>
+        <translation>Pastebin.com</translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>CodePaster</source>
-        <translation type="unfinished">コード ペースター</translation>
+        <source>Code Pasting</source>
+        <translation>コード貼り付け</translation>
     </message>
 </context>
 <context>
@@ -14868,25 +13860,25 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cpaster/pasteview.cpp" line="+89"/>
         <source>Paste</source>
-        <translation type="unfinished">貼り付け</translation>
+        <translation>貼り付け</translation>
     </message>
     <message>
         <location line="+11"/>
         <location line="+46"/>
         <source>&lt;Username&gt;</source>
-        <translation type="unfinished">&lt;ユーザ名&gt;</translation>
+        <translation>&lt;ユーザ名&gt;</translation>
     </message>
     <message>
         <location line="-38"/>
         <location line="+43"/>
         <source>&lt;Description&gt;</source>
-        <translation type="unfinished">&lt;説明&gt;</translation>
+        <translation>&lt;説明&gt;</translation>
     </message>
     <message>
         <location line="-35"/>
         <location line="+40"/>
         <source>&lt;Comment&gt;</source>
-        <translation type="unfinished">&lt;コメント&gt;</translation>
+        <translation>&lt;コメント&gt;</translation>
     </message>
 </context>
 <context>
@@ -14894,7 +13886,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cpptools/cppcurrentdocumentfilter.h" line="+53"/>
         <source>Methods in current Document</source>
-        <translation type="unfinished"></translation>
+        <translation>現在のドキュメント内のメソッド</translation>
     </message>
 </context>
 <context>
@@ -14908,35 +13900,41 @@ p, li { white-space: pre-wrap; }
 **   To protect a percent sign, use &apos;%%&apos;.
 **************************************************************************/
 </source>
-        <translation type="unfinished"></translation>
+        <translation>/**************************************************************************
+** Qt Creator ライセンス ヘッダー テンプレート
+**   特殊キーワード: %USER% %DATE% %YEAR%
+**   環境変数: %$VARIABLE%
+**   パーセント記号を使用する場合は &apos;%%&apos; としてください。
+**************************************************************************/
+</translation>
     </message>
     <message>
         <location line="+157"/>
         <source>Edit...</source>
-        <translation type="unfinished">編集...</translation>
+        <translation>編集...</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>Choose a location for the new license template file</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいライセンス テンプレート ファイルの保存先を指定して下さい</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Template write error</source>
-        <translation type="unfinished"></translation>
+        <translation>テンプレート ファイルの書き込みエラー</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cannot write to %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 に書き込めませんでした: %2</translation>
     </message>
 </context>
 <context>
     <name>CppTools::Internal::CppFindReferences</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+606"/>
+        <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+235"/>
         <source>Searching...</source>
-        <translation type="unfinished"></translation>
+        <translation>検索中...</translation>
     </message>
 </context>
 <context>
@@ -14944,12 +13942,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/checkoutwizard.cpp" line="+54"/>
         <source>Checks out a project from a CVS repository.</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS リポジトリからプロジェクトをチェックアウトします。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>CVS Checkout</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS チェックアウト</translation>
     </message>
 </context>
 <context>
@@ -14957,12 +13955,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/checkoutwizardpage.cpp" line="+38"/>
         <source>Specify repository and path.</source>
-        <translation type="unfinished"></translation>
+        <translation>リポジトリ名とパスを指定して下さい。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Repository:</source>
-        <translation type="unfinished">リポジトリ:</translation>
+        <translation>リポジトリ:</translation>
     </message>
 </context>
 <context>
@@ -14970,7 +13968,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="+78"/>
         <source>Cannot find repository for &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; のリポジトリが見つかりません</translation>
     </message>
 </context>
 <context>
@@ -14978,239 +13976,241 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Parsing of the log output failed</source>
-        <translation type="unfinished"></translation>
+        <translation>ログ出力の解析に失敗しました</translation>
     </message>
     <message>
         <location line="+169"/>
         <source>&amp;CVS</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS(&amp;C)</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Add</source>
-        <translation type="unfinished">追加</translation>
+        <translation>追加</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Add &quot;%1&quot;</source>
-        <translation type="unfinished">&quot;%1&quot; を追加</translation>
+        <translation>&quot;%1&quot; を追加</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Alt+C,Alt+A</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+C,Alt+A</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Delete</source>
-        <translation type="unfinished">削除</translation>
+        <translation>削除</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Delete &quot;%1&quot;</source>
-        <translation type="unfinished">&quot;%1&quot; を削除</translation>
+        <translation>&quot;%1&quot; を削除</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Revert</source>
-        <translation type="unfinished">元に戻す</translation>
+        <translation>元に戻す</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Revert &quot;%1&quot;</source>
-        <translation type="unfinished">&quot;%1&quot; を元に戻す</translation>
+        <translation>&quot;%1&quot; を元に戻す</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Diff Project</source>
-        <translation type="unfinished">プロジェクトの差分表示</translation>
+        <translation>プロジェクトの差分表示</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Diff Current File</source>
-        <translation type="unfinished">現在のファイルの差分表示</translation>
+        <translation>現在のファイルの差分表示</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Diff &quot;%1&quot;</source>
-        <translation type="unfinished">&quot;%1&quot; の差分表示</translation>
+        <translation>&quot;%1&quot; の差分表示</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Alt+C,Alt+D</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+C,Alt+D</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
         <source>Commit All Files</source>
-        <translation type="unfinished">すべてのファイルをコミット</translation>
+        <translation>すべてのファイルをコミット</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Commit Current File</source>
-        <translation type="unfinished">現在のファイルをコミット</translation>
+        <translation>現在のファイルをコミット</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Commit &quot;%1&quot;</source>
-        <translation type="unfinished">&quot;%1&quot; をコミット</translation>
+        <translation>&quot;%1&quot; をコミット</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Alt+C,Alt+C</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+C,Alt+C</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
         <source>Filelog Current File</source>
-        <translation type="unfinished">現在のファイルログ</translation>
+        <translation>現在のファイルのファイルログ</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Filelog &quot;%1&quot;</source>
-        <translation type="unfinished">&quot;%1&quot; のファイルログ</translation>
+        <translation>&quot;%1&quot; のファイルログ</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Annotate Current File</source>
-        <translation type="unfinished">現在のファイルのアノテーション</translation>
+        <translation>現在のファイルのアノテーション</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Annotate &quot;%1&quot;</source>
-        <translation type="unfinished">&quot;%1&quot; のアノテーション</translation>
+        <translation>&quot;%1&quot; のアノテーション</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Project Status</source>
-        <translation type="unfinished">プロジェクトの状態</translation>
+        <translation>プロジェクトの状態</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Update Project</source>
-        <translation type="unfinished">プロジェクトをアップデート</translation>
+        <translation>プロジェクトをアップデート</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Commit</source>
-        <translation type="unfinished">コミット</translation>
+        <translation>コミット</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Diff Selected Files</source>
-        <translation type="unfinished">選択済みファイルの差分表示</translation>
+        <translation>選択済みファイルの差分表示</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Undo</source>
-        <translation type="unfinished">元に戻す(&amp;U)</translation>
+        <translation>元に戻す(&amp;U)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Redo</source>
-        <translation type="unfinished">やり直す(&amp;R)</translation>
+        <translation>やり直す(&amp;R)</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Closing CVS Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS エディタを閉じようとしています</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Do you want to commit the change?</source>
-        <translation type="unfinished">変更内容をコミットしますか?</translation>
+        <translation>変更内容をコミットしますか?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The commit message check failed. Do you want to commit the change?</source>
-        <translation type="unfinished">コミットメッセージが確認できませんでした。変更をコミットしますか?</translation>
+        <translation>コミットメッセージが確認できませんでした。変更をコミットしますか?</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>The files do not differ.</source>
-        <translation type="unfinished"></translation>
+        <translation>差分はありません。</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>The file &apos;%1&apos; could not be deleted.</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイル &apos;%1&apos; は削除できませんでした。</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>The file has been changed. Do you want to revert it?</source>
-        <translation type="unfinished">ファイルは変更されていますが、元にもどしますか?</translation>
+        <translation>ファイルは変更されていますが、元にもどしますか?</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>The commit list spans several repositories (%1). Please commit them one by one.</source>
-        <translation type="unfinished"></translation>
+        <translation>複数のリポジトリ (%1) に対するコミットリストです。1つずつコミットしてください。</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Another commit is currently being executed.</source>
-        <translation type="unfinished">別のコミットが実行中です。</translation>
+        <translation>別のコミットが実行中です。</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>There are no modified files.</source>
-        <translation type="unfinished">変更されたファイルはありません。</translation>
+        <translation>変更されたファイルはありません。</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Cannot create temporary file: %1</source>
-        <translation type="unfinished">一時ファイルを作成できません: %1</translation>
+        <translation>一時ファイルを作成できません: %1</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Project status</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクトの状態</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>The initial revision %1 cannot be described.</source>
-        <translation type="unfinished"></translation>
+        <translation>初期リビジョン %1 に説明はありません。</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Could not find commits of id &apos;%1&apos; on %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 以降で、ID が &apos;%1&apos; のコミットが見つかりませんでした。</translation>
     </message>
     <message>
         <location line="+176"/>
         <source>Executing: %1 %2
 </source>
-        <translation type="unfinished"></translation>
+        <translation>実行中: %1 %2
+</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Executing in %1: %2 %3
 </source>
-        <translation type="unfinished"></translation>
+        <translation>実行中: %1 %2 %3
+</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>No cvs executable specified!</source>
-        <translation type="unfinished"></translation>
+        <translation>cvs 実行ファイルが指定されていません!</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>The process terminated with exit code %1.</source>
-        <translation type="unfinished">プロセスは終了コード %1 で終了しました。</translation>
+        <translation>プロセスは終了コード %1 で終了しました。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The process terminated abnormally.</source>
-        <translation type="unfinished">プロセスは異常終了しました。</translation>
+        <translation>プロセスは異常終了しました。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Could not start cvs &apos;%1&apos;. Please check your settings in the preferences.</source>
-        <translation type="unfinished"></translation>
+        <translation>cvs &apos;%1&apos; を開始できませんでした。設定を確認してください。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>CVS did not respond within timeout limit (%1 ms).</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS がタイムアウト制限時間 (%1 ミリ秒) 内に応答を返しませんでした。</translation>
     </message>
 </context>
 <context>
@@ -15218,22 +14218,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/cvssubmiteditor.cpp" line="+41"/>
         <source>Added</source>
-        <translation type="unfinished"></translation>
+        <translation>追加</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Removed</source>
-        <translation type="unfinished"></translation>
+        <translation>削除</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Modified</source>
-        <translation type="unfinished"></translation>
+        <translation>変更</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>CVS Submit</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS コミット</translation>
     </message>
 </context>
 <context>
@@ -15241,7 +14241,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/cvs/settingspage.cpp" line="-34"/>
         <source>CVS Command</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS コマンド</translation>
     </message>
 </context>
 <context>
@@ -15249,25 +14249,25 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/cdb/cdbstackframecontext.cpp" line="+136"/>
         <source>&lt;Unknown Type&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;不明な型&gt;</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>&lt;Unknown Value&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;不明な値&gt;</translation>
     </message>
     <message>
         <location line="+219"/>
         <source>&lt;Unknown&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;不明&gt;</translation>
     </message>
 </context>
 <context>
     <name>SymbolGroup</name>
     <message>
-        <location filename="../../../src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp" line="+49"/>
+        <location filename="../../../src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp" line="+52"/>
         <source>Out of scope</source>
-        <translation type="unfinished"></translation>
+        <translation>スコープ範囲外</translation>
     </message>
 </context>
 <context>
@@ -15275,403 +14275,336 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/debugger/debuggeragents.cpp" line="+93"/>
         <source>Memory $</source>
-        <translation type="unfinished"></translation>
+        <translation>メモリ $</translation>
     </message>
 </context>
 <context>
     <name>Debugger::Internal::DebuggerRunControlFactory</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+78"/>
+        <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+80"/>
         <source>Debug</source>
-        <translation type="unfinished">デバッグ</translation>
+        <translation>デバッグ</translation>
     </message>
 </context>
 <context>
-    <name>Debugger::Internal::AttachGdbAdapter</name>
+    <name>Debugger::Internal::DebuggerRunControl</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/attachgdbadapter.cpp" line="+110"/>
-        <source>Attached to stopped inferior.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>Inferior process could not be stopped:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>Gdb process could not be stopped:
-</source>
-        <translation type="unfinished"></translation>
+        <location line="+123"/>
+        <source>Debugger</source>
+        <translation>デバッガ</translation>
     </message>
 </context>
 <context>
     <name>Debugger::Internal::CoreGdbAdapter</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/coregdbadapter.cpp" line="+119"/>
-        <source>Attached to core temporarily.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../../src/plugins/debugger/gdb/coregdbadapter.cpp" line="+85"/>
+        <location line="+27"/>
+        <location line="+42"/>
+        <source>Error Loading Symbols</source>
+        <translation>シンボル読み込みでエラー</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>No binary found.</source>
-        <translation type="unfinished"></translation>
+        <location line="-68"/>
+        <source>No executable to load symbols from specified.</source>
+        <translation>指定されたシンボルを読み込む為の実行ファイルがありません。</translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>Symbols found.</source>
-        <translation type="unfinished"></translation>
+        <location line="+24"/>
+        <source>Loading symbols from &quot;%1&quot; failed:
+</source>
+        <translation>&quot;%1&quot; からのシンボル読み込みが失敗しました:
+</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Symbols not found in &quot;%1&quot; failed:
-%2</source>
-        <translation type="unfinished"></translation>
+        <location line="+36"/>
+        <source>Attached to core temporarily.</source>
+        <translation>一時的にコアファイルにアタッチしました。</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Attached to core.</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>Unable to determine executable from core file.</source>
+        <translation>コアファイルからの実行ファイル特定ができません。</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Attach to core &quot;%1&quot; failed:
-%2</source>
-        <translation type="unfinished"></translation>
+</source>
+        <translation>コアファイル &quot;%1&quot; へのアタッチが失敗しました:
+</translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>Gdb process could not be stopped:
-</source>
-        <translation type="unfinished"></translation>
+        <location line="-54"/>
+        <source>Symbols found.</source>
+        <translation>シンボルが見つかりました。</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Attached to core.</source>
+        <translation>コアファイルにアタッチしました。</translation>
     </message>
 </context>
 <context>
     <name>Debugger::Internal::PlainGdbAdapter</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+79"/>
+        <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+80"/>
         <source>Cannot set up communication with child process: %1</source>
-        <translation type="unfinished">子プロセスと通信できません: %1</translation>
+        <translation>子プロセスと通信できません: %1</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+43"/>
         <source>Starting executable failed:
 </source>
-        <translation type="unfinished">実行ファイルの開始に失敗しました:
+        <translation>実行ファイルの開始に失敗しました:
 </translation>
     </message>
-    <message>
-        <location line="+12"/>
-        <source>Inferior started.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+84"/>
-        <source>Inferior process could not be stopped:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>Gdb process could not be stopped:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Debugger::Internal::RemoteGdbAdapter</name>
     <message>
         <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+112"/>
-        <source>The upload process failed to start. Either the invoked script &apos;%1&apos; is missing, or you may have insufficient permissions to invoke the program.</source>
-        <translation type="unfinished">アップロードに失敗しました。実行するスクリプト &apos;%1&apos; が存在しないか、実行する権限がないため、プロセスが開始できません。</translation>
+        <source>The upload process failed to start. Shell missing?</source>
+        <translation>アップロードプロセスの開始に失敗しました。シェルが失われていませんか?</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+3"/>
         <source>The upload process crashed some time after starting successfully.</source>
-        <translation type="unfinished">アップロードの開始後にプロセスがクラッシュしました。</translation>
+        <translation>アップロードの開始後にプロセスがクラッシュしました。</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
-        <translation type="unfinished">直前のwaitFor...() 関数はタイムアウトしました。QProcessの状態に変化がありませんので、再度 waitFor...() を呼び出せます。</translation>
+        <translation>直前の waitFor...() 関数はタイムアウトしました。QProcessの状態に変化がないので、再度 waitFor...() を呼び出せます。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>An error occurred when attempting to write to the upload process. For example, the process may not be running, or it may have closed its input channel.</source>
-        <translation type="unfinished">アップロードプロセスへの書き込み時にエラーが発生しました。プロセスが動作していないか、入力チャネルが閉じられている可能性があります。</translation>
+        <translation>アップロードプロセスへの書き込み時にエラーが発生しました。プロセスが動作していないか、入力チャネルが閉じられている可能性があります。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>An error occurred when attempting to read from the upload process. For example, the process may not be running.</source>
-        <translation type="unfinished">アップロードプロセスからの読み込み時にエラーが発生しました。アップロードプロセスが動作していない可能性があります。</translation>
+        <translation>アップロードプロセスからの読み込み時にエラーが発生しました。アップロードプロセスが動作していない可能性があります。</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>An unknown error in the upload process occurred. This is the default return value of error().</source>
-        <translation type="unfinished">アップロードプロセスで不明なエラーが発生しました。error()がデフォルト値で呼び出されている場合などに生じるエラーです。</translation>
+        <translation>アップロードプロセスで不明なエラーが発生しました。error()がデフォルト値で呼び出されている場合などに生じるエラーです。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Error</source>
-        <translation type="unfinished">エラー</translation>
+        <translation>エラー</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>Adapter too old: does not support asynchronous mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>アダプタが古すぎる為、非同期モードをサポートしていません。</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>Starting remote executable failed:
 </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Attached to stopped inferior.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Connecting to remote server failed:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+56"/>
-        <source>Inferior process could not be stopped:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>Gdb process could not be stopped:
-</source>
-        <translation type="unfinished"></translation>
+        <translation>リモート実行が開始できませんでした:
+</translation>
     </message>
 </context>
 <context>
     <name>Debugger::Internal::TrkGdbAdapter</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1687"/>
-        <source>Connecting to trk server adapter failed:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Inferior running.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Connecting to remote server failed:</source>
-        <translation type="unfinished">リモートサーバへの接続に失敗しました。</translation>
-    </message>
-    <message>
-        <location line="+404"/>
-        <source>Inferior process could not be stopped:
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1605"/>
+        <source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source>
+        <translation>プロセス(PID: 0x%1、スレッドID: %2、コード セグメント: 0x%3、データ セグメント: %4)が開始しました。</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Gdb process could not be stopped:
+        <location line="+25"/>
+        <source>Connecting to TRK server adapter failed:
 </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Debugger::Internal::TrkOptionsPage</name>
-    <message>
-        <location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+43"/>
-        <source>S60 / Trk</source>
-        <translation type="unfinished"></translation>
+        <translation>TRK サーバ アダプタへの接続に失敗しました:
+</translation>
     </message>
 </context>
 <context>
     <name>NameDemanglerPrivate</name>
     <message>
-        <location filename="../../../src/plugins/debugger/name_demangler.cpp" line="+310"/>
+        <location filename="../../../src/plugins/debugger/name_demangler.cpp" line="+331"/>
         <source>Premature end of input</source>
-        <translation type="unfinished"></translation>
+        <translation>入力の途中終了</translation>
     </message>
     <message>
         <location line="+90"/>
         <source>Invalid encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>不正なエンコード</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+54"/>
         <source>Invalid name</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な名前</translation>
     </message>
     <message>
         <location line="+40"/>
         <location line="+9"/>
         <source>Invalid nested-name</source>
-        <translation type="unfinished"></translation>
+        <translation>不正にネストされた名前</translation>
     </message>
     <message>
         <location line="+111"/>
         <location line="+8"/>
         <source>Invalid template args</source>
-        <translation type="unfinished"></translation>
+        <translation>不正なテンプレート引数</translation>
     </message>
     <message>
         <location line="+18"/>
         <location line="+8"/>
         <source>Invalid template-param</source>
-        <translation type="unfinished"></translation>
+        <translation>不正なテンプレート パラメータ</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Invalid qualifiers: unexpected &apos;volatile&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な修飾詞: 予期せぬ &apos;volatile&apos;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Invalid qualifiers: &apos;const&apos; appears twice</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な修飾詞:  二重になっている &apos;const&apos;</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>Invalid non-negative number</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な非負数</translation>
     </message>
     <message>
         <location line="+58"/>
         <location line="+9"/>
         <location line="+2"/>
         <source>Invalid template-arg</source>
-        <translation type="unfinished"></translation>
+        <translation>不正なテンプレート引数</translation>
     </message>
     <message>
         <location line="+64"/>
         <location line="+15"/>
         <location line="+43"/>
         <source>Invalid expression</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な式</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Invalid primary expression</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な一次式</translation>
     </message>
     <message>
         <location line="+11"/>
         <location line="+5"/>
         <location line="+3"/>
         <source>Invalid expr-primary</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な一次式</translation>
     </message>
     <message>
         <location line="+135"/>
         <location line="+5"/>
-        <location line="+67"/>
+        <location line="+68"/>
         <source>Invalid type</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な型</translation>
     </message>
     <message>
         <location line="+138"/>
         <source>Invalid built-in type</source>
-        <translation type="unfinished"></translation>
+        <translation>不正なビルトイン型</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Invalid builtin-type</source>
-        <translation type="unfinished"></translation>
+        <translation>不正なビルトイン型</translation>
     </message>
     <message>
         <location line="+16"/>
         <location line="+8"/>
         <source>Invalid function type</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な関数</translation>
     </message>
     <message>
-        <location line="+79"/>
-        <location line="+320"/>
+        <location line="+80"/>
+        <location line="+328"/>
         <source>Invalid unqualified-name</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な非修飾名</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-237"/>
         <source>Invalid operator-name &apos;%s&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>不正なオペレータ名 &apos;%s&apos;</translation>
     </message>
     <message>
         <location line="+22"/>
         <location line="+10"/>
         <source>Invalid array-type</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な配列型</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>Invalid pointer-to-member-type</source>
-        <translation type="unfinished"></translation>
+        <translation>不正なポインタ型メンバ</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+47"/>
         <location line="+10"/>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Invalid substitution</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な代入</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-42"/>
         <source>Invalid substitution: element %1 was requested, but there are only %2</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な代入: %1番目の要素が要求されましたが、%2個しかありません</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Invalid substitution: There are no elements</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な代入: 要素がありません</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+103"/>
         <source>Invalid special-name</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な特殊名</translation>
     </message>
     <message>
         <location line="+43"/>
         <location line="+4"/>
-        <location line="+11"/>
+        <location line="+13"/>
         <source>Invalid local-name</source>
-        <translation type="unfinished"></translation>
+        <translation>不正なローカル名</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Invalid discriminator</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な識別子</translation>
     </message>
     <message>
         <location line="+32"/>
         <location line="+11"/>
         <location line="+4"/>
         <source>Invalid ctor-dtor-name</source>
-        <translation type="unfinished"></translation>
+        <translation>不正なコンストラクタ/デストラクタ名</translation>
     </message>
     <message>
         <location line="+48"/>
         <location line="+3"/>
         <source>Invalid call-offset</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な呼び出しオフセット</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Invalid v-offset</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な仮想呼び出しオフセット</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Invalid digit</source>
-        <translation type="unfinished"></translation>
+        <translation>不正な数値</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>At position %1: </source>
-        <translation type="unfinished"></translation>
+        <translation>位置 %1: </translation>
     </message>
 </context>
 <context>
@@ -15679,7 +14612,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/designer/formwindoweditor.cpp" line="+167"/>
         <source>untitled</source>
-        <translation type="unfinished">無題</translation>
+        <translation>無題</translation>
     </message>
 </context>
 <context>
@@ -15687,12 +14620,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/clonewizard.cpp" line="+53"/>
         <source>Clones a project from a git repository.</source>
-        <translation type="unfinished"></translation>
+        <translation>git リポジトリからプロジェクトをクローンします。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Git Repository Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Git リポジトリ クローン</translation>
     </message>
 </context>
 <context>
@@ -15700,12 +14633,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/clonewizardpage.cpp" line="+58"/>
         <source>Specify repository URL, checkout directory and path.</source>
-        <translation type="unfinished"></translation>
+        <translation>リポジトリのURL、チェックアウト先ディレクトリおよびパスを指定して下さい。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Clone URL:</source>
-        <translation type="unfinished"></translation>
+        <translation>クローン URL:</translation>
     </message>
 </context>
 <context>
@@ -15713,17 +14646,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitorious.cpp" line="+471"/>
         <source>Error parsing reply from &apos;%1&apos;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; からの応答を解析中にエラー: %2</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Request failed for &apos;%1&apos;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; への要求に失敗: %2</translation>
     </message>
     <message>
         <location line="+80"/>
         <source>Open source projects that use Git.</source>
-        <translation type="unfinished"></translation>
+        <translation>Git を使ったオープン ソース プロジェクトです。</translation>
     </message>
 </context>
 <context>
@@ -15731,12 +14664,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousclonewizard.cpp" line="+81"/>
         <source>Clones a project from a Gitorious repository.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gitorious リポジトリからプロジェクトをクローンします。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Gitorious Repository Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Gitorious リポジトリ クローン</translation>
     </message>
 </context>
 <context>
@@ -15744,7 +14677,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitorioushostwizardpage.cpp" line="+76"/>
         <source>Select a host.</source>
-        <translation type="unfinished"></translation>
+        <translation>ホストを選択してください。</translation>
     </message>
 </context>
 <context>
@@ -15752,7 +14685,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp" line="+57"/>
         <source>Choose a project from &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; からプロジェクトを選択</translation>
     </message>
 </context>
 <context>
@@ -15760,33 +14693,33 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/help/generalsettingspage.cpp" line="+74"/>
         <source>General settings</source>
-        <translation type="unfinished">基本設定</translation>
+        <translation>基本設定</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Help</source>
-        <translation type="unfinished">ヘルプ</translation>
+        <translation>ヘルプ</translation>
     </message>
     <message>
         <location line="+122"/>
         <source>Open Image</source>
-        <translation type="unfinished"></translation>
+        <translation>ヘルプ ブックマークを開く</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+22"/>
         <source>Files (*.xbel)</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイル (*.xbel)</translation>
     </message>
     <message>
         <location line="-8"/>
         <source>There was an error while importing bookmarks!</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマークをインポート中にエラーが発生しました!</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Save File</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイルの保存</translation>
     </message>
 </context>
 <context>
@@ -15794,30 +14727,30 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/help/xbelsupport.cpp" line="+119"/>
         <source>The file is not an XBEL version 1.0 file.</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイルは XBEL バージョン 1.0 形式のファイルではありません。</translation>
     </message>
     <message>
         <location line="+73"/>
         <source>Unknown title</source>
-        <translation type="unfinished"></translation>
+        <translation>不明なタイトル</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::ApplicationLauncher</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+123"/>
+        <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+126"/>
         <source>Failed to start program. Path or permissions wrong?</source>
-        <translation type="unfinished">プログラムを開始できませんでした。パスかパーミッションに誤りはありませんか?</translation>
+        <translation>プログラムを開始できませんでした。パスかパーミッションに誤りはありませんか?</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The program has unexpectedly finished.</source>
-        <translation type="unfinished">プログラムが突然終了しました。</translation>
+        <translation>プログラムが突然終了しました。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Some error has occurred while running the program.</source>
-        <translation type="unfinished">プログラムを実行中にいくつかエラーが発生しました。</translation>
+        <translation>プログラムを実行中にいくつかエラーが発生しました。</translation>
     </message>
 </context>
 <context>
@@ -15825,7 +14758,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../../../src/plugins/projectexplorer/applicationrunconfiguration.cpp" line="+89"/>
         <source>Run</source>
-        <translation type="unfinished">実行</translation>
+        <translation>実行</translation>
     </message>
 </context>
 <context>
@@ -15833,30 +14766,30 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+48"/>
         <source>Starting %1...</source>
-        <translation type="unfinished">%1 を起動中...</translation>
+        <translation>%1 を起動中...</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>%1 exited with code %2</source>
-        <translation type="unfinished">%1 はコード %2 で終了しました</translation>
+        <translation>%1 はコード %2 で終了しました</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::DebuggingHelperLibrary</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+131"/>
+        <location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+135"/>
         <source>The target directory %1 could not be created.</source>
-        <translation type="unfinished"></translation>
+        <translation>ターゲット ディレクトリ %1 を作成できませんでした。</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>The existing file %1 could not be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation>既存ファイル %1 を削除できませんでした。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The file %1 could not be copied to %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイル %1 を %2 にコピーできませんでした。</translation>
     </message>
     <message>
         <location line="+25"/>
@@ -15864,62 +14797,70 @@ p, li { white-space: pre-wrap; }
 - %1
 
 Reason: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッガヘルパがいづれのディレクトリでもビルドできませんでした:
+- %1
+
+理由: %2</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Building debugging helper library in %1
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 でデバッグヘルパライブラリをビルド中
+</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Running %1 %2...
 </source>
-        <translation type="unfinished"></translation>
+        <translation>実行中です %1 %2...
+</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+21"/>
         <source>%1 not found in PATH
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 が環境変数 PATH に見つかりません
+</translation>
     </message>
     <message>
         <location line="-16"/>
         <location line="+11"/>
         <source>Running %1 ...
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 を実行中...
+</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::ProjectWelcomePage</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/projectwelcomepage.h" line="+47"/>
+        <location filename="../../../src/plugins/projectexplorer/projectwelcomepage.h" line="+48"/>
         <source>Develop</source>
-        <translation type="unfinished">開発</translation>
+        <translation>開発</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::ActiveConfigurationWidget</name>
     <message>
+        <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+6"/>
         <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="-530"/>
         <source>Active run configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>アクティブな実行構成</translation>
     </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::ProjectLabel</name>
     <message>
-        <location line="+375"/>
+        <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+375"/>
         <source>Edit Project Settings for Project &lt;b&gt;%1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; のプロジェクト設定を編集</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>No Project loaded</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクトが読み込まれていません</translation>
     </message>
 </context>
 <context>
@@ -15927,7 +14868,7 @@ Reason: %2</source>
     <message>
         <location line="+11"/>
         <source>Select Project</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクトを選択</translation>
     </message>
 </context>
 <context>
@@ -15935,62 +14876,57 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/projectexplorer/toolchain.cpp" line="+113"/>
         <source>GCC</source>
-        <translation type="unfinished"></translation>
+        <translation>GCC</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Intel C++ Compiler (Linux)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>MinGW</source>
-        <translation type="unfinished"></translation>
+        <translation>インテル C++ コンパイラ (Linux)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>Microsoft Visual C++</source>
-        <translation type="unfinished"></translation>
+        <translation>Microsoft Visual C++</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Windows CE</source>
-        <translation type="unfinished"></translation>
+        <translation>Windows CE</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>WINSCW</source>
-        <translation type="unfinished"></translation>
+        <translation>WINSCW</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>GCCE</source>
-        <translation type="unfinished"></translation>
+        <translation>GCCE</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>RVCT (ARMV5)</source>
-        <translation type="unfinished"></translation>
+        <translation>RVCT (ARMV5)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>RVCT (ARMV6)</source>
-        <translation type="unfinished"></translation>
+        <translation>RVCT (ARMV6)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Other</source>
-        <translation type="unfinished"></translation>
+        <translation>その他</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&lt;Invalid&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;無効&gt;</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&lt;Unknown&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;不明&gt;</translation>
     </message>
 </context>
 <context>
@@ -15998,40 +14934,40 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qmleditor/qmleditor.cpp" line="+468"/>
         <source>&lt;Select Symbol&gt;</source>
-        <translation type="unfinished">&lt;シンボルを選択&gt;</translation>
+        <translation>&lt;シンボルを選択&gt;</translation>
     </message>
     <message>
         <location line="+101"/>
         <source>Rename...</source>
-        <translation type="unfinished">名前を変更...</translation>
+        <translation>名前を変更...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New id:</source>
-        <translation type="unfinished">新しい ID:</translation>
+        <translation>新しい ID:</translation>
     </message>
     <message>
         <location line="+191"/>
         <source>Rename id &apos;%1&apos;...</source>
-        <translation type="unfinished">ID &apos;%1&apos; の名前を変更...</translation>
+        <translation>ID &apos;%1&apos; の名前を変更...</translation>
     </message>
 </context>
 <context>
     <name>QmlEditor::Internal::QmlEditorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/qmleditor/qmleditorplugin.cpp" line="+103"/>
+        <location filename="../../../src/plugins/qmleditor/qmleditorplugin.cpp" line="+106"/>
         <source>Qt</source>
-        <translation type="unfinished">Qt</translation>
+        <translation>Qt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates a Qt QML file.</source>
-        <translation type="unfinished">Qt QML ファイルを作成します。</translation>
+        <translation>Qt QML ファイルを作成します。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt QML File</source>
-        <translation type="unfinished">Qt QML ファイル</translation>
+        <translation>Qt QML ファイル</translation>
     </message>
 </context>
 <context>
@@ -16039,7 +14975,7 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qmleditor/qmlmodelmanager.cpp" line="+98"/>
         <source>Indexing</source>
-        <translation type="unfinished">解析中</translation>
+        <translation>解析中</translation>
     </message>
 </context>
 <context>
@@ -16047,7 +14983,7 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qmlprojectmanager/qmlmakestep.cpp" line="+134"/>
         <source>&lt;b&gt;QML Make&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;QML Make&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
@@ -16056,17 +14992,17 @@ Reason: %2</source>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp" line="+48"/>
         <location line="+11"/>
         <source>&lt;New class&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;新しいクラス&gt;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Confirm Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>削除の確認</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Delete class %1 from list?</source>
-        <translation type="unfinished"></translation>
+        <translation>クラス %1 をリストから削除しますか?</translation>
     </message>
 </context>
 <context>
@@ -16074,12 +15010,12 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp" line="+43"/>
         <source>Qt4 Designer Custom Widget</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt4 デザイナーカスタムウィジェット</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creates a Qt4 Designer Custom Widget or a Custom Widget Collection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt4 デザイナー用カスタムウィジェットまたはカスタムウィジェットコレクションを作成をします。</translation>
     </message>
 </context>
 <context>
@@ -16087,7 +15023,7 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp" line="+56"/>
         <source>This wizard generates a Qt4 Designer Custom Widget or a Qt4 Designer Custom Widget Collection project.</source>
-        <translation type="unfinished"></translation>
+        <translation>このウィザードでは Qt4 デザイナー用カスタムウィジェットもしくは Qt4 デザイナーカスタムウィジェットコレクションプロジェクトを生成します。</translation>
     </message>
 </context>
 <context>
@@ -16095,17 +15031,17 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp" line="+60"/>
         <source>Cannot open icon file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>アイコンファイル %1 を開けません。</translation>
     </message>
     <message>
         <location line="+102"/>
         <source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>一つのプロジェクト(%3)で複数のウィジェットライブラリ(%1, %2)の作成はサポートしていません。</translation>
     </message>
     <message>
         <location line="+133"/>
         <source>Cannot open %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 を開けません: %2</translation>
     </message>
 </context>
 <context>
@@ -16113,261 +15049,334 @@ Reason: %2</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepage.h" line="+47"/>
         <source>Getting Started</source>
-        <translation type="unfinished">Qt Creator を始めよう</translation>
+        <translation>Qt Creator を始めよう</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60DeviceRunConfiguration</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+77"/>
-        <source>%1 on Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+86"/>
         <source>QtS60DeviceRunConfiguration</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt S60 デバイス実行構成</translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+205"/>
         <source>Could not parse %1. The QtS60 Device run configuration %2 can not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 をパースできません。QtS60 デバイスの実行構成 %2 を開始できません。</translation>
+    </message>
+    <message>
+        <location line="-207"/>
+        <source>%1 on Symbian Device</source>
+        <translation>Symbian デバイス上の %1</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationWidget</name>
     <message>
-        <location line="+67"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp" line="+75"/>
+        <source>Device:</source>
+        <translation>デバイス:</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Name:</source>
-        <translation type="unfinished">名前:</translation>
+        <translation>名前:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+3"/>
         <source>Install File:</source>
-        <translation type="unfinished"></translation>
+        <translation>インストールするファイル:</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+11"/>
         <source>Device on Serial Port:</source>
-        <translation type="unfinished"></translation>
+        <translation>シリアルポートのデバイス:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
+        <source>Queries the device for information</source>
+        <translation>デバイスの情報を取得</translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Self-signed certificate</source>
-        <translation type="unfinished"></translation>
+        <translation>自己署名証明書</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Choose certificate file (.cer)</source>
-        <translation type="unfinished"></translation>
+        <translation>証明書ファイル(.cer)の選択</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Custom certificate:</source>
-        <translation type="unfinished"></translation>
+        <translation>カスタム証明書:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Choose key file (.key / .pem)</source>
-        <translation type="unfinished"></translation>
+        <translation>秘密鍵ファイルの選択(.key / .pem)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Key file:</source>
-        <translation type="unfinished"></translation>
+        <translation>秘密鍵ファイル:</translation>
+    </message>
+    <message>
+        <location line="+126"/>
+        <source>&lt;No Device&gt;</source>
+        <extracomment>Summary text of S60 device run configuration</extracomment>
+        <translation>&lt;デバイスなし&gt;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>(custom certificate)</source>
+        <translation>(カスタム証明書)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(self-signed certificate)</source>
+        <translation>(自己署名証明書)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Summary: Run on &apos;%1&apos; %2</source>
+        <translation>サマリー: &apos;%1&apos; %2 で実行</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Connecting...</source>
+        <translation>接続中...</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationFactory</name>
     <message>
-        <location line="+116"/>
-        <source>%1 on Device</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+294"/>
+        <source>%1 on Symbian Device</source>
+        <translation>Symbian デバイス上の %1</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60DeviceRunControlBase</name>
     <message>
-        <location line="+74"/>
+        <location line="+83"/>
+        <source>There is no device plugged in.</source>
+        <translation>デバイスが接続されていません。</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Creating %1.sisx ...</source>
-        <translation type="unfinished"></translation>
+        <translation>%1.sisx の作成中...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Executable file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>実行ファイル: %1</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+78"/>
+        <location line="+8"/>
+        <source>Debugger for Symbian Platform</source>
+        <translation>Symbian プラットフォーム用のデバッガ</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+90"/>
         <source>%1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-42"/>
         <source>Could not read template package file &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>テンプレートパッケージファイル &apos;%1&apos; を読み込めません</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Could not write package file &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>パッケージファイル &apos;%1&apos; に書き込めません</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+28"/>
+        <location line="+16"/>
+        <location line="+29"/>
         <source>An error occurred while creating the package.</source>
-        <translation type="unfinished"></translation>
+        <translation>パッケージの作成中にエラーが発生しました。</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+26"/>
         <source>Package: %1
 Deploying application to &apos;%2&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation>パッケージ: %1
+アプリケーションを &apos;%2&apos; へ転送中...</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+21"/>
         <source>Could not connect to phone on port &apos;%1&apos;: %2
-Check if the phone is connected and the TRK application is running.</source>
-        <translation type="unfinished"></translation>
+Check if the phone is connected and App TRK is running.</source>
+        <translation>ポート &apos;%1&apos; のデバイスに接続できません: %2
+デバイスが接続済みであり、 TRK アプリケーションが実行中であるか確認してください。</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Could not create file %1 on device: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>デバイス上にファイル %1 を作成できません: %2</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Could not write to file %1 on device: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>デバイス上にファイル %1 を書き込めません: %2</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Could not close file %1 on device: %2. It will be closed when App TRK is closed.</source>
-        <translation type="unfinished"></translation>
+        <translation>デバイス上のファイル %1 を閉じれません: %2。TRK アプリケーションを閉じるときにファイルも閉じられます。</translation>
     </message>
     <message>
         <location line="+6"/>
+        <source>Could not connect to App TRK on device: %1. Restarting App TRK might help.</source>
+        <translation>デバイスの TRK アプリケーションに接続できません: %1。 TRK アプリケーションを再起動してください。</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Copying install file...</source>
-        <translation type="unfinished"></translation>
+        <translation>インストールファイルをコピー中...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1% copied.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1% コピーしました。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Installing application...</source>
-        <translation type="unfinished"></translation>
+        <translation>アプリケーションのインストール中...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Could not install from package %1 on device: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>デバイスにパッケージ %1 からインストールできません: %2</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
+        <source>Waiting for App TRK</source>
+        <translation>TRK アプリケーションを待機中</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Please start App TRK on %1.</source>
+        <translation>%1 で TRK アプリケーションを起動してください。</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Canceled.</source>
+        <translation>キャンセルしました。</translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Failed to start %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 の起動に失敗しました。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1 has unexpectedly finished.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は突然終了しました。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>An error has occurred while running %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 の実行中にエラーが発生しました。</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60DeviceRunControl</name>
     <message>
-        <location line="+30"/>
+        <location line="+38"/>
         <source>Finished.</source>
-        <translation type="unfinished"></translation>
+        <translation>終了。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Starting application...</source>
-        <translation type="unfinished"></translation>
+        <translation>アプリケーションの起動中...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Application running with pid %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>アプリケーションは pid %1 で動作中。</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Could not start application: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>アプリケーションを起動できません: %1</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60DeviceDebugRunControl</name>
     <message>
-        <location line="+50"/>
+        <location line="+51"/>
         <source>Warning: Cannot locate the symbol file belonging to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>警告: %1に属するシンボルファイルを配置できません。</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Launching debugger...</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッガの起動中...</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Debugging finished.</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッグ終了。</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60DevicesWidget</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="-23"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="-28"/>
         <source>No Qt installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt がインストールされていません</translation>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::S60EmulatorRunConfiguration</name>
+    <name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationWidget</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+55"/>
-        <source>%1 in Emulator</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+198"/>
+        <source>Name:</source>
+        <translation>名前:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>QtS60EmulatorRunConfiguration</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <source>Executable:</source>
+        <translation>実行ファイル:</translation>
     </message>
     <message>
-        <location line="+87"/>
-        <source>Could not parse %1. The QtS60 emulator run configuration %2 can not be started.</source>
-        <translation type="unfinished"></translation>
+        <location line="+21"/>
+        <source>Summary: Run %1 in emulator</source>
+        <translation>サマリー: エミュレータを %1 で実行</translation>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationWidget</name>
+    <name>Qt4ProjectManager::Internal::S60EmulatorRunConfiguration</name>
     <message>
-        <location line="+40"/>
-        <source>Name:</source>
-        <translation type="unfinished">名前:</translation>
+        <location line="-165"/>
+        <source>%1 in Symbian Emulator</source>
+        <translation>Symbian エミュレータ上の %1</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Executable:</source>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>QtSymbianEmulatorRunConfiguration</source>
+        <translation>Qt Symbian エミュレータ実行構成</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Could not parse %1. The Qt for Symbian emulator run configuration %2 can not be started.</source>
+        <translation>%1 をパースできません。Qt for Symbian エミュレータの実行時の条件設定 %2 を開始できません。</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationFactory</name>
     <message>
-        <location line="+52"/>
-        <source>%1 in Emulator</source>
-        <translation type="unfinished"></translation>
+        <location line="+113"/>
+        <source>%1 in Symbian Emulator</source>
+        <translation>Symbian エミュレータ上の %1</translation>
     </message>
 </context>
 <context>
@@ -16375,35 +15384,35 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location line="+48"/>
         <source>Starting %1...</source>
-        <translation type="unfinished">%1 を起動中...</translation>
+        <translation>%1 を起動中...</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>[Qt Message]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Qt メッセージ]</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>%1 exited with code %2</source>
-        <translation type="unfinished">%1 はコード %2 で終了しました</translation>
+        <translation>%1 はコード %2 で終了しました</translation>
     </message>
 </context>
 <context>
     <name>Qt4ProjectManager::Internal::S60Manager</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+111"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+113"/>
         <source>Run in Emulator</source>
-        <translation type="unfinished"></translation>
+        <translation>エミュレータで実行</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Run on Device</source>
-        <translation type="unfinished"></translation>
+        <translation>デバイスで実行</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Debug on Device</source>
-        <translation type="unfinished"></translation>
+        <translation>デバイスでデバッグ</translation>
     </message>
 </context>
 <context>
@@ -16411,22 +15420,32 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/qt4projectmanager/qt4project.cpp" line="+252"/>
         <source>Using Default Qt Version</source>
-        <translation type="unfinished"></translation>
+        <translation>デフォルトの Qt バージョンを使用</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Using Qt Version &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt バージョン &quot;%1&quot; を使用</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>New configuration</source>
-        <translation type="unfinished">新しい構成</translation>
+        <translation>新しい構成</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New Configuration Name:</source>
-        <translation type="unfinished">新しい構成名:</translation>
+        <translation>新しい構成名:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 Debug</source>
+        <translation>%1 デバッグ</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%1 Release</source>
+        <translation>%1 リリース</translation>
     </message>
 </context>
 <context>
@@ -16434,12 +15453,12 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/subversion/checkoutwizard.cpp" line="+54"/>
         <source>Checks out a project from a Subversion repository.</source>
-        <translation type="unfinished"></translation>
+        <translation>Subversion リポジトリからプロジェクトをチェックアウトします。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Subversion Checkout</source>
-        <translation type="unfinished"></translation>
+        <translation>Subversion チェックアウト</translation>
     </message>
 </context>
 <context>
@@ -16447,12 +15466,12 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/subversion/checkoutwizardpage.cpp" line="+38"/>
         <source>Specify repository, checkout directory and path.</source>
-        <translation type="unfinished"></translation>
+        <translation>リポジトリ、チェックアウト先ディレクトリおよびパスを指定してください。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Repository:</source>
-        <translation type="unfinished">リポジトリ:</translation>
+        <translation>リポジトリ:</translation>
     </message>
 </context>
 <context>
@@ -16460,7 +15479,7 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/texteditor/colorscheme.cpp" line="+210"/>
         <source>Not a color scheme file.</source>
-        <translation type="unfinished"></translation>
+        <translation>カラースキームファイルではありません。</translation>
     </message>
 </context>
 <context>
@@ -16468,7 +15487,7 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/texteditor/fontsettings.cpp" line="+136"/>
         <source>Customized</source>
-        <translation type="unfinished"></translation>
+        <translation>カスタムフォント</translation>
     </message>
 </context>
 <context>
@@ -16476,55 +15495,60 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/vcsbase/basecheckoutwizard.cpp" line="+103"/>
         <source>Cannot Open Project</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクトを開けません</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Failed to open project in &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; にあるプロジェクトが開けませんでした。</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Could not find any project files matching (%1) in the directory &apos;%2&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation>ディレクトリ &apos;%2&apos; 内に (%1) にマッチするプロジェクトファイルが見つかりませんでした。</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>The Project Explorer is not available.</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクト エクスプローラは使用できません。</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&apos;%1&apos; does not exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; は存在しません。</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Unable to open the project &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクト &apos;%1&apos; が開けませんでした。</translation>
     </message>
 </context>
 <context>
     <name>VCSBase::ProcessCheckoutJob</name>
     <message>
-        <location filename="../../../src/plugins/vcsbase/checkoutjobs.cpp" line="+109"/>
+        <location filename="../../../src/plugins/vcsbase/checkoutjobs.cpp" line="+101"/>
+        <source>Unable to start %1: %2</source>
+        <translation>%1 を開始できません: %2</translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>The process terminated with exit code %1.</source>
-        <translation type="unfinished">プロセスは終了コード %1 で終了しました。</translation>
+        <translation>プロセスは終了コード %1 で終了しました。</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The process returned exit code %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>プロセスは終了コード %1 をリターンしました。</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The process terminated in an abnormal way.</source>
-        <translation type="unfinished"></translation>
+        <translation>プロセスは異常終了しました。</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Stopping...</source>
-        <translation type="unfinished"></translation>
+        <translation>停止中...</translation>
     </message>
 </context>
 <context>
@@ -16532,17 +15556,17 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/vcsbase/checkoutprogresswizardpage.cpp" line="+66"/>
         <source>Checkout started...</source>
-        <translation type="unfinished"></translation>
+        <translation>チェックアウトを開始しました...</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>Failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>失敗しました。</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Succeeded.</source>
-        <translation type="unfinished"></translation>
+        <translation>成功しました。</translation>
     </message>
 </context>
 <context>
@@ -16550,12 +15574,12 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/vcsbase/vcsbaseoutputwindow.cpp" line="+90"/>
         <source>Clear</source>
-        <translation type="unfinished">クリア</translation>
+        <translation>クリア</translation>
     </message>
     <message>
         <location line="+78"/>
         <source>Version Control</source>
-        <translation type="unfinished"></translation>
+        <translation>バージョン管理</translation>
     </message>
 </context>
 <context>
@@ -16563,145 +15587,433 @@ Check if the phone is connected and the TRK application is running.</source>
     <message>
         <location filename="../../../src/plugins/welcome/communitywelcomepage.h" line="+49"/>
         <source>Community</source>
-        <translation type="unfinished">コミュニティ</translation>
+        <translation>コミュニティ</translation>
     </message>
 </context>
 <context>
     <name>MimeType</name>
     <message>
-        <location filename="mime_tr.h" line="+1"/>
+        <location filename="../../../../../../../../../home/asaki/Qt/build/build-qt-creator-jp/share/qtcreator/translations/mime_tr.h" line="+1"/>
         <source>unknown</source>
-        <translation type="unfinished">不明</translation>
+        <translation>不明</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>CMake Project file</source>
-        <translation type="unfinished"></translation>
+        <translation>CMake プロジェクト ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C Source file</source>
-        <translation type="unfinished"></translation>
+        <translation>C ソース ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C Header file</source>
-        <translation type="unfinished"></translation>
+        <translation>C ヘッダー ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C++ Header file</source>
-        <translation type="unfinished"></translation>
+        <translation>C++ ヘッダー ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C++ header</source>
-        <translation type="unfinished"></translation>
+        <translation>C++ ヘッダー</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C++ Source file</source>
-        <translation type="unfinished"></translation>
+        <translation>C++ ソース ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C++ source code</source>
-        <translation type="unfinished"></translation>
+        <translation>C++ ソース コード</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Objective-C source code</source>
-        <translation type="unfinished"></translation>
+        <translation>Objective-C ソース コード</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>CVS submit template</source>
-        <translation type="unfinished"></translation>
+        <translation>CVS コミット テンプレート</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Designer file</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt デザイナ ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic Qt Creator Project file</source>
-        <translation type="unfinished"></translation>
+        <translation>標準 Qt Creator プロジェクトファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic Project Files</source>
-        <translation type="unfinished"></translation>
+        <translation>標準プロジェクト ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic Project Include Paths</source>
-        <translation type="unfinished"></translation>
+        <translation>標準プロジェクト インクルード パス</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic Project Configuration File</source>
-        <translation type="unfinished"></translation>
+        <translation>標準プロジェクト構成ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Perforce submit template</source>
-        <translation type="unfinished"></translation>
+        <translation>Perforce コミット テンプレート</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>QML file</source>
-        <translation type="unfinished"></translation>
+        <translation>QML ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qml Project file</source>
-        <translation type="unfinished"></translation>
+        <translation>Qml プロジェクト ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Project file</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt プロジェクト ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Project include file</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt プロジェクト インクルード ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>message catalog</source>
-        <translation type="unfinished"></translation>
+        <translation>メッセージ カタログ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Script file</source>
-        <translation type="unfinished">Qt スクリプト ファイル</translation>
+        <translation>Qt スクリプト ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qt Resource file</source>
-        <translation type="unfinished">Qt リソースファイル</translation>
+        <translation>Qt リソースファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Subversion submit template</source>
-        <translation type="unfinished"></translation>
+        <translation>Subversion コミット テンプレート</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Plain text document</source>
-        <translation type="unfinished"></translation>
+        <translation>テキスト文書</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>XML document</source>
-        <translation type="unfinished"></translation>
+        <translation>XML ドキュメント</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Differences between files</source>
-        <translation type="unfinished"></translation>
+        <translation>差分ファイル</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::AbstractGdbAdapter</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/gdb/abstractgdbadapter.cpp" line="+74"/>
+        <source>The Gdb process could not be stopped:
+%1</source>
+        <translation>Gdb プロセスを停止できませんでした: 
+%1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inferior process could not be stopped:
+%1</source>
+        <translation>プログラムを停止できませんでした:
+%1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inferior started.</source>
+        <translation>プログラムを開始しました。</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inferior running.</source>
+        <translation>プログラムを実行しています。</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Attached to stopped inferior.</source>
+        <translation>停止済のプログラムにアタッチしました。</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Connecting to remote server failed:
+%1</source>
+        <translation>リモート サーバへの接続に失敗しました:
+%1</translation>
+    </message>
+</context>
+<context>
+    <name>TrkOptions</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/gdb/trkoptions.cpp" line="+91"/>
+        <source>No Symbian gdb executable specified.</source>
+        <translation>Symbian 用 Gdb 実行ファイルが指定されていません。</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>The Symbian gdb executable &apos;%1&apos; could not be found in the search path.</source>
+        <translation>Symbian 用 Gdb の実行ファイル &apos;%1&apos; が検索パスに見つかりません。</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::TermGdbAdapter</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+177"/>
+        <source>Debugger Error</source>
+        <translation>デバッガエラー</translation>
+    </message>
+</context>
+<context>
+    <name>Debugger::Internal::TrkOptionsPage</name>
+    <message>
+        <location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+43"/>
+        <source>Symbian TRK</source>
+        <translation>Symbian TRK</translation>
+    </message>
+</context>
+<context>
+    <name>QmlParser</name>
+    <message>
+        <location filename="../../../src/plugins/qmleditor/parser/qmljslexer.cpp" line="+553"/>
+        <source>Illegal character</source>
+        <translation>無効な文字</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Unclosed string at end of line</source>
+        <translation>文末で閉じられていない文字列</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Illegal escape squence</source>
+        <translation>無効なエスケープシーケンス</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Illegal unicode escape sequence</source>
+        <translation>無効な UNICODE エスケープシーケンス</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Unclosed comment at end of file</source>
+        <translation>文末で閉じられていないコメント</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Illegal syntax for exponential number</source>
+        <translation>無効な指数シンタックス</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Identifier cannot start with numeric literal</source>
+        <translation>識別子は数字で始められません</translation>
+    </message>
+    <message>
+        <location line="+331"/>
+        <source>Unterminated regular expression literal</source>
+        <translation>閉じられていない正規表現</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Invalid regular expression flag &apos;%0&apos;</source>
+        <translation>無効な正規表現フラグ &apos;%0&apos;</translation>
+    </message>
+    <message>
+        <location filename="../../../src/plugins/qmleditor/parser/qmljsparser.cpp" line="+1752"/>
+        <source>Unexpected token &apos;%1&apos;</source>
+        <translation>予期せぬトークン &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+23"/>
+        <source>Expected token &apos;%1&apos;</source>
+        <translation>予期したトークン &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Syntax error</source>
+        <translation>シンタックスエラー</translation>
+    </message>
+</context>
+<context>
+    <name>Qt4ProjectManager::Internal::S60Devices::Device</name>
+    <message>
+        <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devices.cpp" line="+66"/>
+        <source>Id:</source>
+        <translation>ID:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Name:</source>
+        <translation>名前:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>EPOC:</source>
+        <translation>EPOC:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Tools:</source>
+        <translation>ツール:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Qt:</source>
+        <translation>Qt:</translation>
+    </message>
+</context>
+<context>
+    <name>trk::BluetoothListener</name>
+    <message>
+        <location filename="../../../src/shared/trk/bluetoothlistener.cpp" line="+133"/>
+        <source>%1: Stopping listener %2...</source>
+        <translation>%1: リスナ %2 を停止中...</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>%1: Starting Bluetooth listener %2...</source>
+        <translation>%1: Bluetooth リスナ %2 を起動中...</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Unable to run &apos;%1&apos;: %2</source>
+        <translation>&apos;%1&apos; を実行できません: %2</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1: Bluetooth listener running (%2).</source>
+        <translation>%1: Bluetooth リスナ (%2) が実行中。</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>%1: Process %2 terminated with exit code %3.</source>
+        <translation>%1: プロセス %2 は終了コード %3 で終了しました。</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1: Process %2 crashed.</source>
+        <translation>%1: プロセス %2 が異常終了しました。</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>%1: Process error %2: %3</source>
+        <translation>%1: プロセスエラー %2: %3</translation>
+    </message>
+</context>
+<context>
+    <name>trk::promptStartCommunication</name>
+    <message>
+        <location filename="../../../src/shared/trk/bluetoothlistener_gui.cpp" line="+68"/>
+        <source>Connection on %1 canceled.</source>
+        <translation>%1 への接続がキャンセルされました。</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Waiting for App TRK</source>
+        <translation>TRK アプリケーションを待機中</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Waiting for App TRK to start on %1...</source>
+        <translation>%1 で TRK アプリケーションを待機中...</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Waiting for Bluetooth Connection</source>
+        <translation>Bluetooth 接続を待機中</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting to %1...</source>
+        <translation>%1 へ接続中...</translation>
+    </message>
+</context>
+<context>
+    <name>trk::BaseCommunicationStarter</name>
+    <message numerus="yes">
+        <location filename="../../../src/shared/trk/communicationstarter.cpp" line="+165"/>
+        <source>%1: timed out after %n attempts using an interval of %2ms.</source>
+        <translation>
+            <numerusform>%1: %2 ms の間隔で %n 回試行後にタイムアウトしました。</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>%1: Connection attempt %2 succeeded.</source>
+        <translation>%1: %2 に接続しました。</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>%1: Connection attempt %2 failed: %3 (retrying)...</source>
+        <translation>%1: %2 への接続に失敗しました: %3 (再試行中)...</translation>
+    </message>
+</context>
+<context>
+    <name>trk::Session</name>
+    <message>
+        <location filename="../../../src/shared/trk/trkutils.cpp" line="+79"/>
+        <source>CPU: v%1.%2%3%4</source>
+        <extracomment>CPU description of an S60 device %1 major verison, %2 minor version %3 real name of major verison, %4 real name of minor version</extracomment>
+        <translation>CPU: v%1.%2%3%4</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>App TRK: v%1.%2 TRK protocol: v%3.%4</source>
+        <translation>TRK アプリケーション: v%1.%2 TRK プロトコル: v%3.%4</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>%1, %2%3%4, %5</source>
+        <extracomment>s60description description of an S60 device %1 CPU description, %2 endianness %3 default type size (if any), %4 float size (if any) %5 TRK version</extracomment>
+        <translation>%1, %2%3%4, %5</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>big endian</source>
+        <translation>ビッグエンディアン</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>little endian</source>
+        <translation>リトルエンディアン</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>, type size: %1</source>
+        <extracomment>will be inserted into s60description</extracomment>
+        <translation>, 型サイズ: %1</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>, float size: %1</source>
+        <extracomment>will be inserted into s60description</extracomment>
+        <translation>, float サイズ: %1</translation>
     </message>
 </context>
 </TS>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 382130868f256b39d7a4c36d65d84a7cba68b9b5..26c7f6e2b02f738407fcb15ec0ea53e4ba1f3cd6 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -14757,7 +14757,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation> &lt;numer linii&gt;</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 3065beed58a01168ca07ebda3193ad6ff7ba3fef..65599f122fcb0ac3c119a5961142f3e57a7dc531 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -140,7 +140,7 @@
     <message>
         <location line="+1"/>
         <source>You are going to delete a Folder which will also&lt;br&gt;remove its content. Are you sure you would like to continue?</source>
-        <translation>Вы собираетесь удалить папку, что повлечёт&lt;br&gt;удаление её содержимого. Вы уверены, что хотите продолжить?</translation>
+        <translation>Вы собираетесь удалить папку, что повлечёт&lt;br&gt;удаление её содержимого. Вы уверены, что желаете продолжить?</translation>
     </message>
     <message>
         <location line="+111"/>
@@ -413,7 +413,7 @@
     <message>
         <location line="-97"/>
         <source>Base environment for this runconfiguration:</source>
-        <translation>Базовая среда этой конфигурации выполнения:</translation>
+        <translation>Базовая среда данной конфигурации выполнения:</translation>
     </message>
 </context>
 <context>
@@ -431,7 +431,7 @@
     <message>
         <location line="+2"/>
         <source> The path %1 is not a executable.</source>
-        <translation> Путь %1 не является исполняемой программой.</translation>
+        <translation> Путь %1 не является путём к исполняемой программе.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -513,7 +513,7 @@
     <message>
         <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-229"/>
         <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
-        <translation>Qt Creator обнаружил &lt;b&gt;сборку в каталоге с исходниками (%1)&lt;/b&gt;, что препятствует фоновой сборке. Поэтому Qt Creator не позволит изменить каталог сборки. Если требуется фоновая сборка, необходимо очистить каталог исходников и открыть проект снова.</translation>
+        <translation>Qt Creator обнаружил &lt;b&gt;сборку в каталоге с исходниками (%1)&lt;/b&gt;, что препятствует фоновой сборке. Qt Creator не позволит изменить каталог сборки. Если требуется фоновая сборка, необходимо очистить каталог исходников и открыть проект снова.</translation>
     </message>
 </context>
 <context>
@@ -715,7 +715,7 @@
     <message>
         <location line="+1"/>
         <source>The commit message check failed. Do you want to commit the change?</source>
-        <translation>Сообщение о фиксации содержит ошибки. Всё-равно желаете зафиксировать изменения?</translation>
+        <translation>Сообщение о фиксации содержит ошибки. Желаете зафиксировать изменения?</translation>
     </message>
     <message>
         <location line="+58"/>
@@ -733,7 +733,7 @@
         <translation>Файл был изменён. Желаете откатить его изменения?</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>The commit list spans several repositories (%1). Please commit them one by one.</source>
         <translation>Список на фиксацию содержит несколько репозиториев (%1). Пожалуйста, фиксируйте их по одному.</translation>
     </message>
@@ -753,7 +753,7 @@
         <translation>Не удалось создать временный файл: %1</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Project status</source>
         <translation>Состояние проекта</translation>
     </message>
@@ -866,7 +866,7 @@
     <message>
         <location/>
         <source>When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit id). Otherwise, only the respective file will be displayed.</source>
-        <translation>Если включено, то по щелчку на номере равизии при просмотре аннотации (полученной по идентификатору фиксации) будут отображаться все зафиксированные файлы. В противном случае, только соответствующий файл.</translation>
+        <translation>Если включено, по щелчку на номере равизии при просмотре аннотации (полученной по идентификатору фиксации) будут отображаться все зафиксированные файлы. В противном случае, только соответствующий файл.</translation>
     </message>
     <message>
         <location/>
@@ -905,7 +905,7 @@
 <context>
     <name>CVSPlugin</name>
     <message>
-        <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="-1039"/>
+        <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="-1044"/>
         <source>Cannot find repository for &apos;%1&apos;</source>
         <translation>Не удалось найти репозиторий для &apos;%1&apos;</translation>
     </message>
@@ -947,7 +947,7 @@
         <location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+58"/>
         <source>&lt;html&gt;&lt;body&gt;&lt;p&gt;Specify the path to the &lt;a href=&quot;%1&quot;&gt;Debugging Tools for Windows&lt;/a&gt; (%2) here.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; Restarting Qt Creator is required for these settings to take effect.&lt;/p&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <extracomment>Label text for path configuration. %2 is &quot;x-bit version&quot;.</extracomment>
-        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Укажите здесь путь к &lt;a href=&quot;%1&quot;&gt;Debugging Tools for Windows&lt;/a&gt; (%2).&lt;/p&gt;&lt;p&gt;&lt;b&gt;Замечание:&lt;/b&gt; Для вступления изменений в силу необходим перезапуск Qt Creator.&lt;/p&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Укажите путь к &lt;a href=&quot;%1&quot;&gt;Debugging Tools for Windows&lt;/a&gt; (%2).&lt;/p&gt;&lt;p&gt;&lt;b&gt;Замечание:&lt;/b&gt; Для вступления изменений в силу необходим перезапуск Qt Creator.&lt;/p&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -993,7 +993,6 @@
     <message>
         <location filename="../../../src/plugins/git/changeselectiondialog.ui"/>
         <source>Repository Location:</source>
-        <translatorcomment>&quot;Размещение репозитория&quot; слишком длинно</translatorcomment>
         <translation>Репозиторий:</translation>
     </message>
     <message>
@@ -1120,7 +1119,7 @@
     <message>
         <location/>
         <source>Display Output Pane after sending a post</source>
-        <translation>Показать окно вывода, отослав данные</translation>
+        <translation>Отправив данные, показать окно вывода</translation>
     </message>
     <message>
         <location/>
@@ -1158,7 +1157,7 @@
     <message>
         <location/>
         <source>Checking this will populate the source file view automatically but might slow down debugger startup considerably.</source>
-        <translation>Включение приведет к автоматическому заполнению просмотра исходного файла, но может значительно замедлить процесс запуска отладчика.</translation>
+        <translation>Включение приведёт к автоматическому заполнению просмотра файла исходных текстов, но может замедлить процесс запуска отладчика.</translation>
     </message>
     <message>
         <location/>
@@ -1174,8 +1173,8 @@
         <location/>
         <source>When this option is checked, &apos;Step Into&apos; compresses several steps into one in certain situations, leading to &apos;less noisy&apos; debugging. So will, e.g., the atomic
  reference counting code be skipped, and a single &apos;Step Into&apos; for a signal emission will end up directly in the slot connected to it.</source>
-        <translation>Когда включён данный параметр, в определенных ситуациях &apos;Зайти в&apos; объединяет несколько шагов в один, позволяя &apos;снизить шум&apos; при отладке. Например, будет пропущен
-атомарный код подсчета ссылок и единственная операция &apos;Зайти в&apos; инициации сигнала завершится прямо в слоте, который подключен к нему.</translation>
+        <translation>Когда включён данный параметр, в определенных ситуациях &apos;Зайти в&apos; объединяет несколько шагов в один, позволяя &apos;снизить шум&apos; при отладке.
+Например, будет пропущен атомарный код подсчета ссылок и единственная операция &apos;Зайти в&apos; инициации сигнала завершится прямо в слоте, подключённому к данному сигналу.</translation>
     </message>
     <message>
         <location/>
@@ -1205,7 +1204,7 @@
     <message>
         <location/>
         <source>Use tooltips in main editor while debugging</source>
-        <translation>Включает подсказки в основном редакторе при отладке</translation>
+        <translation>Использовать подсказки в основном редакторе при отладке</translation>
     </message>
 </context>
 <context>
@@ -1228,7 +1227,7 @@
     <message>
         <location/>
         <source>Automatically insert (, ) and ; when appropriate.</source>
-        <translation>Автоматически вставлять (, ) и ; когда потребуется.</translation>
+        <translation>Автоматически вставлять &apos;(, )&apos; и &apos;;&apos;, когда потребуется.</translation>
     </message>
     <message>
         <location/>
@@ -1324,7 +1323,7 @@
 Would you like to overwrite them?</source>
         <translation>Следующие файлы уже присутствуют в каталоге %1:
 %2.
-Вы хотите перезаписать их?</translation>
+Желаете перезаписать их?</translation>
     </message>
 </context>
 <context>
@@ -1455,17 +1454,17 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+6"/>
         <source>Remove Current Split</source>
-        <translation>Удалить текущее разделение</translation>
+        <translation>Удалить текущее разделитель</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Remove All Splits</source>
-        <translation>Удалить все разделения</translation>
+        <translation>Удалить все разделители</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Goto Other Split</source>
-        <translation>Перейти к другому разделению</translation>
+        <translation>Перейти к другому разделителю</translation>
     </message>
     <message>
         <location line="-22"/>
@@ -1521,7 +1520,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+40"/>
         <source>Open File</source>
-        <translation>Открытие файла</translation>
+        <translation>Открыть файл</translation>
     </message>
     <message>
         <location line="+140"/>
@@ -1598,7 +1597,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+197"/>
         <source>You will lose your current changes if you proceed reverting %1.</source>
-        <translation>Будут потеряны все текущие изменения, если продолжить откат %1.</translation>
+        <translation>Если продолжить откат %1, будут потеряны все текущие изменения.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1777,7 +1776,7 @@ Would you like to overwrite them?</source>
     <message>
         <location filename="../../../src/plugins/coreplugin/generalsettings.ui"/>
         <source>General settings</source>
-        <translation>Основные установки</translation>
+        <translation>Основные настройки</translation>
     </message>
     <message>
         <location/>
@@ -1812,7 +1811,7 @@ Would you like to overwrite them?</source>
     <message>
         <location filename="../../../src/plugins/coreplugin/generalsettings.cpp" line="+56"/>
         <source>General</source>
-        <translation>Основное</translation>
+        <translation>Основные</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -1859,7 +1858,7 @@ Would you like to overwrite them?</source>
         <translation>Консоль</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+162"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
@@ -2040,7 +2039,7 @@ Would you like to overwrite them?</source>
     <message>
         <location filename="../../../src/plugins/coreplugin/messageoutputwindow.cpp" line="+76"/>
         <source>General</source>
-        <translation>Основное</translation>
+        <translation>Основные</translation>
     </message>
 </context>
 <context>
@@ -2106,7 +2105,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+2"/>
         <source>Close All Except %1</source>
-        <translation>Закрыть всё, кроме %1</translation>
+        <translation>Закрыть все, кроме %1</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2225,7 +2224,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+3"/>
         <source>Save Selected</source>
-        <translation>Сохранить выбранное</translation>
+        <translation>Сохранить выбранные</translation>
     </message>
 </context>
 <context>
@@ -2233,8 +2232,7 @@ Would you like to overwrite them?</source>
     <message>
         <location filename="../../../src/plugins/coreplugin/dialogs/settingsdialog.cpp" line="+58"/>
         <source>Preferences</source>
-        <translatorcomment>Честно говоря, не знаю, как Preferences в Mac OS переводят</translatorcomment>
-        <translation>Параметры</translation>
+        <translation>Настройки</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2300,7 +2298,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+3"/>
         <source>&lt;h3&gt;Qt Creator %1&lt;/h3&gt;Based on Qt %2 (%3 bit)&lt;br/&gt;&lt;br/&gt;Built on %4 at %5&lt;br /&gt;&lt;br/&gt;%8&lt;br/&gt;Copyright 2008-%6 %7. All rights reserved.&lt;br/&gt;&lt;br/&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;br/&gt;</source>
-        <translation>&lt;h3&gt;Qt Creator %1&lt;/h3&gt;Основан на Qt %2 (%3-х битной)&lt;br/&gt;&lt;br/&gt;Собран %4 в %5&lt;br /&gt;&lt;br/&gt;%8&lt;br/&gt;Copyright 2008-%6 %7. All rights reserved.&lt;br/&gt;&lt;br/&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;br/&gt;</translation>
+        <translation type="unfinished">&lt;h3&gt;Qt Creator %1&lt;/h3&gt;Основан на Qt %2 (%3-х битной)&lt;br/&gt;&lt;br/&gt;Собран %4 в %5&lt;br /&gt;&lt;br/&gt;%8&lt;br/&gt;Copyright 2008-%6 %7. All rights reserved.&lt;br/&gt;&lt;br/&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;br/&gt;</translation>
     </message>
 </context>
 <context>
@@ -2380,7 +2378,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+7"/>
         <source>Press &lt;RETURN&gt; to close this window...</source>
-        <translation>Нажмите &lt;ВВОД&gt;, чтобы закрыть это окно...</translation>
+        <translation>Для закрытия данного окна нажмите &lt;ВВОД&gt;...</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2446,7 +2444,7 @@ Would you like to overwrite them?</source>
     <message>
         <location filename="../../../src/libs/utils/filenamevalidatinglineedit.cpp" line="+95"/>
         <source>The name must not be empty</source>
-        <translation>Имя должно быть не пустым</translation>
+        <translation>Имя не должно быть пустым</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -2470,18 +2468,18 @@ Would you like to overwrite them?</source>
         <location filename="../../../src/libs/utils/filesearch.cpp" line="+47"/>
         <source>%1: canceled. %n occurrences found in %2 files.</source>
         <translation>
-            <numerusform>%1: отменено. %n совпадение найдено в %2 файлах.</numerusform>
-            <numerusform>%1: отменено. %n совпадения найдено в %2 файлах.</numerusform>
-            <numerusform>%1: отменено. %n совпадений найдено в %2 файлах.</numerusform>
+            <numerusform>%1: отменено. %n совпадение найдено в %2 файле(ах).</numerusform>
+            <numerusform>%1: отменено. %n совпадения найдено в %2 файле(ах).</numerusform>
+            <numerusform>%1: отменено. %n совпадений найдено в %2 файле(ах).</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+8"/>
         <source>%1: %n occurrences found in %2 files.</source>
         <translation>
-            <numerusform>%1: %n совпадение найдено в %2 файлах.</numerusform>
-            <numerusform>%1: %n совпадения найдено в %2 файлах.</numerusform>
-            <numerusform>%1: %n совпадений найдено в %2 файлах.</numerusform>
+            <numerusform>%1: %n совпадение найдено в %2 файле(ах).</numerusform>
+            <numerusform>%1: %n совпадения найдено в %2 файле(ах).</numerusform>
+            <numerusform>%1: %n совпадений найдено в %2 файле(ах).</numerusform>
         </translation>
     </message>
     <message numerus="yes">
@@ -2539,7 +2537,7 @@ Would you like to overwrite them?</source>
     <message>
         <location/>
         <source>Generate form:</source>
-        <translation type="unfinished">Создать форму:</translation>
+        <translation>Создать форму:</translation>
     </message>
     <message>
         <location/>
@@ -2559,12 +2557,12 @@ Would you like to overwrite them?</source>
     <message>
         <location/>
         <source>Type information:</source>
-        <translation type="unfinished">Тип класса:</translation>
+        <translation>Тип класса:</translation>
     </message>
     <message>
         <location/>
         <source>None</source>
-        <translation type="unfinished">Не указан</translation>
+        <translation>Не указан</translation>
     </message>
     <message>
         <location/>
@@ -2597,7 +2595,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+33"/>
         <source>The path must not be empty.</source>
-        <translation>Путь не может быть пустым.</translation>
+        <translation>Путь не должен быть пустым.</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -2607,12 +2605,12 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+15"/>
         <source>The path &apos;%1&apos; is not a directory.</source>
-        <translation>Путь &apos;%1&apos; не является каталогом.</translation>
+        <translation>Путь &apos;%1&apos; не является путём к каталогу.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>The path &apos;%1&apos; is not a file.</source>
-        <translation>Путь &apos;%1&apos; не является файлом.</translation>
+        <translation>Путь &apos;%1&apos; не является путём к файлу.</translation>
     </message>
     <message>
         <location line="+19"/>
@@ -2686,7 +2684,7 @@ Would you like to overwrite them?</source>
     <message>
         <location filename="../../../src/libs/utils/projectnamevalidatinglineedit.cpp" line="+50"/>
         <source>The name must not contain the &apos;.&apos;-character.</source>
-        <translation>Название не должно содержать символ &quot;точка&quot;.</translation>
+        <translation>Название не должно содержать символ &quot;.&quot; (точка).</translation>
     </message>
 </context>
 <context>
@@ -2735,12 +2733,12 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+4"/>
         <source>The unsaved file %1 has been changed outside Qt Creator. Do you want to reload it and discard your changes?</source>
-        <translation>Несохранённый файл %1 изменился вне Qt Creator. Перезагрузить его с потерей изменений?</translation>
+        <translation>Несохранённый файл %1 был изменён вне Qt Creator. Перезагрузить его с потерей изменений?</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The file %1 has changed outside Qt Creator. Do you want to reload it?</source>
-        <translation>Файл %1 изменён вне Qt Creator. Желаете перезагрузить его?</translation>
+        <translation>Файл %1 был изменён вне Qt Creator. Желаете перезагрузить его?</translation>
     </message>
 </context>
 <context>
@@ -2753,12 +2751,12 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+163"/>
         <source>This change cannot be undone.</source>
-        <translation>Это изменение нельзя будет отменить.</translation>
+        <translation>Данное изменение невозможно отменить.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Yes, I know what I am doing.</source>
-        <translation>Да, я знаю, что делаю.</translation>
+        <translation>Да, я знаю что делаю.</translation>
     </message>
 </context>
 <context>
@@ -2771,7 +2769,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+1"/>
         <source>The header and source file names will be derived from the class name</source>
-        <translation>Названия файлов исходников будут получены из имени класса</translation>
+        <translation>Названия файла исходных текстов и заголовочного файла будут получены из имени класса</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -2784,7 +2782,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+117"/>
         <source>Error while generating file contents.</source>
-        <translation>Ошибка во время формирования содержимого файла.</translation>
+        <translation>Ошибка формирования содержимого файла.</translation>
     </message>
 </context>
 <context>
@@ -2800,13 +2798,14 @@ Would you like to overwrite them?</source>
     <message>
         <location filename="../../../src/plugins/cppeditor/cpphoverhandler.cpp" line="+87"/>
         <source>Unfiltered</source>
+        <translatorcomment>пустой фильтр документации</translatorcomment>
         <translation>Вся</translation>
     </message>
 </context>
 <context>
     <name>CppEditor::Internal::CppPlugin</name>
     <message>
-        <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+174"/>
+        <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+190"/>
         <source>C++</source>
         <translation>C++</translation>
     </message>
@@ -2841,7 +2840,7 @@ Would you like to overwrite them?</source>
         <translation>Создание заголовочного и исходного файлов для нового класса.</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>Follow Symbol under Cursor</source>
         <translation>Перейти к символу под курсором</translation>
     </message>
@@ -2865,6 +2864,11 @@ Would you like to overwrite them?</source>
         <source>Rename Symbol under Cursor</source>
         <translation>Переименовать символ под курсором</translation>
     </message>
+    <message>
+        <location line="+12"/>
+        <source>Update code model</source>
+        <translation>Обновить модель кода</translation>
+    </message>
 </context>
 <context>
     <name>CppFileSettingsPage</name>
@@ -3026,7 +3030,7 @@ Would you like to overwrite them?</source>
 <context>
     <name>CppTools::Internal::CppToolsPlugin</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+120"/>
+        <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+126"/>
         <source>&amp;C++</source>
         <translation>&amp;C++</translation>
     </message>
@@ -3073,9 +3077,9 @@ Would you like to overwrite them?</source>
         <location line="+37"/>
         <source>%n known types, Qt version: %1, Qt namespace: %2 Dumper version: %3</source>
         <translation>
-            <numerusform>%n известный тип, Qt версии: %1, пространство имен Qt: %2, Версия дампера: %3</numerusform>
-            <numerusform>%n известных типа, Qt версии: %1, пространство имен Qt: %2, Версия дампера: %3</numerusform>
-            <numerusform>%n известных типов, Qt версии: %1, пространство имен Qt: %2, Версия дампера: %3</numerusform>
+            <numerusform>%n известный тип, Qt версии: %1, пространство имён Qt: %2, Версия дампера: %3</numerusform>
+            <numerusform>%n известных типа, Qt версии: %1, пространство имён Qt: %2, Версия дампера: %3</numerusform>
+            <numerusform>%n известных типов, Qt версии: %1, пространство имён Qt: %2, Версия дампера: %3</numerusform>
         </translation>
     </message>
     <message>
@@ -3166,7 +3170,7 @@ Would you like to overwrite them?</source>
         <location line="+77"/>
         <location line="+21"/>
         <source>Changing breakpoint state requires either a fully running or fully stopped application.</source>
-        <translation>Изменение состояние точки останова требует или полностью остановленную программу, или полностью работающую.</translation>
+        <translation>Изменение состояние точки останова требует или полностью остановленную программу, или полностью запущенную.</translation>
     </message>
     <message>
         <location line="+30"/>
@@ -3196,7 +3200,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+312"/>
         <source>Turn off helper usage</source>
-        <translation>Отключить помощника</translation>
+        <translation>Не использовать помощника</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3206,7 +3210,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+1"/>
         <source>The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each used Qt version separately. This can be done in the Qt preferences page by selecting a Qt installation and clicking on &apos;Rebuild&apos; in the &apos;Debugging Helper&apos; row.</source>
-        <translation>Помощник отладчика используется для преобразования к наглядному виду значений некоторых типов данных Qt и стандартной библиотеки. Он должен быть собран отдельно для каждой версии Qt. Это можно сделать в параметрах Qt, выбрав профиль Qt и нажав на &apos;Пересобрать&apos; в строке &apos;Помощник отладчика&apos;.</translation>
+        <translation>Помощник отладчика используется для преобразования значений некоторых типов данных Qt и стандартной библиотеки к наглядному виду. Он должен быть собран отдельно для каждой версии Qt. Это можно сделать в параметрах Qt, выбрав профиль Qt и нажав на &apos;Пересобрать&apos; в строке &apos;Помощник отладчика&apos;.</translation>
     </message>
     <message>
         <location line="+170"/>
@@ -3226,7 +3230,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+4"/>
         <source>Continue anyway</source>
-        <translation>Всё равно продолжить</translation>
+        <translation>Всё-равно продолжить</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3348,7 +3352,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+2"/>
         <source>Ignore Count:</source>
-        <translation>Число пропусков:</translation>
+        <translation>Количество пропусков:</translation>
     </message>
     <message>
         <location line="+215"/>
@@ -3388,12 +3392,12 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+62"/>
         <source>Breakpoint will only be hit if this condition is met.</source>
-        <translation>Точка останова сработает только, когда условие выполнится.</translation>
+        <translation>Точка останова сработает только при выполнении условия.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Breakpoint will only be hit after being ignored so many times.</source>
-        <translation>Точка останова сработает только через указанное количество попаданий.</translation>
+        <translation>Точка останова сработает только через указанное количество пропусков.</translation>
     </message>
 </context>
 <context>
@@ -3664,17 +3668,17 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+5"/>
         <source>Loading the custom dumper library &apos;%1&apos; (%2) ...</source>
-        <translation>Загружается особая библиотека дампера &apos;%1&apos; (%2)...</translation>
+        <translation type="unfinished">Загружается особая библиотека дампера &apos;%1&apos; (%2)...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Loading of the custom dumper library &apos;%1&apos; (%2) failed: %3</source>
-        <translation>Загрузка особой библиотеки дампера &apos;%1&apos; (%2) не удалась: %3</translation>
+        <translation type="unfinished">Загрузка особой библиотеки дампера &apos;%1&apos; (%2) не удалась: %3</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Loaded the custom dumper library &apos;%1&apos; (%2).</source>
-        <translation>Загружена особая библиотека дампера &apos;%1&apos; (%2).</translation>
+        <translation type="unfinished">Загружена особая библиотека дампера &apos;%1&apos; (%2).</translation>
     </message>
     <message>
         <location line="+62"/>
@@ -3684,7 +3688,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+77"/>
         <source>Disabling dumpers due to debuggee crash...</source>
-        <translation>Отключение дамперов из-за падения отлаживаемой программы...</translation>
+        <translation>Отключение дамперов из-за сбоя отлаживаемой программы...</translation>
     </message>
     <message>
         <location line="-43"/>
@@ -3747,7 +3751,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+1"/>
         <source>Adds the Microsoft symbol server providing symbols for operating system libraries.Requires specifying a local cache directory.</source>
-        <translation>Добавляет сервер символов Microsoft, который предоставляет их для файлов операционной системы. Требует указания каталога локального кэша.</translation>
+        <translation>Добавляет сервер символов Microsoft, который предоставляет символы для файлов операционной системы. Требует указания каталога локального кэша.</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3789,7 +3793,7 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+36"/>
         <source>Attached to core temporarily.</source>
-        <translation>Временно подключено к дампу.</translation>
+        <translation type="unfinished">Временно подключено к дампу.</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -3825,17 +3829,17 @@ Would you like to overwrite them?</source>
     <message>
         <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+36"/>
         <source>Close Debugging Session</source>
-        <translation>Закрытие отладочной сессии</translation>
+        <translation>Закрытие сессии отладки</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>A debugging session is still in progress. Would you like to terminate it?</source>
-        <translation type="unfinished">Идёт отладка. Завершить её?</translation>
+        <translation>Идёт отладка. Завершить её?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>A debugging session is still in progress. Terminating the session in the current state (%1) can leave the target in an inconsistent state. Would you still like to terminate it?</source>
-        <translation type="unfinished">Идёт отладка. Её завершение в текущем режиме (%1) может оставить исполнитель в неизвестном состоянии. Завершить её?</translation>
+        <translation>Идёт отладка. Её завершение в текущем режиме (%1) может оставить исполнитель в неизвестном состоянии. Завершить отладку?</translation>
     </message>
 </context>
 <context>
@@ -3863,12 +3867,12 @@ Would you like to overwrite them?</source>
     <message>
         <location line="+41"/>
         <source>Start and Debug External Application...</source>
-        <translation>Запустить под отладчиком внешнее приложение...</translation>
+        <translation>Запустить внешнее приложение для отладки...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Attach to Running External Application...</source>
-        <translation>Подключить к работающему внешнему приложению...</translation>
+        <translation>Подключить к запущенному внешнему приложению...</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -4258,12 +4262,12 @@ Would you like to overwrite them?</source>
         <translation>Обработка очереди команд.</translation>
     </message>
     <message>
-        <location line="+392"/>
+        <location line="+393"/>
         <source>Loading %1...</source>
         <translation>Загружается %1...</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+109"/>
         <source>Stopped at breakpoint.</source>
         <translation>Остановлено на точке останова.</translation>
     </message>
@@ -4285,12 +4289,12 @@ Would you like to overwrite them?</source>
     </message>
     <message>
         <location line="+5"/>
-        <location line="+121"/>
+        <location line="+120"/>
         <source>Stopped.</source>
         <translation>Остановлено.</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-118"/>
         <source>Stopped: &quot;%1&quot;</source>
         <translation>Остановлено: &quot;%1&quot;</translation>
     </message>
@@ -4314,7 +4318,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Продолжение после временного останова...</translation>
     </message>
     <message>
-        <location line="+2284"/>
+        <location line="+2288"/>
         <source>The debugging helper library was not found at %1.</source>
         <translation>Библиотека помощника отладчика не обнаружена в %1.</translation>
     </message>
@@ -4334,12 +4338,12 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation type="unfinished">Не удалось запустить подчинённого</translation>
     </message>
     <message>
-        <location line="-2980"/>
+        <location line="-2984"/>
         <source>Inferior shutdown failed</source>
         <translation type="unfinished">Не удалось остановить подчинённого</translation>
     </message>
     <message>
-        <location line="+2859"/>
+        <location line="+2863"/>
         <source>Cannot find debugger initialization script</source>
         <translation>Не удалось найти скрипт инициализации отладчика</translation>
     </message>
@@ -4349,18 +4353,18 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>В настройках указан файл скрипта &apos;%1&apos;, который сейчас недоступен. Если файл скрипта не обязателен, просто очистите поле, чтобы не было этого предупреждения.</translation>
     </message>
     <message>
-        <location line="-2156"/>
+        <location line="-2160"/>
         <source>Unable to run &apos;%1&apos;: %2</source>
         <translation>Не удалось запустить &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>&lt;unknown&gt;</source>
         <extracomment>End address of loaded module</extracomment>
         <translation>&lt;неизвестный&gt;</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+49"/>
         <location line="+8"/>
         <source>Retrieving data for stack view...</source>
         <translation>Получение данных о стеке...</translation>
@@ -4375,7 +4379,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
         </translation>
     </message>
     <message>
-        <location line="-2889"/>
+        <location line="-2898"/>
         <source>An unknown error in the Gdb process occurred. </source>
         <translation>Неизвестная ошибка возникла у процесса Gdb. </translation>
     </message>
@@ -4418,7 +4422,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Программа завершилась с ошибкой: %1</translation>
     </message>
     <message>
-        <location line="+537"/>
+        <location line="+541"/>
         <source>Execution Error</source>
         <translation>Ошибка выполнения</translation>
     </message>
@@ -4430,7 +4434,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
 </translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+215"/>
         <source>Running requested...</source>
         <translation>Потребован запуск...</translation>
     </message>
@@ -4470,7 +4474,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
         <translation>Потребовано выполнение до функции %1...</translation>
     </message>
     <message>
-        <location line="+712"/>
+        <location line="+716"/>
         <source>Jumping out of bogus frame...</source>
         <translation type="unfinished">Выход из подложного кадра...</translation>
     </message>
@@ -4735,7 +4739,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
 <context>
     <name>Debugger::Internal::PlainGdbAdapter</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+79"/>
+        <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+80"/>
         <source>Cannot set up communication with child process: %1</source>
         <translation>Не удалось установить связь с дочерним процессом: %1</translation>
     </message>
@@ -5404,7 +5408,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location/>
         <source>This will enable nice display of Qt and Standard Library objects in the Locals&amp;Watchers view</source>
-        <translation>Включит удобное отображение объектов Qt и стандартной библиотеки в окне отслеживаемых переменных</translation>
+        <translation>Включить удобное отображение объектов Qt и стандартной библиотеки в окне отслеживаемых переменных</translation>
     </message>
     <message>
         <location/>
@@ -5414,7 +5418,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location/>
         <source>This will load a dumper library</source>
-        <translation type="unfinished">Загрузит библиотеку дампера данных</translation>
+        <translation>Загружать библиотеку дампера данных</translation>
     </message>
     <message>
         <location/>
@@ -5434,7 +5438,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location/>
         <source>Makes use of Qt Creator&apos;s code model to find out if a variable has already been assigned a value at the point the debugger interrupts.</source>
-        <translation type="unfinished">Включит использование модели кода Qt Creator для определения,
+        <translation type="unfinished">Включить использование модели кода Qt Creator для определения
 было ли переменной присвоено значение в точке прерывания отладчиком.</translation>
     </message>
     <message>
@@ -5461,7 +5465,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location filename="../../../src/shared/qrceditor/resourcefile.cpp" line="+54"/>
         <source>The file name is empty.</source>
-        <translation>Имя файла пустое.</translation>
+        <translation>Пустое имя файла.</translation>
     </message>
     <message>
         <location line="+54"/>
@@ -5514,7 +5518,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location/>
         <source>Code Generation</source>
-        <translation>Генерация кода</translation>
+        <translation>Создание кода</translation>
     </message>
     <message>
         <location/>
@@ -5583,7 +5587,7 @@ Using gdb 6.7 or later is strongly recommended.</source>
     <message>
         <location line="+1"/>
         <source>Creates a Qt Designer form file (.ui) with a matching class.</source>
-        <translation>Создание файла формы Qt Designer (.ui) с подходящим классом.</translation>
+        <translation>Создание файла формы Qt Designer (.ui) и соответствующего класса.</translation>
     </message>
 </context>
 <context>
@@ -5833,8 +5837,8 @@ Rebuilding the project might help.</source>
 Note: This adds the toolchain to the build environment and runs the program inside a virtual machine.
 It also automatically sets the correct Qt version.</source>
         <translation>Использовать VirtualBox
-Заметка: Добавится возможность создавать и запускать программы под виртуальной машиной.
-Так же будет автоматически установлена правильная версия Qt.</translation>
+Замечание: Добавляет возможность создавать и запускать программы под виртуальной машиной.
+Также будет автоматически установлена корректная версия Qt.</translation>
     </message>
 </context>
 <context>
@@ -5965,7 +5969,7 @@ It also automatically sets the correct Qt version.</source>
     <message>
         <location line="+3"/>
         <source>Read</source>
-        <translation>Считан</translation>
+        <translation>Описание прочитано</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6000,7 +6004,7 @@ It also automatically sets the correct Qt version.</source>
     <message>
         <location line="+1"/>
         <source>Plugin&apos;s initialization method succeeded</source>
-        <translation>Метод инициализации модуля завершился успешно</translation>
+        <translation>Инициализация модуля завершилась успешно</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6010,7 +6014,7 @@ It also automatically sets the correct Qt version.</source>
     <message>
         <location line="+1"/>
         <source>Plugin successfully loaded and running</source>
-        <translation>Модуль успешно загружен и работает</translation>
+        <translation>Модуль успешно загружен и запущен</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6690,7 +6694,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>Show side-by-side if possible</source>
-        <translation>Показывать сбоку по возможности</translation>
+        <translation>Показывать сбоку, если возможно</translation>
     </message>
     <message>
         <location/>
@@ -6959,7 +6963,7 @@ Reason: %3</source>
 <context>
     <name>Git::Internal::GitClient</name>
     <message>
-        <location filename="../../../src/plugins/git/gitclient.cpp" line="+71"/>
+        <location filename="../../../src/plugins/git/gitclient.cpp" line="+76"/>
         <source>Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work.</source>
         <translation>Следует иметь в виду, что модуль Git до сих пор не умеет работать с сервером. Поэтому, ручная настройка ssh-авторизации и другое не будет работать.</translation>
     </message>
@@ -6987,7 +6991,7 @@ Reason: %3</source>
         <translation>Ожидание данных...</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+101"/>
         <source>Git Diff</source>
         <translation type="unfinished">Git - Сравнение</translation>
     </message>
@@ -7012,7 +7016,7 @@ Reason: %3</source>
         <translation type="unfinished">Git - аннотация %1</translation>
     </message>
     <message numerus="yes">
-        <location line="+56"/>
+        <location line="+58"/>
         <source>Unable to add %n file(s) to %1: %2</source>
         <translation>
             <numerusform>Не удалось добавить %n файл в %1: %2</numerusform>
@@ -7054,7 +7058,7 @@ Reason: %3</source>
         <translation type="unfinished">Не удалось запустить показ: %1: %2</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+149"/>
         <source>Changes</source>
         <translation>Изменения</translation>
     </message>
@@ -7110,12 +7114,12 @@ Reason: %3</source>
         <translation>Файл был изменён. Желаете откатить его изменения?</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+26"/>
         <source>The file is not modified.</source>
         <translation>Файл не изменялся.</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <source>There are no modified files.</source>
         <translation>Нет изменённых файлов.</translation>
     </message>
@@ -7123,7 +7127,7 @@ Reason: %3</source>
 <context>
     <name>Git::Internal::GitPlugin</name>
     <message>
-        <location filename="../../../src/plugins/git/gitplugin.cpp" line="+232"/>
+        <location filename="../../../src/plugins/git/gitplugin.cpp" line="+233"/>
         <source>&amp;Git</source>
         <translation>&amp;Git</translation>
     </message>
@@ -7343,7 +7347,7 @@ Reason: %3</source>
         <translation>&amp;Вернуть</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>Could not find working directory</source>
         <translation>Не удалось найти рабочий каталог</translation>
     </message>
@@ -7828,7 +7832,7 @@ Perl через переменные среды окружения.</translation
     <message>
         <location line="+40"/>
         <source>Cannot unregister documentation file %1!</source>
-        <translation>Невозможно разрегистрировать файл документации %1!</translation>
+        <translation>Невозможно дерегистрировать файл документации %1!</translation>
     </message>
 </context>
 <context>
@@ -7849,7 +7853,7 @@ Perl через переменные среды окружения.</translation
     <message>
         <location filename="../../../src/plugins/help/generalsettingspage.cpp" line="+74"/>
         <source>General settings</source>
-        <translation>Основные установки</translation>
+        <translation>Основные настройки</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -7870,7 +7874,7 @@ Perl через переменные среды окружения.</translation
     <message>
         <location line="-8"/>
         <source>There was an error while importing bookmarks!</source>
-        <translation>Возникла ошибка при импорте закладок!</translation>
+        <translation>При импорте закладок возникла ошибка!</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -8014,7 +8018,7 @@ Perl через переменные среды окружения.</translation
     <message>
         <location line="+12"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;title&gt;No Documentation&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;No documentation available.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Документации нет&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;Нет доступной документации.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;title&gt;Документация отсутствует&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;br/&gt;&lt;center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;Нет доступной документации.&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+54"/>
@@ -8243,7 +8247,7 @@ Perl через переменные среды окружения.</translation
     <message>
         <location line="+1"/>
         <source>The current startup project can not be run.</source>
-        <translation>Текущий запускаемый проект не может быть запущен.</translation>
+        <translation>Текущий проект не может быть запущен.</translation>
     </message>
     <message>
         <location line="+146"/>
@@ -8292,7 +8296,7 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp.</translation>
 <context>
     <name>MimeType</name>
     <message>
-        <location filename="mime_tr.h" line="+1"/>
+        <location filename="../../../build/46/share/qtcreator/translations/mime_tr.h" line="+1"/>
         <source>unknown</source>
         <translation>неизвестный</translation>
     </message>
@@ -8644,7 +8648,7 @@ SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp.</translation>
     <message>
         <location filename="../../../src/plugins/coreplugin/coreconstants.h" line="+94"/>
         <source>Plain Text Editor</source>
-        <translation>Редактор обычного текста</translation>
+        <translation>Текстовый редактор</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9046,7 +9050,7 @@ p, li { white-space: pre-wrap; }
         <translation>Файл был изменён. Желаете откатить его изменения?</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+98"/>
         <source>Another submit is currently executed.</source>
         <translation>Другая фиксация уже идёт в этот момент.</translation>
     </message>
@@ -9528,7 +9532,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProjectExplorer::DebuggingHelperLibrary</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+131"/>
+        <location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+135"/>
         <source>The target directory %1 could not be created.</source>
         <translation>Не удалось создать целевой каталог %1.</translation>
     </message>
@@ -14254,7 +14258,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <translation>Файл был изменён. Желаете откатить его изменения?</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+81"/>
         <source>The commit list spans several repositories (%1). Please commit them one by one.</source>
         <translation>Список на фиксацию содержит несколько репозиториев (%1). Пожалуйста, фиксируйте их по одному.</translation>
     </message>
@@ -14274,7 +14278,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <translation>Не удаётся создать временный файл: %1</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+189"/>
         <source>Describe</source>
         <translation>Описание</translation>
     </message>
@@ -15069,7 +15073,7 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation> &lt;номер строки&gt;</translation>
     </message>
 </context>
@@ -15596,7 +15600,7 @@ name &lt;email&gt; alias &lt;email&gt;</source>
 <context>
     <name>VCSManager</name>
     <message>
-        <location filename="../../../src/plugins/coreplugin/vcsmanager.cpp" line="+132"/>
+        <location filename="../../../src/plugins/coreplugin/vcsmanager.cpp" line="+144"/>
         <source>Version Control</source>
         <translation>Контроль версий</translation>
     </message>
@@ -15849,7 +15853,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Debugger::Internal::TermGdbAdapter</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+176"/>
+        <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+177"/>
         <source>Debugger Error</source>
         <translation>Ошибка отладчика</translation>
     </message>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index 196b3d464117d581b8b63aeedb48fe24f98ce520..3dbc9927beec04207badb7b338f758b3f8df7952 100644
--- a/share/qtcreator/translations/qtcreator_sl.ts
+++ b/share/qtcreator/translations/qtcreator_sl.ts
@@ -12694,7 +12694,7 @@ Naslednji nabori znakov so verjetno ustrezni:</translation>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;številka vrstice&gt;</translation>
     </message>
 </context>
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index fe675b910b9369452ac43877ee95d6856e38a0c4..7f4db0b13a725ee47897bc7940d0539f47d68994 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1201,10 +1201,12 @@ IEditor *EditorManager::openEditorWithContents(const QString &editorKind,
 
     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
     IEditor *edt = createEditor(editorKind);
-    if (!edt)
+    if (!edt) {
+        QApplication::restoreOverrideCursor();
         return 0;
+    }
 
-    if (!edt || !edt->createNew(contents)) {
+    if (!edt->createNew(contents)) {
         QApplication::restoreOverrideCursor();
         delete edt;
         edt = 0;
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 0fb216a475ec5b29044b9f6245ec2ff477dc8725..37ea378d2e1bcfee6fa0b42e7c94edc8d628f986 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -89,6 +89,14 @@ public:
     {
         setFocusPolicy(Qt::NoFocus);
         setAttribute(Qt::WA_DeleteOnClose);
+
+        // Set the window and button text to the tooltip text color, since this
+        // widget draws the background as a tooltip.
+        QPalette p = palette();
+        const QColor toolTipTextColor = p.color(QPalette::Inactive, QPalette::ToolTipText);
+        p.setColor(QPalette::Inactive, QPalette::WindowText, toolTipTextColor);
+        p.setColor(QPalette::Inactive, QPalette::ButtonText, toolTipTextColor);
+        setPalette(p);
     }
 
 protected:
@@ -1019,7 +1027,8 @@ bool CppCodeCompletion::completeConstructorOrFunction(const QList<LookupItem> &r
             if (doc->parse(Document::ParseDeclaration)) {
                 doc->check();
                 if (SimpleDeclarationAST *sd = doc->translationUnit()->ast()->asSimpleDeclaration()) {
-                    if (sd->declarator_list && sd->declarator_list->value->postfix_declarator_list
+                    if (sd->declarator_list &&
+                        sd->declarator_list && sd->declarator_list->value->postfix_declarator_list
                         && sd->declarator_list->value->postfix_declarator_list->value->asFunctionDeclarator()) {
                         autocompleteSignature = true;
                     }
diff --git a/src/plugins/debugger/debuggeragents.cpp b/src/plugins/debugger/debuggeragents.cpp
index d29b5e506fcb4d88b2e4b3347d8f3b39060adf79..102be15cb7f373339eb26e60470ded51b248075c 100644
--- a/src/plugins/debugger/debuggeragents.cpp
+++ b/src/plugins/debugger/debuggeragents.cpp
@@ -44,6 +44,8 @@
 #include <utils/qtcassert.h>
 
 #include <QtCore/QDebug>
+
+#include <QtGui/QMessageBox>
 #include <QtGui/QPlainTextEdit>
 #include <QtGui/QTextCursor>
 #include <QtGui/QSyntaxHighlighter>
@@ -68,13 +70,13 @@ namespace Internal {
 */
 
 MemoryViewAgent::MemoryViewAgent(DebuggerManager *manager, quint64 addr)
-    : QObject(manager), m_engine(manager->currentEngine())
+    : QObject(manager), m_engine(manager->currentEngine()), m_manager(manager)
 {
     init(addr);
 }
 
 MemoryViewAgent::MemoryViewAgent(DebuggerManager *manager, const QString &addr)
-    : QObject(manager), m_engine(manager->currentEngine())
+    : QObject(manager), m_engine(manager->currentEngine()), m_manager(manager) 
 {
     bool ok = true;
     init(addr.toULongLong(&ok, 0));
@@ -94,11 +96,19 @@ void MemoryViewAgent::init(quint64 addr)
     m_editor = editorManager->openEditorWithContents(
         Core::Constants::K_DEFAULT_BINARY_EDITOR,
         &titlePattern);
-    connect(m_editor->widget(), SIGNAL(lazyDataRequested(quint64,bool)),
-        this, SLOT(fetchLazyData(quint64,bool)));
-    editorManager->activateEditor(m_editor);
-    QMetaObject::invokeMethod(m_editor->widget(), "setLazyData",
-        Q_ARG(quint64, addr), Q_ARG(int, 1024 * 1024), Q_ARG(int, BinBlockSize));
+    if (m_editor) {
+        connect(m_editor->widget(), SIGNAL(lazyDataRequested(quint64,bool)),
+            this, SLOT(fetchLazyData(quint64,bool)));
+        editorManager->activateEditor(m_editor);
+        QMetaObject::invokeMethod(m_editor->widget(), "setLazyData",
+            Q_ARG(quint64, addr), Q_ARG(int, 1024 * 1024), Q_ARG(int, BinBlockSize));
+    } else {
+        m_manager->showMessageBox(QMessageBox::Warning,
+            tr("No memory viewer available"),
+            tr("The memory contents cannot be shown as no viewer plugin not "
+                "the BinEditor plugin could be loaded."));
+        deleteLater();
+    }
 }
 
 void MemoryViewAgent::fetchLazyData(quint64 block, bool sync)
diff --git a/src/plugins/debugger/debuggeragents.h b/src/plugins/debugger/debuggeragents.h
index ff7e4879aa6c52fcee8ecc9d4969a7542c3ac796..f0888c6b92f8730b24606d741fd290fea224c90a 100644
--- a/src/plugins/debugger/debuggeragents.h
+++ b/src/plugins/debugger/debuggeragents.h
@@ -70,6 +70,7 @@ private:
 
     QPointer<IDebuggerEngine> m_engine;
     QPointer<Core::IEditor> m_editor;
+    QPointer<DebuggerManager> m_manager;
 };
 
 
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 9365e54ee4a1606f5f021a1d9448b03c81376ec8..fe167734eb18d021b335e25d49a1cf749471d967 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4497,17 +4497,19 @@ void GdbEngine::handleInferiorPrepared()
 {
     const QString qtInstallPath = m_startParameters->qtInstallPath;
     if (!qtInstallPath.isEmpty()) {
-        QString qtBuildPath =
-        #if defined(Q_OS_WIN)
-            _("C:/qt-greenhouse/Trolltech/Code_less_create_more/Trolltech/Code_less_create_more/Troll/4.6/qt");
-        #elif defined(Q_OS_MAC)
-            QString();
-        #else    
-            _("/var/tmp/qt-x11-src-4.6.0");
-        #endif
-        if (!qtBuildPath.isEmpty())
+        QString qtBuildPath;
+#if defined(Q_OS_WIN)
+        qtBuildPath = _("C:/qt-greenhouse/Trolltech/Code_less_create_more/Trolltech/Code_less_create_more/Troll/4.6/qt");
         postCommand(_("set substitute-path %1 %2")
-            .arg(qtBuildPath).arg(qtInstallPath));
+                    .arg(qtBuildPath).arg(qtInstallPath));
+        qtBuildPath = _("C:/iwmake/build_mingw_opensource");
+        postCommand(_("set substitute-path %1 %2")
+                    .arg(qtBuildPath).arg(qtInstallPath));
+#elif defined(Q_OS_UNIX) && !defined (Q_OS_MAC)
+        qtBuildPath = _("/var/tmp/qt-x11-src-4.6.0");
+        postCommand(_("set substitute-path %1 %2")
+                    .arg(qtBuildPath).arg(qtInstallPath));
+#endif
     }
 
     // Initial attempt to set breakpoints
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 31ecc39d2b35a1db5889948b7e20686db1fdce9f..636627c40f876467c40b3ceba6f93c37e9d87bc7 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -47,6 +47,8 @@
 #include <extensionsystem/pluginmanager.h>
 #include <texteditor/basetexteditor.h>
 #include <texteditor/itexteditable.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/session.h>
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
@@ -577,9 +579,22 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
     const QFileInfo fi(currentUiFile);
     const QString uicedName = QLatin1String("ui_") + fi.completeBaseName() + QLatin1String(".h");
 
+    // Retrieve code model snapshot restricted to project of ui file.
+    const ProjectExplorer::Project *uiProject = ProjectExplorer::ProjectExplorerPlugin::instance()->session()->projectForFile(currentUiFile);
+    if (!uiProject) {
+        *errorMessage = tr("Internal error: No project could be found for %1.").arg(currentUiFile);
+        return false;
+    }
+    CPlusPlus::Snapshot docTable = cppModelManagerInstance()->snapshot();
+    for  (CPlusPlus::Snapshot::iterator it = docTable.begin(); it != docTable.end(); ) {
+        const ProjectExplorer::Project *project = ProjectExplorer::ProjectExplorerPlugin::instance()->session()->projectForFile(it.key());
+        if (project == uiProject) {
+            ++it;
+        } else {
+            it = docTable.erase(it);
+        }
+    }
     // take all docs, find the ones that include the ui_xx.h.
-
-    const CPlusPlus::Snapshot docTable = cppModelManagerInstance()->snapshot();
     QList<Document::Ptr> docList = findDocumentsIncluding(docTable, uicedName, true); // change to false when we know the absolute path to generated ui_<>.h file
 
     if (Designer::Constants::Internal::debug)
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index c8cf6b908296523b40971b3fc21f2cf6c7c9e317..d690a3452cd952e32a804985cbbbf0b4ef07e2f4 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -1178,7 +1178,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
         m_passing = !m_passing;
         updateMiniBuffer();
     } else if (key == '.') {
-        //qDebug() << "REPEATING" << quoteUnprintable(m_dotCommand);
+        //qDebug() << "REPEATING" << quoteUnprintable(m_dotCommand) << count();
         QString savedCommand = m_dotCommand;
         m_dotCommand.clear();
         replay(savedCommand, count());
@@ -1366,6 +1366,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
         }
         finishMovement("j");
     } else if (key == 'J') {
+        setDotCommand("%1J", count());
+        beginEditBlock();
         if (m_submode == NoSubMode) {
             for (int i = qMax(count(), 2) - 1; --i >= 0; ) {
                 moveToEndOfLine();
@@ -1380,6 +1382,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
             if (!m_gflag)
                 moveLeft();
         }
+        endEditBlock();
+        finishMovement();
     } else if (key == 'k' || key == Key_Up) {
         if (m_submode == NoSubMode || m_submode == ZSubMode
                 || m_submode == CapitalZSubMode || m_submode == RegisterSubMode) {
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index da93cd6795524a58bf4f804074659560c9eba538..9e5fd1a80542e023f48ab9900eeadf04ba5e3c66 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -418,7 +418,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
         cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl++")));
         connect(a, SIGNAL(triggered()), m_centralWidget, SLOT(zoomIn()));
         advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT);
-        
+
         a = new QAction(tr("Decrease Font Size"), this);
         cmd = am->registerAction(a, TextEditor::Constants::DECREASE_FONT_SIZE,
             modecontext);
@@ -572,7 +572,6 @@ void HelpPlugin::extensionsInitialized()
         return;
     }
 
-    bool needsSetup = false;
     bool assistantInternalDocRegistered = false;
     QStringList documentationToRemove;
     QStringList filtersToRemove;
@@ -601,12 +600,10 @@ void HelpPlugin::extensionsInitialized()
         QHelpEngineCore hc(m_helpEngine->collectionFile());
         hc.setupData();
         foreach (const QString &ns, documentationToRemove) {
-            if (hc.unregisterDocumentation(ns))
-                needsSetup = true;
+            hc.unregisterDocumentation(ns);
         }
         foreach (const QString &filter, filtersToRemove) {
-            if (hc.removeCustomFilter(filter))
-                needsSetup = true;
+            hc.removeCustomFilter(filter);
         }
 
         if (!assistantInternalDocRegistered) {
@@ -619,38 +616,46 @@ void HelpPlugin::extensionsInitialized()
 #endif
             if (!hc.registerDocumentation(qchFileName))
                 qDebug() << qPrintable(hc.error());
-            needsSetup = true;
         }
 
     }
 
-    QLatin1String key("UnfilteredFilterInserted");
-    int i = m_helpEngine->customValue(key).toInt();
-    if (i != 1) {
-        {
-            QHelpEngineCore hc(m_helpEngine->collectionFile());
-            hc.setupData();
-            hc.addCustomFilter(tr("Unfiltered"), QStringList());
-            hc.setCustomValue(key, 1);
+    const QLatin1String weAddedFilterKey("UnfilteredFilterInserted");
+    const QLatin1String previousFilterNameKey("UnfilteredFilterName");
+    int i = m_helpEngine->customValue(weAddedFilterKey).toInt();
+    const QString filterName = tr("Unfiltered");
+    if (i == 1) { // we added a filter at some point
+        // remove previously added filter
+        QHelpEngineCore hc(m_helpEngine->collectionFile());
+        hc.setupData();
+        QString previousFilterName = hc.customValue(previousFilterNameKey).toString();
+        if (!previousFilterName.isEmpty()) { // we noted down the name of the previously added filter
+            hc.removeCustomFilter(previousFilterName);
+        }
+        if (previousFilterName != filterName) { // potentially remove a filter with new name
+            hc.removeCustomFilter(filterName);
         }
-        bool blocked = m_helpEngine->blockSignals(true);
-        m_helpEngine->setCurrentFilter(tr("Unfiltered"));
-        m_helpEngine->blockSignals(blocked);
-        needsSetup = true;
     }
+    {
+        QHelpEngineCore hc(m_helpEngine->collectionFile());
+        hc.setupData();
+        hc.addCustomFilter(filterName, QStringList());
+        hc.setCustomValue(weAddedFilterKey, 1);
+        hc.setCustomValue(previousFilterNameKey, filterName);
+    }
+    bool blocked = m_helpEngine->blockSignals(true);
+    m_helpEngine->setCurrentFilter(filterName);
+    m_helpEngine->blockSignals(blocked);
 
     QString addedDocs = m_helpEngine->customValue(QLatin1String("AddedDocs")).toString();
     if (!addedDocs.isEmpty()) {
         QStringList documentationToAdd = addedDocs.split(";");
-        foreach(QString item, documentationToAdd) {
-            needsSetup = true;
+        foreach (QString item, documentationToAdd)
             m_helpEngine->registerDocumentation(item);
-        }
         m_helpEngine->removeCustomValue(QLatin1String("AddedDocs"));
     }
 
-    if (needsSetup)
-        m_helpEngine->setupData();
+    m_helpEngine->setupData();
 
     updateFilterComboBox();
     m_bookmarkManager->setupBookmarkModels();
@@ -662,7 +667,7 @@ void HelpPlugin::extensionsInitialized()
 
     font = qVariantValue<QFont>(m_helpEngine->customValue(QLatin1String("font"),
         font));
-    
+
     webSettings->setFontFamily(QWebSettings::StandardFont, font.family());
     webSettings->setFontSize(QWebSettings::DefaultFontSize, font.pointSize());
 #endif
diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp
index 422c8328c267658cd99a4429a4757eb4b37e4c09..b34a7d64b22bc3db5b7d93648d69dfc3b5e52797 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.cpp
+++ b/src/plugins/projectexplorer/environmenteditmodel.cpp
@@ -234,15 +234,21 @@ int EnvironmentModel::findInResultInsertPosition(const QString &name) const
 bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
     if (role == Qt::EditRole && index.isValid()) {
+        // ignore changes to already set values:
+        if (data(index, role) == value)
+            return true;
+
         if (index.column() == 0) {
             //fail if a variable with the same name already exists
 #ifdef Q_OS_WIN
-            if (findInChanges(value.toString().toUpper()) != -1)
-                return false;
+            const QString &newName = value.toString().toUpper();
 #else
-            if (findInChanges(value.toString()) != -1)
-                return false;
+            const QString &newName = value.toString();
 #endif
+
+            if (findInChanges(newName) != -1)
+                return false;
+
             EnvironmentItem old("", "");
             if (m_mergedEnvironments) {
                 int pos = findInChanges(indexToVariable(index));
@@ -256,11 +262,7 @@ bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value,
             } else {
                 old = m_items.at(index.row());
             }
-#ifdef Q_OS_WIN
-            const QString &newName = value.toString().toUpper();
-#else
-            const QString &newName = value.toString();
-#endif
+
             if (changes(old.name))
                 removeVariable(old.name);
             old.name = newName;
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 549d0ce3508029ad56bb9908bbde8ebc76d3ec7a..1693c398df759b4883b89b43d4716bc07ae339dd 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2006,17 +2006,15 @@ void ProjectExplorerPlugin::populateRunConfigurationMenu()
 
     foreach (const Project *pro, d->m_session->projects()) {
         foreach (RunConfiguration *runConfiguration, pro->runConfigurations()) {
-            if (runConfiguration->isEnabled()) {
-                const QString title = QString("%1 (%2)").arg(pro->name(), runConfiguration->name());
-                QAction *act = new QAction(title, d->m_runConfigurationActionGroup);
-                act->setCheckable(true);
-                act->setData(qVariantFromValue(runConfiguration));
-                act->setChecked(runConfiguration == activeRunConfiguration);
-                d->m_runConfigurationMenu->addAction(act);
-                if (debug)
-                    qDebug() << "RunConfiguration" << runConfiguration << "project:" << pro->name()
-                             << "active:" << (runConfiguration == activeRunConfiguration);
-            }
+            const QString title = QString("%1 (%2)").arg(pro->name(), runConfiguration->name());
+            QAction *act = new QAction(title, d->m_runConfigurationActionGroup);
+            act->setCheckable(true);
+            act->setData(qVariantFromValue(runConfiguration));
+            act->setChecked(runConfiguration == activeRunConfiguration);
+            d->m_runConfigurationMenu->addAction(act);
+            if (debug)
+                qDebug() << "RunConfiguration" << runConfiguration << "project:" << pro->name()
+                         << "active:" << (runConfiguration == activeRunConfiguration);
         }
     }
 
diff --git a/src/plugins/projectexplorer/projectwizardpage.ui b/src/plugins/projectexplorer/projectwizardpage.ui
index 6773a3da3a7373f6938900a8f4ad3598811b2be8..89d15be8683def8f161612452c38d4f6c95ad951 100644
--- a/src/plugins/projectexplorer/projectwizardpage.ui
+++ b/src/plugins/projectexplorer/projectwizardpage.ui
@@ -65,10 +65,13 @@
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>10</height>
       </size>
      </property>
     </spacer>
@@ -92,8 +95,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>601</width>
-        <height>154</height>
+        <width>611</width>
+        <height>305</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
index 9207460cb026d5003a5f8269639fd96c4fbe89fa..d77db8e07414b3a462a106bddef630e8574225b4 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
@@ -138,22 +138,56 @@ bool S60Devices::read()
 #endif
 }
 
+// Windows: Get list of paths containing common program data
+// as pointed to by environment.
+static QStringList commonProgramFilesPaths()
+{
+    const QChar pathSep = QLatin1Char(';');
+    QStringList rc;
+    const QByteArray commonX86 = qgetenv("CommonProgramFiles(x86)");
+    if (!commonX86.isEmpty())
+        rc += QString::fromLocal8Bit(commonX86).split(pathSep);
+    const QByteArray common = qgetenv("CommonProgramFiles");
+    if (!common.isEmpty())
+        rc += QString::fromLocal8Bit(common).split(pathSep);
+    return rc;
+}
+
 // Windows EPOC
 
-bool S60Devices::readWin()
+// Find the "devices.xml" file containing the SDKs
+static QString devicesXmlFile(QString *errorMessage)
 {
-    // Check the windows registry via QSettings for devices.xml path
-    QSettings settings(SYMBIAN_SDKS_KEY, QSettings::NativeFormat);
-    QString devicesXmlPath = settings.value(SYMBIAN_PATH_KEY).toString();
-    if (devicesXmlPath.isEmpty()) {
-        m_errorString = "Could not find installed SDKs in registry.";
-        return false;
+    const QString devicesFile = QLatin1String(SYMBIAN_DEVICES_FILE);
+    // Try registry
+    const QSettings settings(QLatin1String(SYMBIAN_SDKS_KEY), QSettings::NativeFormat);
+    const QString devicesRegistryXmlPath = settings.value(QLatin1String(SYMBIAN_PATH_KEY)).toString();
+    if (!devicesRegistryXmlPath.isEmpty())
+        return QDir::cleanPath(devicesRegistryXmlPath + QLatin1Char('/') + devicesFile);
+    // Look up common program data files
+    const QString symbianDir = QLatin1String("/symbian/");
+    foreach(const QString &commonDataDir, commonProgramFilesPaths()) {
+        const QFileInfo fi(commonDataDir + symbianDir + devicesFile);
+        if (fi.isFile())
+            return fi.absoluteFilePath();
     }
+    // None found...
+    *errorMessage = QString::fromLatin1("The file '%1' containing the device SDK configuration "
+                                        "could not be found looking at the registry key "
+                                        "%2\\%3 or the common program data directories.").
+                                        arg(devicesFile, QLatin1String(SYMBIAN_SDKS_KEY),
+                                            QLatin1String(SYMBIAN_PATH_KEY));
+    return QString();
+}
 
-    devicesXmlPath += QLatin1String("/") + QLatin1String(SYMBIAN_DEVICES_FILE);
+bool S60Devices::readWin()
+{
+    const QString devicesXmlPath = devicesXmlFile(&m_errorString);
+    if (devicesXmlPath.isEmpty())
+        return false;
     QFile devicesFile(devicesXmlPath);
-    if (!devicesFile.open(QIODevice::ReadOnly)) {
-        m_errorString = QString("Could not read devices file at %1.").arg(devicesXmlPath);
+    if (!devicesFile.open(QIODevice::ReadOnly|QIODevice::Text)) {
+        m_errorString = QString::fromLatin1("Could not open the devices file %1: %2").arg(devicesXmlPath, devicesFile.errorString());
         return false;
     }
     QXmlStreamReader xml(&devicesFile);
@@ -192,10 +226,10 @@ bool S60Devices::readWin()
     }
     devicesFile.close();
     if (xml.hasError()) {
-        m_errorString = xml.errorString();
+        m_errorString = QString::fromLatin1("Syntax error in devices file %1: %2").
+                        arg(devicesXmlPath, xml.errorString());
         return false;
     }
-
     return true;
 }
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
index 81023915f0267dc830aec2d25c244359c3cc0f95..c1b616eb7723a56ee8b74e7b32e4b71ce8c61497 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
@@ -72,8 +72,26 @@ void S60DevicesWidget::updateDevicesList()
         item->setToolTip(1, tooltip);
         m_ui->list->addTopLevelItem(item);
     }
+    const QString errorString = m_devices->errorString();
+    if (errorString.isEmpty()) {
+        clearErrorLabel();
+    } else {
+        setErrorLabel(errorString);
+    }
+}
+
+void S60DevicesWidget::setErrorLabel(const QString& t)
+{
+    m_ui->errorLabel->setText(t);
+    m_ui->errorLabel->setVisible(true);
+}
+
+void S60DevicesWidget::clearErrorLabel()
+{
+    m_ui->errorLabel->setVisible(false);
 }
 
+
 S60DevicesPreferencePane::S60DevicesPreferencePane(S60Devices *devices, QObject *parent)
         : Core::IOptionsPage(parent),
         m_widget(0),
@@ -121,3 +139,5 @@ void S60DevicesPreferencePane::apply()
 void S60DevicesPreferencePane::finish()
 {
 }
+
+
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h
index 3378dcd31699f9aa167f43d060d11f6400280605..92efc14e499ba86fe3128e6c7d52bde3b4e0976f 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h
@@ -56,6 +56,9 @@ private slots:
 
 private:
     void updateDevicesList();
+    void setErrorLabel(const QString&);
+    void clearErrorLabel();
+
     Ui::S60DevicesPreferencePane *m_ui;
     S60Devices *m_devices;
 };
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui
index f739161007a9eb764e703670f63b39053f911f44..1693e3e8a5b119bbd0c98068a9114fdd3dd52a42 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="titleLabel">
      <property name="text">
       <string>Installed S60 SDKs:</string>
      </property>
@@ -50,6 +50,22 @@
      </column>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="errorLabel">
+     <property name="styleSheet">
+      <string notr="true">background-color: red;</string>
+     </property>
+     <property name="text">
+      <string>Error</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
index 90a3f28f4d5cabe94b7294124438665123de0286..92f8e565c4aa72c4b0fb79054e733bca78531389 100644
--- a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
+++ b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
@@ -51,67 +51,67 @@ const itemVectorType itemVector()
 {
     static const struct item items[] = {
         {"core",
-            QCoreApplication::translate("QtModulesInfo", "QtCore Module"),
+            QLatin1String("QtCore"),
             QCoreApplication::translate("QtModulesInfo", "Core non-GUI classes used by other modules"),
             true},
         {"gui",
-            QCoreApplication::translate("QtModulesInfo", "QtGui Module"),
+            QLatin1String("QtGui"),
             QCoreApplication::translate("QtModulesInfo", "Graphical user interface components"),
             true},
         {"network",
-            QCoreApplication::translate("QtModulesInfo", "QtNetwork Module"),
+            QLatin1String("QtNetwork"),
             QCoreApplication::translate("QtModulesInfo", "Classes for network programming"),
             false},
         {"opengl",
-            QCoreApplication::translate("QtModulesInfo", "QtOpenGL Module"),
+            QLatin1String("QtOpenGL"),
             QCoreApplication::translate("QtModulesInfo", "OpenGL support classes"),
             false},
         {"sql",
-            QCoreApplication::translate("QtModulesInfo", "QtSql Module"),
+            QLatin1String("QtSql"),
             QCoreApplication::translate("QtModulesInfo", "Classes for database integration using SQL"),
             false},
         {"script",
-            QCoreApplication::translate("QtModulesInfo", "QtScript Module"),
+            QLatin1String("QtScript"),
             QCoreApplication::translate("QtModulesInfo", "Classes for evaluating Qt Scripts"),
             false},
         {"scripttools",
-            QCoreApplication::translate("QtModulesInfo", "QtScriptTools Module"),
+            QLatin1String("QtScriptTools"),
             QCoreApplication::translate("QtModulesInfo", "Additional Qt Script components"),
             false},
         {"svg",
-            QCoreApplication::translate("QtModulesInfo", "QtSvg Module"),
+            QLatin1String("QtSvg"),
             QCoreApplication::translate("QtModulesInfo", "Classes for displaying the contents of SVG files"),
             false},
         {"webkit",
-            QCoreApplication::translate("QtModulesInfo", "QtWebKit Module"),
+            QLatin1String("QtWebKit"),
             QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content"),
             false},
         {"xml",
-            QCoreApplication::translate("QtModulesInfo", "QtXml Module"),
+            QLatin1String("QtXml"),
             QCoreApplication::translate("QtModulesInfo", "Classes for handling XML"),
             false},
         {"xmlpatterns",
-            QCoreApplication::translate("QtModulesInfo", "QtXmlPatterns Module"),
+            QLatin1String("QtXmlPatterns"),
             QCoreApplication::translate("QtModulesInfo", "An XQuery/XPath engine for XML and custom data models"),
             false},
         {"phonon",
-            QCoreApplication::translate("QtModulesInfo", "Phonon Module"),
+            QLatin1String("Phonon"),
             QCoreApplication::translate("QtModulesInfo", "Multimedia framework classes"),
             false},
         {"multimedia",
-            QCoreApplication::translate("QtModulesInfo", "QtMultimedia Module"),
+            QLatin1String("QtMultimedia"),
             QCoreApplication::translate("QtModulesInfo", "Classes for low-level multimedia functionality"),
             false},
         {"qt3support",
-            QCoreApplication::translate("QtModulesInfo", "Qt3Support Module"),
+            QLatin1String("Qt3Support"),
             QCoreApplication::translate("QtModulesInfo", "Classes that ease porting from Qt 3 to Qt 4"),
             false},
         {"testlib",
-            QCoreApplication::translate("QtModulesInfo", "QtTest Module"),
+            QLatin1String("QtTest"),
             QCoreApplication::translate("QtModulesInfo", "Tool classes for unit testing"),
             false},
         {"dbus",
-            QCoreApplication::translate("QtModulesInfo", "QtDBus Module"),
+            QLatin1String("QtDBus"),
             QCoreApplication::translate("QtModulesInfo", "Classes for Inter-Process Communication using the D-Bus"),
             false}
     };
diff --git a/src/plugins/texteditor/completionwidget.cpp b/src/plugins/texteditor/completionwidget.cpp
index e4f7c97b80e0f5c0e5a9afec88f5f325a12173a4..7cdbac8577da45a2e07f0e592366388bc788602e 100644
--- a/src/plugins/texteditor/completionwidget.cpp
+++ b/src/plugins/texteditor/completionwidget.cpp
@@ -139,7 +139,16 @@ bool CompletionWidget::event(QEvent *e)
 
     bool forwardKeys = true;
     if (e->type() == QEvent::FocusOut) {
-        closeList();
+        QModelIndex index;
+#if defined(Q_OS_DARWIN) && ! defined(QT_MAC_USE_COCOA)
+        QFocusEvent *fe = static_cast<QFocusEvent *>(e);
+        if (fe->reason() == Qt::OtherFocusReason) {
+            // Qt/carbon workaround
+            // focus out is received before the key press event.
+            index = currentIndex();
+        }
+#endif
+        closeList(index);
         return true;
     } else if (e->type() == QEvent::KeyPress) {
         QKeyEvent *ke = static_cast<QKeyEvent *>(e);
@@ -153,7 +162,8 @@ bool CompletionWidget::event(QEvent *e)
         case Qt::Key_Tab:
         case Qt::Key_Return:
             //independently from style, accept current entry if return is pressed
-            closeList(currentIndex());
+            if (qApp->focusWidget() == this)
+                closeList(currentIndex());
             return true;
         case Qt::Key_Up:
             if (currentIndex().row() == 0) {
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index 5043583a469ff491203b72fe8922c7afc0193e4b..9da54ddc10c28b88b459d7d0df7fb6159ec5e9ec 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -362,9 +362,11 @@ void TextEditorActionHandler::gotoAction()
 {
     Locator::LocatorManager *locatorManager = Locator::LocatorManager::instance();
     QTC_ASSERT(locatorManager, return);
-    const QString shortcut = TextEditorPlugin::instance()->lineNumberFilter()->shortcutString();
-    const QString text = tr(" <line number>");
-    locatorManager->show(shortcut + text, 2, text.length()-1);
+    QString locatorString = TextEditorPlugin::instance()->lineNumberFilter()->shortcutString();
+    locatorString += QLatin1Char(' ');
+    const int selectionStart = locatorString.size();
+    locatorString += tr("<line number>");
+    locatorManager->show(locatorString, selectionStart, locatorString.size() - selectionStart);
 }
 
 void TextEditorActionHandler::printAction()
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index dafec2ef83b872b203001e0471ea746158568345..b9ed42aa4b5c18676b031c8c9deb7ea2de7c2d6f 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -175,8 +175,7 @@ private slots:
 private:
     void dumpQAbstractItemHelper(QModelIndex &index);
     void dumpQAbstractItemModelHelper(QAbstractItemModel &m);
-    void dumpQDateTimeHelper(const QDateTime &d);
-    void dumpQFileHelper(const QString &name, bool exists);
+    void dumpQDateTimeHelper(const QDateTime &d, bool isNull);
     template <typename K, typename V> void dumpQHashNodeHelper(QHash<K, V> &hash);
     void dumpQImageHelper(const QImage &img);
     void dumpQImageDataHelper(QImage &img);
@@ -458,10 +457,13 @@ static const QByteArray ptrToBa(const void *p, bool symbolicNull = true)
         QByteArray("0x") + QByteArray::number((quintptr) p, 16));
 }
 
-static const QByteArray generateQStringSpec(const QString &str)
+static const QByteArray generateQStringSpec(const QString &str, bool isNull = false)
 {
-    return QByteArray("value='%',type='"NS"QString',numchild='0',valueencoded='2'")
-        << utfToBase64(str);
+    if (isNull)
+        return QByteArray("value=''' (null)',type='"NS"QString',numchild='0'");
+    return
+        QByteArray("value='%',valueencoded='2',type='"NS"QString',numchild='0'")
+                << utfToBase64(str);
 }
 
 static const QByteArray generateQCharSpec(const QChar& ch)
@@ -925,7 +927,7 @@ void tst_Debugger::dumpQChar()
         &c, NS"QChar", false);
 }
 
-void tst_Debugger::dumpQDateTimeHelper(const QDateTime &d)
+void tst_Debugger::dumpQDateTimeHelper(const QDateTime &d, bool isNull)
 {
     QByteArray value;
     if (d.isNull())
@@ -944,10 +946,10 @@ void tst_Debugger::dumpQDateTimeHelper(const QDateTime &d)
             << value
             << generateBoolSpec(d.isNull())
             << generateLongSpec((d.toTime_t()))
-            << generateQStringSpec(d.toString())
-            << generateQStringSpec(d.toString(Qt::ISODate))
-            << generateQStringSpec(d.toString(Qt::SystemLocaleDate))
-            << generateQStringSpec(d.toString(Qt::LocaleDate));
+            << generateQStringSpec(d.toString(), isNull)
+            << generateQStringSpec(d.toString(Qt::ISODate), isNull)
+            << generateQStringSpec(d.toString(Qt::SystemLocaleDate), isNull)
+            << generateQStringSpec(d.toString(Qt::LocaleDate), isNull);
     testDumper(expected, &d, NS"QDateTime", true);
 }
 
@@ -955,11 +957,11 @@ void tst_Debugger::dumpQDateTime()
 {
     // Case 1: Null object.
     QDateTime d;
-    dumpQDateTimeHelper(d);
+    dumpQDateTimeHelper(d, true);
 
     // Case 2: Non-null object.
     d = QDateTime::currentDateTime();
-    dumpQDateTimeHelper(d);
+    dumpQDateTimeHelper(d, false);
 }
 
 void tst_Debugger::dumpQDir()
@@ -983,30 +985,35 @@ void tst_Debugger::dumpQDir()
         &dir, NS"QDir", true);
 }
 
-void tst_Debugger::dumpQFileHelper(const QString &name, bool exists)
-{
-    QFile file(name);
-    QByteArray filenameAsBase64 = utfToBase64(name);
-    testDumper(QByteArray("value='%',valueencoded='2',type='$T',numchild='2',"
-        "children=[{name='fileName',value='%',type='"NS"QString',"
-        "numchild='0',valueencoded='2'},"
-        "{name='exists',value=%,type='bool',numchild='0'}]")
-            << filenameAsBase64 << filenameAsBase64 << boolToVal(exists),
-        &file, NS"QFile", true);
-}
 
 void tst_Debugger::dumpQFile()
 {
     // Case 1: Empty file name => Does not exist.
-    dumpQFileHelper("", false);
+    QFile file1("");
+    testDumper(QByteArray("value='',valueencoded='2',type='$T',numchild='2',"
+        "children=[{name='fileName',value='',valueencoded='2',type='"NS"QString',"
+        "numchild='0'},"
+        "{name='exists',value='false',type='bool',numchild='0'}]"),
+        &file1, NS"QFile", true);
 
     // Case 2: File that is known to exist.
-    QTemporaryFile file;
-    file.open();
-    dumpQFileHelper(file.fileName(), true);
+    QTemporaryFile file2;
+    file2.open();
+    testDumper(QByteArray("value='%',valueencoded='2',type='$T',numchild='2',"
+        "children=[{name='fileName',value='%',valueencoded='2',type='"NS"QString',"
+        "numchild='0'},"
+        "{name='exists',value='true',type='bool',numchild='0'}]")
+            << utfToBase64(file2.fileName()) << utfToBase64(file2.fileName()),
+        &file2, NS"QFile", true);
 
     // Case 3: File with a name that most likely does not exist.
-    dumpQFileHelper("jfjfdskjdflsdfjfdls", false);
+    QFile file3("jfjfdskjdflsdfjfdls");
+    testDumper(QByteArray("value='%',valueencoded='2',type='$T',numchild='2',"
+        "children=[{name='fileName',value='%',valueencoded='2',type='"NS"QString',"
+        "numchild='0'},"
+        "{name='exists',value='false',type='bool',numchild='0'}]")
+            << utfToBase64(file3.fileName()) << utfToBase64(file3.fileName()),
+        &file3, NS"QFile", true);
 }
 
 void tst_Debugger::dumpQFileInfo()
@@ -1062,7 +1069,7 @@ void tst_Debugger::dumpQFileInfo()
     expected <<= generateQStringSpec(fi.canonicalPath());
     expected <<= generateQStringSpec(fi.canonicalFilePath());
     expected <<= generateQStringSpec(fi.completeBaseName());
-    expected <<= generateQStringSpec(fi.completeSuffix());
+    expected <<= generateQStringSpec(fi.completeSuffix(), true);
     expected <<= generateQStringSpec(fi.baseName());
 #ifdef Q_OS_MACX
     expected <<= generateBoolSpec(fi.isBundle());
@@ -2254,7 +2261,7 @@ void tst_Debugger::dumpQSharedPointer()
 void tst_Debugger::dumpQString()
 {
     QString s;
-    testDumper("value='',valueencoded='2',type='$T',numchild='0'",
+    testDumper("value=''' (null)',type='$T',numchild='0'",
         &s, NS"QString", false);
     s = "abc";
     testDumper("value='YQBiAGMA',valueencoded='2',type='$T',numchild='0'",
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index 1aa484c570f723c7039d6c2840b7ee860d88c0c3..0fa27658be62e8695feb1dc0377cdca531432695 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -1534,7 +1534,7 @@ void dump_QObject()
     /* B */ QObject ob;
     /* D */ ob.setObjectName("An Object");
     /* E */ QObject::connect(&ob, SIGNAL(destroyed()), qApp, SLOT(quit()));
-    /* F */ QObject::disconnect(&ob, SIGNAL(destroyed()), qApp, SLOT(quit()));
+//    /* F */ QObject::disconnect(&ob, SIGNAL(destroyed()), qApp, SLOT(quit()));
     /* G */ ob.setObjectName("A renamed Object");
     /* H */ (void) 0; }
 
@@ -1554,7 +1554,7 @@ void tst_Gdb::dump_QObject()
         run("A","{iname='local.ob',name='ob',"
             "type='"NS"QObject',value='<not in scope>',"
             "numchild='0'}");
-    next(3);
+    next(4);
     
     run("F","{iname='local.ob',name='ob',type='"NS"QObject',valueencoded='7',"
       "value='41006e0020004f0062006a00650063007400',numchild='4',children=["
diff --git a/tests/auto/fakevim/main.cpp b/tests/auto/fakevim/main.cpp
index d3e71f5032bc8682aad4aa6f94c2d571d1fc684a..5c692fc5eaf169bf6e40b793fdcf1b78f9efcc9f 100644
--- a/tests/auto/fakevim/main.cpp
+++ b/tests/auto/fakevim/main.cpp
@@ -56,26 +56,27 @@ public slots:
     
 private slots:
     // command mode
+    void command_Cxx_down_dot();
+    void command_Gyyp();
+    void command_J();
+    void command_Yp();
     void command_cc();
     void command_cw();
-    void command_dw();
     void command_dd();
     void command_dd_2();
+    void command_dfx_down();
     void command_dollar();
     void command_down();
-    void command_dfx_down();
-    void command_Cxx_down_dot();
+    void command_dw();
     void command_e();
     void command_i();
     void command_left();
+    void command_ma_yank();
     void command_r();
     void command_right();
     void command_up();
     void command_w();
     void command_yyp();
-    void command_Yp();
-    void command_Gyyp();
-    void command_ma_yank();
 
     // special tests
     void test_i_cw_i();
@@ -525,6 +526,21 @@ return; // FIXME: not in sync with Gui behaviour?
     check("iaa" + escape,    l[0] + "\nxya@ay" + lmid(1));
 }
 
+void tst_FakeVim::command_J()
+{
+    setup();
+    move("4j4l",   "int @main");
+    
+    check("J", lmid(0, 5) + "@ " + lmid(5));
+    check("u", lmid(0, 4) + "\nint @main(int argc, char *argv[])\n" + lmid(5));  
+    checkEx("redo", lmid(0, 5) + "@ " + lmid(5));
+
+return; // FIXME: not in sync with Gui behaviour?
+    check("3J", lmid(0, 5) + " " + lmid(5, 1) + "@" + lmid(6).mid(3));
+    check("u", lmid(0, 4) + "\nint @main(int argc, char *argv[])\n" + lmid(5));  
+    checkEx("redo", lmid(0, 5) + "@ " + lmid(5));
+}
+
 
 /*