From 06f7ea31b324f1c8320c7197a56aee429ce6ba33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <remi@verschelde.fr>
Date: Thu, 13 Nov 2014 17:53:03 +0100
Subject: [PATCH] Add French translation

---
 2048-qt.desktop     |   1 +
 2048-qt.pro         |   2 +-
 README.md           |   1 +
 qml/main.qml        |  12 +++++
 resources.qrc       |   1 +
 ts/2048-qt_fr_FR.qm | Bin 0 -> 2031 bytes
 ts/2048-qt_fr_FR.ts | 128 ++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 ts/2048-qt_fr_FR.qm
 create mode 100644 ts/2048-qt_fr_FR.ts

diff --git a/2048-qt.desktop b/2048-qt.desktop
index 058797d..f9856fd 100644
--- a/2048-qt.desktop
+++ b/2048-qt.desktop
@@ -3,6 +3,7 @@
 Name=2048-Qt
 GenericName=2048-Qt
 Comment=The 2048 number game implemented in Qt
+Comment[fr]=Jeu de réflexion et de mathématique
 Exec=2048-qt
 Icon=2048-qt
 Terminal=false
diff --git a/2048-qt.pro b/2048-qt.pro
index 8029442..f5a649e 100644
--- a/2048-qt.pro
+++ b/2048-qt.pro
@@ -29,7 +29,7 @@ HEADERS += \
     myclass.h \
     settings.h
 
-TRANSLATIONS = ts/2048-qt_zh_CN.ts ts/2048-qt_ru_RU.ts
+TRANSLATIONS = ts/2048-qt_zh_CN.ts ts/2048-qt_ru_RU.ts ts/2048-qt_fr_FR.ts
 
 VERSION = 0.1.5
 
diff --git a/README.md b/README.md
index 5a1376e..728dbe2 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ A clone of [2048](https://github.com/gabrielecirulli/2048), implemented in Qt.
   - PRC (天朝)
 - Multi-language support, currently
   - English
+  - French (by [Rémi Verschelde](https://github.com/akien-mga))
   - Russian (by [Sergey Basalaev](https://github.com/SBasalaev))
   - Simplified Chinese
 
diff --git a/qml/main.qml b/qml/main.qml
index 67e9497..36aad86 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -101,6 +101,18 @@ ApplicationWindow {
                         }
                     }
                 }
+                MenuItem {
+                    text: "Français"
+                    checkable: true
+                    exclusiveGroup: languageSettingsGroup
+                    checked: settings.value("language") === "fr_FR" ? true : false
+                    onTriggered: {
+                        if (settings.value("language") !== "fr_FR") {
+                            settings.setValue("language", "fr_FR");
+                            changeLanguageDialog.open();
+                        }
+                    }
+                }
                 MenuItem {
                     text: "简体中文"
                     checkable: true
diff --git a/resources.qrc b/resources.qrc
index 8e26ef5..66bb0d1 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -2,6 +2,7 @@
     <qresource prefix="/">
         <file>ts/2048-qt_zh_CN.qm</file>
         <file>ts/2048-qt_ru_RU.qm</file>
+        <file>ts/2048-qt_fr_FR.qm</file>
         <file>qml/main.qml</file>
         <file>qml/2048.js</file>
         <file>qml/Tile.qml</file>
diff --git a/ts/2048-qt_fr_FR.qm b/ts/2048-qt_fr_FR.qm
new file mode 100644
index 0000000000000000000000000000000000000000..6a290630631d8261273189069f046fe1fb49e06d
GIT binary patch
literal 2031
zcmaJ?O^6g%5U!c&+3A(t#e;%~EN?=LhGgAUJa`yZbZ69rb$6XHD>(?hnR(l`_H>W^
z<A2D-Lk{98=3)p4xkWq(iXfr~5u!)}ddVRtFN%T$%*}&eb<ez=ZdX~RyWe|XeO2{U
z)!WML_PR%Je!cvpyy4!Ft9Sq1O+@#JzH1Q~m#NS=jWs@xT_DO0k@1&-cbAO6H{yMT
zjMq~{`Tex_mj^)2)1eEBsQ8Sm!@m&?ZOvZ|-(vrV{6C-n2b^Ds%HYpEH2!#T6Yt65
z^K(_A!ue8t%?X^FrHfx#SdW)}e_n*$Ml;{O4(E@}xf}mue}34J%=hQ;tFM0qzc=#p
z(+KB_BX@EE{JtB#b?FM$WD}Lf3P75)jizWj?J%*RA^ePOQ`>ix_@g6jH@7lqm_cH%
z?5H$yHKY;LC7(PzJqk2!aaYre!ZiAeEE=|LQh4@)q6s=cq2?HkIRyKjIFRAm@KLTo
z1~XyE8jnz&YBYoT)Tyf78M|wZgXxGrqbjuPl0$E)6Gyt4T67e9F0!>Lpf9!gP*qvJ
z$_O-ugdzY#{3-G^*r=VhGZ~H19sm>e6m*a6WLQNEb+vpB$+!#>g$O~Sw4Y(FnV3JR
z{A^;2NFYK20=6d++u4`_j!}{b-(}6QN^_LcBqr^GGgMGRjeW}Lra?{U>_NOHpl;8P
zgExC-5&6XLt+|CFtT?7bF}7*P=YlFgPU}{w&}6(GjCAX_p6!b8s1k0}X(~Su(rpV%
zg(CFg?Mibx?&J`XRwkR%nS@r;B0T$uRKhPRrV}$~Wm7q}Yo(JLq1hN}A?y^`wIXR{
zs<ueqfOQEu`pB9ywDHYV40>6!E<8>gg9PR!F#Ki3`^l&zwdSXb{Xw^DXJz76G*lQO
zR<X}^Gfg&yj!!HF_-!;c_ol>?Yar<3?LE5RcI;64XGC4P$I~*5(_CCR?jr|(%UPtm
z(VSDKR=7phBd7(m$*0^G7V0x;r`J#{1pzn-cF7IQNwgsw%j?H0Zl-=fd`nr_WoeUX
zUT(M(ETzWs6ecpM7|G4hzpDnM$6f$VmN2;m`9=`n;i9&1(m^qK@VDqjsxCN621@uU
zfS71ZG;7!QEMIoGNjvhmiuas;ErVVyLq1VUOR5!aNei)x8oj%$rri`9GxPOY8n*@_
z_dDwa!iuL(TbRA33DQR6Q2E1)!UB<nEMIE#()V5@4%u$n+F8+haJX4Hhc>}Sla4{D
z76P*|Bp7S_65mO6CvZ*mBVld1CVV|`-MGp-bu8;SmQ%J{7BilUL5Lu+BhO$Wb}ona
K6aMAp3%U0rA9iX0

literal 0
HcmV?d00001

diff --git a/ts/2048-qt_fr_FR.ts b/ts/2048-qt_fr_FR.ts
new file mode 100644
index 0000000..aa4a599
--- /dev/null
+++ b/ts/2048-qt_fr_FR.ts
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr_FR">
+<context>
+    <name>main</name>
+    <message>
+        <location filename="../qml/main.qml" line="13"/>
+        <source>2048 Game</source>
+        <translation>2048</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="24"/>
+        <source>File</source>
+        <translation>Fichier</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="26"/>
+        <location filename="../qml/main.qml" line="276"/>
+        <source>New Game</source>
+        <translation>Nouvelle partie</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="31"/>
+        <source>Exit</source>
+        <translation>Quitter</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="38"/>
+        <source>Settings</source>
+        <translation>Paramètres</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="40"/>
+        <source>Labeling</source>
+        <translation>Variante</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="42"/>
+        <source>2048</source>
+        <translation>2048</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="54"/>
+        <source>Degree</source>
+        <translation>Diplôme (chinois)</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="66"/>
+        <source>Military Rank</source>
+        <translation>Rang militaire (chinois)</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="78"/>
+        <source>PRC</source>
+        <translation>RPC (chinois)</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="91"/>
+        <source>Language</source>
+        <translation>Langue</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="133"/>
+        <source>Help</source>
+        <translation>Aide</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="135"/>
+        <source>About</source>
+        <translation>À propos</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="139"/>
+        <source>About Qt</source>
+        <translation>À propos de Qt</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="197"/>
+        <source>SCORE</source>
+        <translation>SCORE</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="197"/>
+        <source>BEST</source>
+        <translation>RECORD</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="257"/>
+        <source>Join the numbers and get to the &lt;b&gt;2048 tile&lt;/b&gt;!</source>
+        <translation>Combinez les nombres pour atteindre &lt;b&gt;2048&lt;/b&gt; !</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="314"/>
+        <source>Language Setting Hint</source>
+        <translation>Information sur le paramétrage de la langue</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="315"/>
+        <source>Please restart the program to make the language setting take effect.</source>
+        <translation>Veuillez redémarrer le programme pour que le changement de langue soit pris en compte.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="321"/>
+        <source>About 2048-Qt</source>
+        <translation>À propos de 2048-Qt</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="328"/>
+        <source>Game Over</source>
+        <translation>Fin de la partie</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="329"/>
+        <source>Game Over!</source>
+        <translation>Vous avez perdu !</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="339"/>
+        <source>You Win</source>
+        <translation>Vous avez gagné</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>You win! Continue playing?</source>
+        <translation>Vous avez atteint l&apos;objectif ! Voulez-vous continuer ?</translation>
+    </message>
+</context>
+</TS>