diff --git a/2048-qt.pro b/2048-qt.pro
index eed1d97..b4dbc85 100644
--- a/2048-qt.pro
+++ b/2048-qt.pro
@@ -30,7 +30,7 @@ HEADERS += \
src/settings.h \
src/myclass.h
-TRANSLATIONS = ts/2048-qt_de_DE.ts ts/2048-qt_pl_PL.ts ts/2048-qt_ru_RU.ts ts/2048-qt_zh_CN.ts
+TRANSLATIONS = ts/2048-qt_de_DE.ts ts/2048-qt_fr_FR.ts ts/2048-qt_pl_PL.ts ts/2048-qt_ru_RU.ts ts/2048-qt_zh_CN.ts
VERSION = 0.1.6
diff --git a/README.md b/README.md
index faad5b5..08dfc59 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,11 @@ A clone of [2048](https://github.com/gabrielecirulli/2048), implemented in Qt.
- PRC (天朝)
- Multi-language support, currently
- English
+<<<<<<< HEAD
- Polish (by [Michał Radwański](https://github.com/enedil))
+=======
+ - French (by [Rémi Verschelde](https://github.com/akien-mga))
+>>>>>>> 06f7ea31b324f1c8320c7197a56aee429ce6ba33
- Russian (by [Sergey Basalaev](https://github.com/SBasalaev))
- Simplified Chinese
diff --git a/qml/main.qml b/qml/main.qml
index 10a4d18..543e745 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/res/2048-qt.desktop b/res/2048-qt.desktop
index 058797d..f9856fd 100644
--- a/res/2048-qt.desktop
+++ b/res/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/resources.qrc b/resources.qrc
index 43eeff2..0576b31 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -3,7 +3,11 @@
ts/2048-qt_zh_CN.qm
ts/2048-qt_pl_PL.qm
ts/2048-qt_ru_RU.qm
+<<<<<<< HEAD
ts/2048-qt_de_DE.qm
+=======
+ ts/2048-qt_fr_FR.qm
+>>>>>>> 06f7ea31b324f1c8320c7197a56aee429ce6ba33
qml/main.qml
qml/2048.js
qml/Tile.qml
diff --git a/ts/2048-qt_fr_FR.qm b/ts/2048-qt_fr_FR.qm
new file mode 100644
index 0000000..6a29063
Binary files /dev/null and b/ts/2048-qt_fr_FR.qm differ
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 @@
+
+
+
+
+ main
+
+
+ 2048 Game
+ 2048
+
+
+
+ File
+ Fichier
+
+
+
+
+ New Game
+ Nouvelle partie
+
+
+
+ Exit
+ Quitter
+
+
+
+ Settings
+ Paramètres
+
+
+
+ Labeling
+ Variante
+
+
+
+ 2048
+ 2048
+
+
+
+ Degree
+ Diplôme (chinois)
+
+
+
+ Military Rank
+ Rang militaire (chinois)
+
+
+
+ PRC
+ RPC (chinois)
+
+
+
+ Language
+ Langue
+
+
+
+ Help
+ Aide
+
+
+
+ About
+ À propos
+
+
+
+ About Qt
+ À propos de Qt
+
+
+
+ SCORE
+ SCORE
+
+
+
+ BEST
+ RECORD
+
+
+
+ Join the numbers and get to the <b>2048 tile</b>!
+ Combinez les nombres pour atteindre <b>2048</b> !
+
+
+
+ Language Setting Hint
+ Information sur le paramétrage de la langue
+
+
+
+ Please restart the program to make the language setting take effect.
+ Veuillez redémarrer le programme pour que le changement de langue soit pris en compte.
+
+
+
+ About 2048-Qt
+ À propos de 2048-Qt
+
+
+
+ Game Over
+ Fin de la partie
+
+
+
+ Game Over!
+ Vous avez perdu !
+
+
+
+ You Win
+ Vous avez gagné
+
+
+
+ You win! Continue playing?
+ Vous avez atteint l'objectif ! Voulez-vous continuer ?
+
+
+