Merge remote-tracking branch 'origin/4.9' into 4.10v4.10.0-beta2

Change-Id: I53ceb69b1558520e7d7b6db8b7ebdd5c1590e991

2 files changed, 59 insertions, 3 deletions

diff --git a/dist/changes-4.9.2.md b/dist/changes-4.9.2.md
new file mode 100644
index 0000000000..bc99860818
--- /dev/null
+++ b/dist/changes-4.9.2.md
@@ -0,0 +1,56 @@
+# Qt Creator 4.9.2
+
+Qt Creator version 4.9.2 contains bug fixes.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline origin/v4.9.1..v4.9.2
+
+## General
+
+* Fixed display of shortcuts in `Keyboard` preferences (QTCREATORBUG-22333)
+
+## Editing
+
+* Fixed disabled editor close button in Design mode (QTCREATORBUG-22553)
+
+### Syntax Highlighting
+
+* Fixed highlighting issue while editing (QTCREATORBUG-22290)
+
+## All Projects
+
+* Fixed saving state of `Hide Empty Directories`
+* Fixed crash that could happen after project parsing failed
+
+## C++ Support
+
+* Fixed expansion of `%DATE%` in license templates (QTCREATORBUG-22440)
+
+## Qt Quick Designer
+
+* Fixed crash on malformed QML (QDS-778)
+
+## Platform Specific
+
+### macOS
+
+* Re-enabled graphics card switching that was disabled as a workaround
+  for OpenGL issues on macOS 10.14.4 (QTCREATORBUG-22215)
+
+## Credits for these changes go to:
+
+Christian Kandeler  
+Christian Stenger  
+David Schulz  
+Eike Ziller  
+Leena Miettinen  
+Michl Voznesensky  
+Robert Löhning  
+Thomas Hartmann  
+Tim Jenssen  
+Tobias Hunger  
+Ulf Hermann  
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index f1677fa36e..95808e6d7b 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr">
+<TS version="2.1" language="fr">
 <context>
     <name>Application</name>
     <message>
@@ -42412,7 +42412,7 @@ au gestionnaire de version (%2)</translation>
     </message>
     <message>
         <source>Set Message Tracepoint at Line %1...</source>
-        <translation>Définir un message de traçace à la ligne %1...</translation>
+        <translation>Définir un message de traçage à la ligne %1...</translation>
     </message>
     <message>
         <source>Disassemble Function &quot;%1&quot;</source>
@@ -70891,7 +70891,7 @@ réinitialisation du moniteur</translation>
     <message>
         <source>Get Started Now</source>
         <translatorcomment>attention à la longueur du texte, doit reste petit</translatorcomment>
-        <translation type="unfinished">Démarrer</translation>
+        <translation>Démarrer</translation>
     </message>
     <message>
         <source>Online Community</source>