git repos / blockattack-game

commit 96c54803

sago007 · 2016-02-06 18:34
96c54803c60eef19506ee91912844d54339325ab patch · browse files
parent 7441aba798e58bfdaf3fb2289251a600a4c2ee7a 

Updated the translation files a bit

Changed files

M source/code/main.cpp before
M source/code/menudef.cpp before
M source/misc/translation/po/da_DK.po before
M source/misc/translation/template/blockattack_roftb.pot before
diff --git a/source/code/main.cpp b/source/code/main.cpp index 401aefb..e1adc29 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp
@@ -791,7 +791,7 @@ public:
}
if (puzzleMode&&(!bGameOver)) {
//We need to write nr. of moves left!
- strHolder = "Moves left: " + itoa(MovesLeft);
+ strHolder = _("Moves left: ") + itoa(MovesLeft);
nf_standard_blue_font.draw(screen, topx+5, topy+5, "%s",strHolder.c_str());
}
@@ -1655,19 +1655,16 @@ int PuzzleLevelSelect(int Type) {
}
if (Type == 1) {
- string scoreString = _("Best score: 0");
- string timeString = _("Time used: -- : --");
-
- if (GetStageScores(selected)>0) {
- scoreString = _("Best score: ")+itoa(GetStageScores(selected));
- }
+ string scoreString = SPrintStringF(_("Best score: %i"), GetStageScores(selected)) ;
+ string timeString = SPrintStringF(_("Time used: %s"),"-- : --");
+
if (GetStageTime(selected)>0) {
- timeString = _("Time used: ")+itoa(GetStageTime(selected)/1000/60)+" : "+itoa2((GetStageTime(selected)/1000)%60);
+ timeString = SPrintStringF(_("Time used: %s"), string(itoa(GetStageTime(selected)/1000/60)+" : "+itoa2((GetStageTime(selected)/1000)%60)).c_str() );
}
NFont_Write(screen, 200,200,scoreString.c_str());
NFont_Write(screen, 200,250,timeString.c_str());
- string totalString = (boost::format("Total score: %1% in %2%:%3%")%totalScore%(totalTime/1000/60)%((totalTime/1000)%60)).str(); //"Total score: " +itoa(totalScore) + " in " + itoa(totalTime/1000/60) + " : " + itoa2((totalTime/1000)%60);
+ string totalString = (boost::format(_("Total score: %1% in %2%:%3%"))%totalScore%(totalTime/1000/60)%((totalTime/1000)%60)).str(); //"Total score: " +itoa(totalScore) + " in " + itoa(totalTime/1000/60) + " : " + itoa2((totalTime/1000)%60);
NFont_Write(screen, 200,600,totalString.c_str());
}
@@ -1918,8 +1915,8 @@ int main(int argc, const char* argv[]) {
player1keys=0;
player2keys=2;
- player1name = "Player 1";
- player2name = "Player 2";
+ player1name = _("Player 1");
+ player2name = _("Player 2");
Config* configSettings = Config::getInstance();
//configSettings->setString("aNumber"," A string");
diff --git a/source/code/menudef.cpp b/source/code/menudef.cpp index 2d7cf7b..111d241 100644 --- a/source/code/menudef.cpp +++ b/source/code/menudef.cpp
@@ -130,7 +130,7 @@ static void runTwoPlayerVs(Button* b) {
static void buttonActionMusic(Button* b) {
MusicEnabled = !MusicEnabled;
- b->setLabel(MusicEnabled? "Music: On" : "Music: Off");
+ b->setLabel(MusicEnabled? _("Music: On") : _("Music: Off"));
}
static void buttonActionSound(Button* b) {
diff --git a/source/misc/translation/po/da_DK.po b/source/misc/translation/po/da_DK.po index c79dbcc..27e1d3f 100644 --- a/source/misc/translation/po/da_DK.po +++ b/source/misc/translation/po/da_DK.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-06 15:20+0100\n"
-"PO-Revision-Date: 2016-02-06 15:34+0100\n"
+"POT-Creation-Date: 2016-02-06 19:23+0100\n"
+"PO-Revision-Date: 2016-02-06 19:23+0100\n"
+"Last-Translator: \n"
"Language-Team: \n"
+"Language: da_DK\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.4\n"
-"Last-Translator: \n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: da_DK\n"
#: ../../code/main.cpp:782
msgid "Score:"
@@ -34,6 +34,10 @@ msgstr "Kæde:"
msgid "Speed:"
msgstr "Hastighed:"
+#: ../../code/main.cpp:794
+msgid "Moves left: "
+msgstr "Træk tilbage: "
+
#: ../../code/main.cpp:800 ../../code/main.cpp:818
msgid "Retry"
msgstr "Forsøg igen"
@@ -48,7 +52,7 @@ msgstr "Spring over"
#: ../../code/main.cpp:998
msgid "Endless:"
-msgstr ""
+msgstr "Endless:"
#: ../../code/main.cpp:1001
msgid "Time Trial:"
@@ -134,7 +138,7 @@ msgstr "Se hvor mange point du kan opnå på 2 minutter"
#: ../../code/main.cpp:1404
msgid "Stage Clear"
-msgstr ""
+msgstr "Stage Clear"
#: ../../code/main.cpp:1405
msgid "You must clear a number of lines. Speed is rapidly increased."
@@ -150,7 +154,7 @@ msgstr "Fjern alle blokke med et begrænset antal flyt"
#: ../../code/main.cpp:1412
msgid "Endless"
-msgstr ""
+msgstr "Endless"
#: ../../code/main.cpp:1413
msgid "Score as much as possible. No time limit."
@@ -185,49 +189,34 @@ msgid "Stage Clear Level Select"
msgstr "Vælg Stage Clear bane"
#: ../../code/main.cpp:1658
-msgid "Best score: 0"
-msgstr "Bedste resultat: 0"
-
-#: ../../code/main.cpp:1659
-msgid "Time used: -- : --"
-msgstr "Tid brugt: -- : --"
-
-#: ../../code/main.cpp:1662
-msgid "Best score: "
-msgstr "Bedste resultat:"
-
-#: ../../code/main.cpp:1665
-msgid "Time used: "
-msgstr "Tid brugt:"
+#, c-format
+msgid "Best score: %i"
+msgstr "Bedste score: %i"
-#: ../../code/main.cpp:1809
-msgid "Displays this message"
-msgstr "Vis denne besked"
+#: ../../code/main.cpp:1659 ../../code/main.cpp:1662
+#, c-format
+msgid "Time used: %s"
+msgstr "Tid brugt: %s"
-#: ../../code/main.cpp:1810
-msgid "Disables the sound. Can be used if sound errors prevents you from starting"
-msgstr "Slå lyden fra. Kan bruges hvis lyd fejl forhindre programmet i at starte."
+#: ../../code/main.cpp:1667
+msgid "Total score: %1% in %2%:%3%"
+msgstr "Sammenlagt score: %1% på %2%:%3%"
-#: ../../code/main.cpp:1811
-msgid "Causes the game to not sleep between frames."
-msgstr "Programmet vil ikke sove mellem frames"
+#: ../../code/main.cpp:1918
+msgid "Player 1"
+msgstr "Spiller 1"
-#: ../../code/main.cpp:1812
-msgid "Enables basic verbose messages"
-msgstr "Slår basale beskeder til"
+#: ../../code/main.cpp:1919
+msgid "Player 2"
+msgstr "Spiller 2"
-#: ../../code/main.cpp:1813
-msgid "Prints the search path and quits"
-msgstr "Viser alle søge stiger og afslutter derefter"
+#: ../../code/menudef.cpp:133 ../../code/menudef.cpp:192
+msgid "Music: On"
+msgstr "Musik: Til"
-#: ../../code/main.cpp:1826
-#, c-format
-msgid ""
-"Block Attack - Rise of the blocks %s\n"
-"%s\n"
-msgstr ""
-"Block Attack - Rise of the blocks %s\n"
-"%s\n"
+#: ../../code/menudef.cpp:133 ../../code/menudef.cpp:192
+msgid "Music: Off"
+msgstr "Musik: Fra"
#: ../../code/menudef.cpp:138 ../../code/menudef.cpp:194
msgid "Sound: On"
@@ -277,105 +266,97 @@ msgstr "Skift"
msgid "Configuration"
msgstr "Konfiguration"
-#: ../../code/menudef.cpp:192
-msgid "Music: On"
-msgstr "Musik: Til"
-
-#: ../../code/menudef.cpp:192
-msgid "Music: Off"
-msgstr "Musik: Fra"
-
#: ../../code/menudef.cpp:199
msgid "Change player 1's name"
-msgstr ""
+msgstr "Skift navn på spiller 1"
#: ../../code/menudef.cpp:201
msgid "Change player 2's name"
-msgstr ""
+msgstr "Skift navn på spiller 2"
#: ../../code/menudef.cpp:203
msgid "Change player 1's keys"
-msgstr ""
+msgstr "Tildel taster til spiller 1"
#: ../../code/menudef.cpp:205
msgid "Change player 2's keys"
-msgstr ""
+msgstr "Tildel taster til spiller 2"
#: ../../code/menudef.cpp:217
msgid "Single player VS"
-msgstr ""
+msgstr "En spiller - VS"
#: ../../code/menudef.cpp:240
msgid "Very easy"
-msgstr ""
+msgstr "Meget let"
#: ../../code/menudef.cpp:241
msgid "Easy"
-msgstr ""
+msgstr "Let"
#: ../../code/menudef.cpp:242
msgid "Below normal"
-msgstr ""
+msgstr "Under normal"
#: ../../code/menudef.cpp:243
msgid "Normal"
-msgstr ""
+msgstr "Normal"
#: ../../code/menudef.cpp:244
msgid "Above normal"
-msgstr ""
+msgstr "Over normal"
#: ../../code/menudef.cpp:245
msgid "Hard"
-msgstr ""
+msgstr "Svær"
#: ../../code/menudef.cpp:246
msgid "Hardest"
-msgstr ""
+msgstr "Meget svær"
#: ../../code/menudef.cpp:258
msgid "Multiplayer"
-msgstr ""
+msgstr "Flerspiller"
#: ../../code/menudef.cpp:260
msgid "Two player - time trial"
-msgstr ""
+msgstr "To spiller - Time Trial"
#: ../../code/menudef.cpp:262
msgid "Two player - vs"
-msgstr ""
+msgstr "To spiller - VS"
#: ../../code/menudef.cpp:271
msgid "Block Attack - Rise of the blocks"
-msgstr ""
+msgstr "Block Attack - Rise of the blocks"
#: ../../code/menudef.cpp:273
msgid "Single player - endless"
-msgstr ""
+msgstr "En spiller - Endless"
#: ../../code/menudef.cpp:275
msgid "Single player - time trial"
-msgstr ""
+msgstr "En spiller - Time Trial"
#: ../../code/menudef.cpp:277
msgid "Single player - stage clear"
-msgstr ""
+msgstr "En spiller - Stage Clear"
#: ../../code/menudef.cpp:279
msgid "Single player - puzzle mode"
-msgstr ""
+msgstr "En spiller - Gåde"
#: ../../code/menudef.cpp:281
msgid "Single player - vs"
-msgstr ""
+msgstr "En spiller - VS"
#: ../../code/menudef.cpp:283
msgid "Multi player"
-msgstr ""
+msgstr "Flerspiller"
#: ../../code/menudef.cpp:285
msgid "Configure"
-msgstr ""
+msgstr "Instillinger"
#: ../../code/menudef.cpp:287
msgid "Highscores"
@@ -384,3 +365,37 @@ msgstr "Bedste resultater"
#: ../../code/MenuSystem.cpp:180 ../../code/MenuSystem.cpp:193
msgid "Exit"
msgstr "Afslut"
+
+#~ msgid "Best score: 0"
+#~ msgstr "Bedste resultat: 0"
+
+#~ msgid "Time used: "
+#~ msgstr "Tid brugt:"
+
+#~ msgid "Best score: "
+#~ msgstr "Bedste resultat:"
+
+#~ msgid "Time used: -- : --"
+#~ msgstr "Tid brugt: -- : --"
+
+#~ msgid "Displays this message"
+#~ msgstr "Vis denne besked"
+
+#~ msgid "Disables the sound. Can be used if sound errors prevents you from starting"
+#~ msgstr "Slå lyden fra. Kan bruges hvis lyd fejl forhindre programmet i at starte."
+
+#~ msgid "Causes the game to not sleep between frames."
+#~ msgstr "Programmet vil ikke sove mellem frames"
+
+#~ msgid "Enables basic verbose messages"
+#~ msgstr "Slår basale beskeder til"
+
+#~ msgid "Prints the search path and quits"
+#~ msgstr "Viser alle søge stiger og afslutter derefter"
+
+#~ msgid ""
+#~ "Block Attack - Rise of the blocks %s\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Block Attack - Rise of the blocks %s\n"
+#~ "%s\n"
diff --git a/source/misc/translation/template/blockattack_roftb.pot b/source/misc/translation/template/blockattack_roftb.pot index 7711e02..06fa11d 100644 --- a/source/misc/translation/template/blockattack_roftb.pot +++ b/source/misc/translation/template/blockattack_roftb.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-06 16:05+0100\n"
+"POT-Creation-Date: 2016-02-06 19:23+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,6 +33,10 @@ msgstr ""
msgid "Speed:"
msgstr ""
+#: ../../code/main.cpp:794
+msgid "Moves left: "
+msgstr ""
+
#: ../../code/main.cpp:800 ../../code/main.cpp:818
msgid "Retry"
msgstr ""
@@ -184,19 +188,33 @@ msgid "Stage Clear Level Select"
msgstr ""
#: ../../code/main.cpp:1658
-msgid "Best score: 0"
+#, c-format
+msgid "Best score: %i"
+msgstr ""
+
+#: ../../code/main.cpp:1659 ../../code/main.cpp:1662
+#, c-format
+msgid "Time used: %s"
+msgstr ""
+
+#: ../../code/main.cpp:1667
+msgid "Total score: %1% in %2%:%3%"
+msgstr ""
+
+#: ../../code/main.cpp:1918
+msgid "Player 1"
msgstr ""
-#: ../../code/main.cpp:1659
-msgid "Time used: -- : --"
+#: ../../code/main.cpp:1919
+msgid "Player 2"
msgstr ""
-#: ../../code/main.cpp:1662
-msgid "Best score: "
+#: ../../code/menudef.cpp:133 ../../code/menudef.cpp:192
+msgid "Music: On"
msgstr ""
-#: ../../code/main.cpp:1665
-msgid "Time used: "
+#: ../../code/menudef.cpp:133 ../../code/menudef.cpp:192
+msgid "Music: Off"
msgstr ""
#: ../../code/menudef.cpp:138 ../../code/menudef.cpp:194
@@ -247,14 +265,6 @@ msgstr ""
msgid "Configuration"
msgstr ""
-#: ../../code/menudef.cpp:192
-msgid "Music: On"
-msgstr ""
-
-#: ../../code/menudef.cpp:192
-msgid "Music: Off"
-msgstr ""
-
#: ../../code/menudef.cpp:199
msgid "Change player 1's name"
msgstr ""