Merge branch 'akien-mga-master'
This commit is contained in:
commit
66f3309fdc
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
12
qml/main.qml
12
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
|
||||
|
@ -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
|
||||
|
@ -3,7 +3,11 @@
|
||||
<file>ts/2048-qt_zh_CN.qm</file>
|
||||
<file>ts/2048-qt_pl_PL.qm</file>
|
||||
<file>ts/2048-qt_ru_RU.qm</file>
|
||||
<<<<<<< HEAD
|
||||
<file>ts/2048-qt_de_DE.qm</file>
|
||||
=======
|
||||
<file>ts/2048-qt_fr_FR.qm</file>
|
||||
>>>>>>> 06f7ea31b324f1c8320c7197a56aee429ce6ba33
|
||||
<file>qml/main.qml</file>
|
||||
<file>qml/2048.js</file>
|
||||
<file>qml/Tile.qml</file>
|
||||
|
BIN
ts/2048-qt_fr_FR.qm
Normal file
BIN
ts/2048-qt_fr_FR.qm
Normal file
Binary file not shown.
128
ts/2048-qt_fr_FR.ts
Normal file
128
ts/2048-qt_fr_FR.ts
Normal file
@ -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 <b>2048 tile</b>!</source>
|
||||
<translation>Combinez les nombres pour atteindre <b>2048</b> !</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'objectif ! Voulez-vous continuer ?</translation>
|
||||
</message>
|
||||
</context>
|
||||
</TS>
|
Loading…
x
Reference in New Issue
Block a user