Merge branch 'enedil-master'

master
Qiaoyong Zhong 9 years ago
commit 09ecd4b0dd

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

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

@ -113,6 +113,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 { MenuItem {
text: "Русский" text: "Русский"
checkable: true checkable: true

@ -1,6 +1,7 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>ts/2048-qt_zh_CN.qm</file> <file>ts/2048-qt_zh_CN.qm</file>
<file>ts/2048-qt_pl_PL.qm</file>
<file>ts/2048-qt_ru_RU.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>

Binary file not shown.

@ -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>
Loading…
Cancel
Save