Lubuntu/2048-Qt
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Lubuntu:664f7ebcff7422962376acad452f12528c6274c4
Branches Tags
Lubuntu:master
..
compare: Lubuntu:1403770d04555d78d8afd186bad19c4306d4b1fa
Branches Tags
Lubuntu:master

No commits in common. "664f7ebcff7422962376acad452f12528c6274c4" and "1403770d04555d78d8afd186bad19c4306d4b1fa" have entirely different histories.
664f7ebcff ... 1403770d04

14 changed files with 5 additions and 480 deletions
Show Stats Expand all files Collapse all files

2
2048-qt.pro
View File

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

6
Changelog.md
View File

@ -1,9 +1,5 @@
# Changelog # 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 ## 2014-05-29 0.1.5
* fixed the VERSION issue for Visual Studio * fixed the VERSION issue for Visual Studio
* do not translate the language names * do not translate the language names
@ -33,7 +29,7 @@
* updated README.md * updated README.md
## 2014-04-22 0.1.0 ## 2014-04-22 0.1.0
* embedded Droid Sans Fallback font * embeded Droid Sans Fallback font
* save label setting * save label setting
* added more variants of 2048 and selection of them * added more variants of 2048 and selection of them
* improved the out of focus issue * improved the out of focus issue

3
README.md
View File

@ -13,9 +13,6 @@ A clone of [2048](https://github.com/gabrielecirulli/2048), implemented in Qt.
- PRC (天朝) - PRC (天朝)
- Multi-language support, currently - Multi-language support, currently
- English - 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)) - Russian (by [Sergey Basalaev](https://github.com/SBasalaev))
- Simplified Chinese - Simplified Chinese

2
qml/Tile.qml
View File

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

39
qml/main.qml
View File

@ -101,18 +101,6 @@ 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 { MenuItem {
text: "简体中文" text: "简体中文"
checkable: true checkable: true
@ -125,19 +113,6 @@ 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 { MenuItem {
text: "Русский" text: "Русский"
checkable: true checkable: true
@ -150,18 +125,6 @@ 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();
}
}
}
} }
} }
@ -207,7 +170,7 @@ ApplicationWindow {
onClicked: parent.forceActiveFocus() onClicked: parent.forceActiveFocus()
} }
FontLoader { id: localFont; source: "qrc:///res/fonts/DroidSansFallback.ttf" } FontLoader { id: localFont; source: "qrc:///fonts/DroidSansFallback.ttf" }
Text { Text {
id: gameName id: gameName

1
res/2048-qt.desktop
View File

@ -3,7 +3,6 @@
Name=2048-Qt Name=2048-Qt
GenericName=2048-Qt GenericName=2048-Qt
Comment=The 2048 number game implemented in Qt Comment=The 2048 number game implemented in Qt
Comment[fr]=Jeu de réflexion et de mathématique
Exec=2048-qt Exec=2048-qt
Icon=2048-qt Icon=2048-qt
Terminal=false Terminal=false

18
res/fonts/LICENSE
View File

@ -1,18 +0,0 @@
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.

5
resources.qrc
View File

@ -1,10 +1,7 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<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>ts/2048-qt_zh_CN.qm</file>
<file>ts/2048-qt_ru_RU.qm</file>
<file>qml/main.qml</file> <file>qml/main.qml</file>
<file>qml/2048.js</file> <file>qml/2048.js</file>
<file>qml/Tile.qml</file> <file>qml/Tile.qml</file>

BIN
ts/2048-qt_de_DE.qm
View File

Binary file not shown.

136
ts/2048-qt_de_DE.ts
View File

@ -1,136 +0,0 @@
<?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>

BIN
ts/2048-qt_fr_FR.qm
View File

Binary file not shown.

128
ts/2048-qt_fr_FR.ts
View File

@ -1,128 +0,0 @@
<?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>

BIN
ts/2048-qt_pl_PL.qm
View File

Binary file not shown.

145
ts/2048-qt_pl_PL.ts
View File

@ -1,145 +0,0 @@
<?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>