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

solved conflict

Browse Source
master
Qiaoyong Zhong 9 years ago
parent 09ecd4b0dd 65529ddcc5
commit ea36df513d
5 changed files with 150 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
2048-qt.pro
Unescape View File

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

12
qml/main.qml
Unescape View File

@ -138,6 +138,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();
}
}
}
}
}

1
resources.qrc
Unescape View File

@ -3,6 +3,7 @@
<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_de_DE.qm</file>
<file>qml/main.qml</file>
<file>qml/2048.js</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
Unescape View File

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