Merge pull request #14 from EdwardBetts/patch-1

correct spelling mistake

2048-qt.pro

@@ -30,7 +30,7 @@ HEADERS += \
     src/settings.h \
     src/myclass.h
 
-TRANSLATIONS = ts/2048-qt_zh_CN.ts ts/2048-qt_ru_RU.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
 

Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2015-09-19 0.1.6
+* added French, German, Polish translation
+* put config file in `~/.config/2048-qt/` instead of `~/.config/xiaoyong/`
+
 ## 2014-05-29 0.1.5
 * fixed the VERSION issue for Visual Studio
 * do not translate the language names
@@ -29,7 +33,7 @@
 * updated README.md
 
 ## 2014-04-22 0.1.0
-* embeded Droid Sans Fallback font
+* embedded Droid Sans Fallback font
 * save label setting
 * added more variants of 2048 and selection of them
 * improved the out of focus issue

README.md

@@ -13,6 +13,9 @@ 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))
+  - German (by [Jens John](https://github.com/2ion))
+  - Polish (by [Michał Radwański](https://github.com/enedil))
   - Russian (by [Sergey Basalaev](https://github.com/SBasalaev))
   - Simplified Chinese
 

qml/Tile.qml

@@ -14,7 +14,7 @@ Rectangle {
     property bool runNewTileAnim: false
     property bool destroyFlag: false
 
-    FontLoader { id: localFont; source: "qrc:///fonts/DroidSansFallback.ttf" }
+    FontLoader { id: localFont; source: "qrc:///res/fonts/DroidSansFallback.ttf" }
 
     Text {
         id: tileLabel

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
@@ -113,6 +125,19 @@ ApplicationWindow {
                         }
                     }
                 }
+                MenuItem {
+                    text: "Polski"
+                    checkable: true
+                    exclusiveGroup: languageSettingsGroup
+                    checked: settings.value("language") === "pl_PL" ? true : false
+                    onTriggered: {
+                        if (settings.value("language") !== "pl_PL") {
+                            settings.setValue("language", "pl_PL");
+                            changeLanguageDialog.open();
+                        }
+                    }
+                }
+
                 MenuItem {
                     text: "Русский"
                     checkable: true
@@ -125,6 +150,18 @@ ApplicationWindow {
                         }
                     }
                 }
+                MenuItem {
+                    text: "German"
+                    checkable: true
+                    exclusiveGroup: languageSettingsGroup
+                    checked: settings.value("language") == "de_DE" ?  true : false
+                    onTriggered: {
+                        if (settings.value("language") != "de_DE") {
+                            settings.setValue("language", "de_DE");
+                            changeLanguageDialog.open();
+                        }
+                    }
+                }
             }
         }
 
@@ -170,7 +207,7 @@ ApplicationWindow {
             onClicked: parent.forceActiveFocus()
         }
 
-        FontLoader { id: localFont; source: "qrc:///fonts/DroidSansFallback.ttf" }
+        FontLoader { id: localFont; source: "qrc:///res/fonts/DroidSansFallback.ttf" }
 
         Text {
             id: gameName

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

res/fonts/LICENSE

@@ -0,0 +1,18 @@
+Copyright (C) 2008 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+  
+     http://www.apache.org/licenses/LICENSE-2.0
+  
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+##########
+
+This directory contains the fonts for the platform. They are licensed
+under the Apache 2 license.

resources.qrc

@@ -1,7 +1,10 @@
 <RCC>
     <qresource prefix="/">
-        <file>ts/2048-qt_zh_CN.qm</file>
+        <file>ts/2048-qt_de_DE.qm</file>
+        <file>ts/2048-qt_fr_FR.qm</file>
+        <file>ts/2048-qt_pl_PL.qm</file>
         <file>ts/2048-qt_ru_RU.qm</file>
+        <file>ts/2048-qt_zh_CN.qm</file>
         <file>qml/main.qml</file>
         <file>qml/2048.js</file>
         <file>qml/Tile.qml</file>

ts/2048-qt_de_DE.ts

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="de_DE">
+<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>&amp;Datei</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="26"/>
+        <location filename="../qml/main.qml" line="276"/>
+        <source>New Game</source>
+        <translation>Neues Spiel</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="31"/>
+        <source>Exit</source>
+        <translation>&amp;Beenden</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="38"/>
+        <source>Settings</source>
+        <translation>&amp;Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="40"/>
+        <source>Labeling</source>
+        <translation>&amp;Beschriftung</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>Grad</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="66"/>
+        <source>Military Rank</source>
+        <translation>Militärsränge</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="78"/>
+        <source>PRC</source>
+        <translation>PRC</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="91"/>
+        <source>Language</source>
+        <translation>&amp;Sprache</translation>
+    </message>
+    <message>
+        <source>English</source>
+        <translation>Englisch</translation>
+    </message>
+    <message>
+        <source>Simplified Chinese</source>
+        <translation>Vereinfachtes Chinesisch</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="133"/>
+        <source>Help</source>
+        <translation>&amp;Hilfe</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="135"/>
+        <source>About</source>
+        <translation>Über</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="139"/>
+        <source>About Qt</source>
+        <translation>Über &amp;Qt</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="197"/>
+        <source>SCORE</source>
+        <translation>Punkte</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="197"/>
+        <source>BEST</source>
+        <translation>Rekord</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>Kombiniere bis zu einer Summe von &lt;b&gt;2048&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="314"/>
+        <source>Language Setting Hint</source>
+        <translation>Hinweis zur Spracheinstellung</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="315"/>
+        <source>Please restart the program to make the language setting take effect.</source>
+        <translation>Starten Sie das Programm erneut, um die geänderten Spracheinstellungen zu übernehmen.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="321"/>
+        <source>About 2048-Qt</source>
+        <translation>Über &amp;2048-Qt</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="328"/>
+        <source>Game Over</source>
+        <translation>Game Over</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="329"/>
+        <source>Game Over!</source>
+        <translation>Game Over!</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="339"/>
+        <source>You Win</source>
+        <translation>Sie gewinnen!</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>You win! Continue playing?</source>
+        <translation>Sie haben gewonnen! Weiterspielen?</translation>
+    </message>
+</context>
+</TS>

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>

ts/2048-qt_pl_PL.ts

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="pl_PL">
+<context>
+    <name>main</name>
+    <message>
+        <location filename="../qml/main.qml" line="13"/>
+        <source>2048 Game</source>
+        <translation>Gra 2048</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="24"/>
+        <source>File</source>
+        <translation>Plik</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="26"/>
+        <location filename="../qml/main.qml" line="276"/>
+        <source>New Game</source>
+        <translation>Nowa gra</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="31"/>
+        <source>Exit</source>
+        <translation>Wyjdź</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="38"/>
+        <source>Settings</source>
+        <translation>Ustawienia</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="40"/>
+        <source>Labeling</source>
+        <translation>Etykiety</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>Stopień</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="66"/>
+        <source>Military Rank</source>
+        <translation>Ranga wojskowa</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="78"/>
+        <source>PRC</source>
+        <translation>PRC</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="91"/>
+        <source>Language</source>
+        <translation>Język</translation>
+    </message>
+    <message>
+        <source>English</source>
+        <translation type="vanished">Angielski</translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation type="vanished">Polski</translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation type="vanished">Rosyjski</translation>
+    </message>
+    <message>
+        <source>Simplified Chinese</source>
+        <translation type="vanished">Chiński uproszczony</translation>
+    </message>
+
+    <message>
+        <location filename="../qml/main.qml" line="133"/>
+        <source>Help</source>
+        <translation>Pomoc</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="135"/>
+        <source>About</source>
+        <translation>O programie</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="139"/>
+        <source>About Qt</source>
+        <translation>O Qt</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="197"/>
+        <source>SCORE</source>
+        <translation>WYNIK</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="197"/>
+        <source>BEST</source>
+        <translation>NAJLEPSZY</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>Łącz liczby i dotrzyj do &lt;b&gt;kafelka 2048&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="314"/>
+        <source>Language Setting Hint</source>
+        <translation>Wskazówka odnośnie ustawiania języka</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="315"/>
+        <source>Please restart the program to make the language setting take effect.</source>
+        <translation>Aby zmiana języka była widoczna, proszę uruchomić ponownie program.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="321"/>
+        <source>About 2048-Qt</source>
+        <translation>O programie 2048-Qt</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="328"/>
+        <source>Game Over</source>
+        <translation>Игра окончена</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="329"/>
+        <source>Game Over!</source>
+        <translation>Gra skończona!</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="339"/>
+        <source>You Win</source>
+        <translation>Wygrałeś</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>You win! Continue playing?</source>
+        <translation>Wygrałeś! Kontynuować grę?</translation>
+    </message>
+</context>
+</TS>