From e493399e99a65b993905959bb146476041c05b28 Mon Sep 17 00:00:00 2001 From: Christoph Sommer Date: Wed, 19 Apr 2006 23:04:03 +0000 Subject: [PATCH] Hardcoded Secretarea Text / Improved Translation (DE) SVN-Revision: 3373 --- data/levels/world1/de.po | 402 +++++++++------ data/locale/de.po | 764 +++++++++-------------------- src/control/joystickkeyboardcontroller.cpp | 4 +- src/statistics.cpp | 16 +- src/trigger/secretarea_trigger.cpp | 25 +- src/trigger/secretarea_trigger.hpp | 1 - 6 files changed, 508 insertions(+), 704 deletions(-) diff --git a/data/levels/world1/de.po b/data/levels/world1/de.po index 271d7b0d1..a92f6423d 100644 --- a/data/levels/world1/de.po +++ b/data/levels/world1/de.po @@ -8,15 +8,143 @@ msgstr "" "Project-Id-Version: world 1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-12-06 10:10+0100\n" -"PO-Revision-Date: 2005-11-03 13:44+0100\n" -"Last-Translator: Ondřej HoÅ¡ek \n" +"PO-Revision-Date: 2006-04-18 08:00+0100\n" +"Last-Translator: Christoph Sommer \n" "Language-Team: German \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: German\n" +"X-Poedit-Country: GERMANY\n" +"X-Poedit-SourceCharset: iso-8859-1\n" +"X-Poedit-Basepath: ../../../\n" +"X-Poedit-SearchPath-0: data/levels/world1\n" -#: basest/levels/world1/intro.txt:5 +#: data/levels/world1/worldmap.stwm:3 +msgid "Icyisland" +msgstr "Eisinsel" + +#: data/levels/world1/worldmap.stwm:179 +msgid "You found a secret area!" +msgstr "Neues Versteck gefunden!" + +#: data/levels/world1/extro.txt:6 +msgid "" +"-Entering Nolok's Throne Room!\n" +"\n" +"#Tux ran into Nolok's throne room,\n" +"#frantically searching for his beloved.\n" +"#Alas, he found neither Penny nor Nolok\n" +"#there, but instead, another note.\n" +"\n" +"#\"Well done, Tux, well done. If you are\n" +"#reading this, you have removed my\n" +"#control over this icy fortress. But as\n" +"#you can see, your beloved Penny is not\n" +"#here. What you did not realize is that\n" +"#this is just one of my many fortresses,\n" +"#spread far across the lands!\n" +"\n" +"#\"Tux, your ambition is most honorable,\n" +"#but futile nonetheless. With every\n" +"#fortress you conquer of mine, I will\n" +"#escape to another, and take Penny with\n" +"#me. Do not be silly... it is best that\n" +"#you give up now.\"\n" +"\n" +"#Tux was sadly leaving the room, when he\n" +"#felt something beneath his foot... an\n" +"#envelope, addressed to him! Inside was\n" +"#a roughly sketched map with fortresses\n" +"#drawn in various lands. On the corner\n" +"#of the map was Penny's signature, a\n" +"#drawing of the ice flower.\n" +"\n" +"#Tux ran out of the fortress, map in\n" +"#hand. No, he decided, he would not give\n" +"#up. Penny was counting on him." +msgstr "" +"-In Noloks Thronsaal\n" +"\n" +"#Tux betrat Noloks Thronsaal und suchte\n" +"#verzweifelt nach seiner Geliebten. Leider\n" +"#konnte er weder Penny noch Nolok dort\n" +"#entdecken, stattdessen fand er eine\n" +"#weitere Nachricht:\n" +"\n" +"#\"Gut gemacht mein lieber Tux, sehr gut.\n" +"#Wenn du dies hier liest, hast du diese\n" +"#eisige Festung von mir befreit. Aber wie\n" +"#du siehst ist deine geliebte Penny nicht\n" +"#hier. Hast du nicht gemerkt, dass dies\n" +"#nur eine meiner vielen Festungen ist,\n" +"#die über die ganze Welt verteilt sind!\n" +"\n" +"#\"Tux, dein Bestreben ist ehrenwert, und\n" +"#dennoch vergeblich. Mit jeder meiner\n" +"#Festungen die du eroberst, werde ich zu\n" +"#einer weiteren fliehen. Sei nicht dumm,\n" +"#es wäre das beste jetzt aufzugeben.\n" +"\n" +"#Tux verließ traurig den Saal, als etwas\n" +"#unter seinem Fuss raschelte...\n" +"#Ein Briefumschlag mit seinem Namen!\n" +"#In dem Umschlag war eine grobe Karte,\n" +"#die Festungen in verschiedenen Ländern\n" +"#zeigte. Auf der Rückseite der Karte war\n" +"#Pennys Zeichen, das Bild einer Eisblume.\n" +"\n" +"#Tux nahm die Karte in die Hand und rannte\n" +"#aus der Festung. Nein, er würde nicht\n" +"#einfach aufgeben. Penny verließ sich auf\n" +"#ihn." + +#: data/levels/world1/18 - Ice in the Hole.stl:4 +msgid "Ice in the Hole" +msgstr "Eis frei!" + +#: data/levels/world1/23 - The Escape.stl:5 +msgid "The Escape" +msgstr "Die Flucht" + +#: data/levels/world1/15 - Under the Ice.stl:4 +msgid "Under the Ice" +msgstr "Unter dem Eis" + +#: data/levels/world1/07 - Oh No More Snowballs.stl:5 +msgid "Oh no! More Snowballs!" +msgstr "Oh Nein! Noch mehr Schneebälle!" + +#: data/levels/world1/17 - Or is it just me.stl:4 +msgid "'...or is it just me?'" +msgstr "'... oder bin ich das?'" + +#: data/levels/world1/27 - No More Mr Ice Guy.stl:4 +msgid "No More Mr Ice Guy" +msgstr "Schluss mit frostig" + +#: data/levels/world1/13 - Above the Arctic Skies.stl:6 +msgid "Above the Arctic Skies" +msgstr "Über den Wolken" + +#: data/levels/world1/20 - End of the Tunnel.stl:4 +msgid "End of the Tunnel" +msgstr "Licht am Ende des Tunnels" + +#: data/levels/world1/02 - The Journey Begins.stl:5 +msgid "The Journey Begins" +msgstr "Eine Reise beginnt" + +#: data/levels/world1/04 - Tobgle Road.stl:5 +msgid "Tobgle Road" +msgstr "Der Weg des Tobgle" + +#: data/levels/world1/intro.stl:4 +msgid "Picnic With Penny" +msgstr "Picknick mit Penny" + +#: data/levels/world1/intro.txt:5 msgid "" "-Penny gets captured!\n" "\n" @@ -42,18 +170,18 @@ msgid "" msgstr "" "-Penny ist verschwunden!\n" "\n" -"#Tux und Penny saßen gemütlich beim Picknick\n" +"#Tux und Penny saßen gemütlich beim Picknick\n" "#in den eisigen Ebenen der Antarktis.\n" -"#Plötzlich sprang eine dunkle Kreatur hinter\n" +"#Plötzlich sprang eine dunkle Kreatur hinter\n" "#einem Felsen hervor. Tux sah einen grellen\n" -"#Blitz, dann wurde er ohnmächtig.\n" +"#Blitz, dann wurde er ohnmächtig.\n" "\n" "#Als er aufwachte bemerkte er, dass Penny\n" "#verschwunden war. Wo sie eben noch gesessen\n" "#hatte lag jetzt ein Zettel:\n" "\n" "#\"Tux, mein Erzfeind!\n" -"#Ich habe deine Freundinn Penny entführt und\n" +"#Ich habe deine Freundinn Penny entführt und\n" "#halte sie in meiner Festung gefangen. Den Weg\n" "#dorthin bewachen meine finsteren Kreaturen!\n" "#Versuche gar nicht erst sie zu retten, du\n" @@ -63,182 +191,138 @@ msgstr "" "#der Ferne. Fest entschlossen seine geliebte\n" "#Penny zu retten machte er sich auf den Weg." -#: basest/levels/world1/worldmap.stwm:4 -msgid "Icyisland" -msgstr "Eisige Insel" - -#: basest/levels/world1/level10.stl:5 -msgid "23rd Airborne" -msgstr "23 Mann Luftverteidigung" +#: data/levels/world1/25 - Arctic Ruins.stl:6 +msgid "Arctic Ruins" +msgstr "Arktische Ruinen" -#: basest/levels/world1/level11.stl:5 +#: data/levels/world1/11 - Night Chill.stl:5 msgid "Night Chill" -msgstr "Kalte Nacht" - -#: basest/levels/world1/level12.stl:5 -msgid "Into the Stars" -msgstr "Zu den Sternen" - -#: basest/levels/world1/level13.stl:5 -msgid "Above the Arctic Skies" -msgstr "Über den Wolken" - -#: basest/levels/world1/level14.stl:5 -msgid "Entrance to the Cave" -msgstr "Höhleneingang" - -#: basest/levels/world1/level15.stl:5 -msgid "Under the Ice" -msgstr "Unter dem Eis" - -#: basest/levels/world1/level16.stl:5 -msgid "Living in a Fridge" -msgstr "Leben im Kühlschrank" +msgstr "Nachtfrost" -#: basest/levels/world1/level17.stl:5 -msgid "'...or is it just me?'" -msgstr "'... oder bin ich das?'" +#: data/levels/world1/03 - Via Nostalgica.stl:5 +msgid "Via Nostalgica" +msgstr "Via Nostalgica" -#: basest/levels/world1/level18.stl:5 -msgid "Ice in the Hole" -msgstr "Eisloch" +#: data/levels/world1/08 - Stone Cold.stl:3 +msgid "Stone Cold" +msgstr "Eiskalt" -#: basest/levels/world1/level19.stl:5 -msgid "Miyamoto Monument" -msgstr "Miyamoto Monument" +#: data/levels/world1/10 - 23rd Airborne.stl:5 +msgid "23rd Airborne" +msgstr "23. Luftlandedivision" -#: basest/levels/world1/level20.stl:5 -msgid "End of the Tunnel" -msgstr "Licht am Ende des Tunnels" +#: data/levels/world1/22 - A Mysterious House of Ice.stl:4 +msgid "A Mysterious House of Ice" +msgstr "Das rätselhafte Eishaus" -#: basest/levels/world1/level21.stl:5 +#: data/levels/world1/21 - A Path in the Clouds.stl:3 msgid "A Path in the Clouds" msgstr "Ein Pfad durch die Wolken" -#: basest/levels/world1/level22.stl:5 -msgid "No more Mr Ice Guy" -msgstr "Genug Eisjungs" - -#: basest/levels/world1/level23.stl:5 -msgid "The Escape" -msgstr "Die Flucht" - -#: basest/levels/world1/level24.stl:5 +#: data/levels/world1/24 - The Shattered Bridge.stl:4 msgid "The Shattered Bridge" -msgstr "Die zertrümmerte Brücke" - -#: basest/levels/world1/level25.stl:5 -msgid "Arctic Ruins" -msgstr "arktische Ruinen" - -#: basest/levels/world1/level26.stl:5 -msgid "The Castle of Nolok" -msgstr "Noloks Festung" - -#: basest/levels/world1/level1.stl:5 -msgid "Welcome to Antarctica" -msgstr "Willkommen in Antarktika" +msgstr "Die zertrümmerte Brücke" -#: basest/levels/world1/level2.stl:5 -msgid "The Journey Begins" -msgstr "Die Reise Beginnt" - -#: basest/levels/world1/level3.stl:5 -msgid "Via Nostalgica" -msgstr "Nostalgiestraße" - -#: basest/levels/world1/level4.stl:5 -msgid "Tobgle Road" -msgstr "Tobgle Weg" +#: data/levels/world1/06 - The Frosted Fields.stl:5 +msgid "The Frosted Fields" +msgstr "Eisige Felder" -#: basest/levels/world1/level5.stl:5 +#: data/levels/world1/05 - The Somewhat Smaller Bath.stl:5 msgid "The Somewhat Smaller Bath" -msgstr "Der etwas schmallere Weg" +msgstr "Mini-Bad" -#: basest/levels/world1/level6.stl:5 -msgid "The Frosted Fields" -msgstr "Eisige Felder" +#: data/levels/world1/14 - Entrance to the Cave.stl:4 +msgid "Entrance to the Cave" +msgstr "Höhleneingang" -#: basest/levels/world1/level7.stl:5 -msgid "Oh no! More Snowballs!" -msgstr "Oh Nein! Noch mehr Schneebälle!" +#: data/levels/world1/16 - Living in a Fridge.stl:4 +msgid "Living in a Fridge" +msgstr "Leben im Kühlschrank" -#: basest/levels/world1/level8.stl:5 -msgid "Stone Cold" -msgstr "Steinkalt" +#: data/levels/world1/26 - The Castle of Nolok.stl:4 +msgid "The Castle of Nolok" +msgstr "Noloks Schloss" -#: basest/levels/world1/level9.stl:5 +#: data/levels/world1/09 - Grumbels Sense of Snow.stl:5 msgid "Grumbel's Sense of Snow" -msgstr "Grumbels Gespür für Schnee" +msgstr "Grumbels Gespür für Schnee" + +#: data/levels/world1/01 - Welcome to Antarctica.stl:5 +msgid "Welcome to Antarctica" +msgstr "Willkommen in der Antarktis" -#: basest/levels/world1/extro.txt:7 +#: data/levels/world1/01 - Welcome to Antarctica.stl:110 msgid "" -"-Entering Nolok's Throne Room!\n" -"\n" -"#Tux ran into Nolok's throne room,\n" -"#frantically searching for his beloved.\n" -"#Alas, he found neither Penny nor Nolok\n" -"#there, but instead, another note.\n" -"\n" -"#\"Well done, Tux, well done. If you are\n" -"#reading this, you have removed my\n" -"#control over this icy fortress. But as\n" -"#you can see, your beloved Penny is not\n" -"#here. What you did not realize is that\n" -"#this is just one of my many fortresses,\n" -"#spread far across the lands!\n" -"\n" -"#\"Tux, your ambition is most honorable,\n" -"#but futile nonetheless. With every\n" -"#fortress you conquer of mine, I will\n" -"#escape to another, and take Penny with\n" -"#me. Do not be silly... it is best that\n" -"#you give up now.\"\n" -"\n" -"#Tux was sadly leaving the room, when he\n" -"#felt something beneath his foot... an\n" -"#envelope, addressed to him! Inside was\n" -"#a roughly sketched map with fortresses\n" -"#drawn in various lands. On the corner\n" -"#of the map was Penny's signature, a\n" -"#drawing of the ice flower.\n" +"-Information blocks:\n" +"!images/objects/bonus_block/info_block.png\n" +"#Information blocks often\n" +"#contain useful tips.\n" "\n" -"#Tux ran out of the fortress, map in\n" -"#hand. No, he decided, he would not give\n" -"#up. Penny was counting on him." +"#As you have already\n" +"#found out, they can be\n" +"#activated by hitting\n" +"#them from the bottom.\n" +"#Most blocks are\n" +"#activated this way." msgstr "" -"-In Noloks Thronsaal\n" -"\n" -"#Tux betrat Noloks Thronsaal und suchte\n" -"#verzweifelt nach seiner Geliebten. Leider\n" -"#konnte er weder Penny noch Nolok dort\n" -"#entdecken, stattdessen fand er eine\n" -"#weitere Nachricht:\n" + +#: data/levels/world1/01 - Welcome to Antarctica.stl:124 +msgid "" +"-Items:\n" +"!images/powerups/egg/egg.png\n" +"#The egg makes Tux grow\n" +"#larger.\n" "\n" -"#\"Gut gemacht mein lieber Tux, sehr gut.\n" -"#Wenn du dies hier liest, hast du diese\n" -"#eisige Festung von mir befreit. Aber wie\n" -"#du siehst ist deine geliebte Penny nicht\n" -"#hier. Hast du nicht gemerkt, dass dies\n" -"#nur eine meiner vielen Festungen ist,\n" -"#die über die ganze Welt verteilt sind!\n" +"!images/powerups/fireflower/fire_flower-0.png\n" +"#The fire flower gives\n" +"#Tux the ability to\n" +"#shoot fireballs.\n" "\n" -"#\"Tux, dein Bestreben ist ehrenwert, und\n" -"#dennoch vergeblich. Mit jeder meiner\n" -"#Festungen die du eroberst, werde ich zu\n" -"#einer weiteren fliehen. Sei nicht dumm,\n" -"#es wäre das beste jetzt aufzugeben.\n" +"!images/objects/coin/coin-0.png\n" +"#You should collect as\n" +"#many coins as possible.\n" +"#Once you have a hundred,\n" +"#they are traded for an\n" +"#additional life.\n" "\n" -"#Tux verließ traurig den Saal, als etwas\n" -"#unter seinem Fuss raschelte...\n" -"#Ein Briefumschlag mit seinem Namen!\n" -"#In dem Umschlag war eine grobe Karte,\n" -"#die Festungen in verschiedenen Ländern\n" -"#zeigte. Auf der Rückseite der Karte war\n" -"#Pennys Zeichen, das Bild einer Eisblume.\n" +"!images/powerups/1up/1up.png\n" +"#The penguin gives Tux an\n" +"#additional life.\n" "\n" -"#Tux nahm die Karte in die Hand und rannte\n" -"#aus der Festung. Nein, er würde nicht\n" -"#einfach aufgeben. Penny verließ sich auf\n" -"#ihn." +"!images/objects/bonus_block/full-0.png\n" +"#Bonus blocks can contain\n" +"#coins, eggs, fire flowers\n" +"#or lives." +msgstr "" + +#: data/levels/world1/01 - Welcome to Antarctica.stl:152 +msgid "" +"-Fireflies:\n" +"!images/objects/firefly/firefly1.png\n" +"#Activate the firefly\n" +"#and as long as you\n" +"#have coins left,\n" +"#you will restart\n" +"#under it if you die." +msgstr "" + +#: data/levels/world1/01 - Welcome to Antarctica.stl:162 +msgid "" +"!images/tiles/signs/run.png\n" +"#The path in front of you\n" +"#is blocked. You'll have\n" +"#to run before jumping\n" +"#over the blocks. Use your\n" +"#Run key (set to Control\n" +"#by default) to gain\n" +"#speed." +msgstr "" + +#: data/levels/world1/12 - Into the Stars.stl:3 +msgid "Into the Stars" +msgstr "Auf zu den Sternen" + +#: data/levels/world1/19 - Miyamoto Monument.stl:4 +msgid "Miyamoto Monument" +msgstr "Das Miyamoto-Monument" diff --git a/data/locale/de.po b/data/locale/de.po index 8beef1ca5..07f02e0ef 100644 --- a/data/locale/de.po +++ b/data/locale/de.po @@ -6,624 +6,348 @@ # msgid "" msgstr "" -"Project-Id-Version: SuperTux 0.1.1\n" +"Project-Id-Version: SuperTux 0.2-svn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-12-15 17:21+0100\n" -"PO-Revision-Date: 2004-12-06 18:26+0100\n" -"Last-Translator: Matze Braun \n" +"PO-Revision-Date: 2006-04-18 08:06+0100\n" +"Last-Translator: Christoph Sommer \n" "Language-Team: German \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" - -#: lib/app/setup.cpp:798 +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Poedit-Language: German\n" +"X-Poedit-Country: GERMANY\n" +"X-Poedit-SourceCharset: iso-8859-1\n" +"X-Poedit-Basepath: ../../\n" +"X-Poedit-KeywordsList: draw_text;draw_center_text;_\n" +"X-Poedit-SearchPath-0: src\n" + +#: src/main.cpp:199 #, c-format msgid "" -"Usage: %s [OPTIONS] FILENAME\n" +"Usage: %s [OPTIONS] [LEVELFILE]\n" "\n" msgstr "" -"Aufruf: %s [OPTIONS] FILENAME\n" +"Aufruf: %s [OPTIONS] [LEVELDATEI]\n" "\n" -#: lib/app/setup.cpp:799 +#: src/main.cpp:201 +#, c-format msgid "" -"Display Options:\n" -" -f, --fullscreen Run in fullscreen mode.\n" -" -w, --window Run in window mode.\n" -" --opengl If OpenGL support was compiled in, this will tell\n" -" SuperTux to make use of it.\n" -" --sdl Use the SDL software graphical renderer\n" -"\n" -"Sound Options:\n" -" --disable-sound If sound support was compiled in, this will\n" -" disable sound for this session of the game.\n" -" --disable-music Like above, but this will disable music.\n" -"\n" -"Misc Options:\n" -" -j, --joystick NUM Use joystick NUM (default: 0)\n" -" --joymap XAXIS:YAXIS:A:B:START\n" -" Define how joystick buttons and axis should be mapped\n" -" --leveleditor Opens the leveleditor in a file.\n" -" --worldmap Opens the specified worldmap file.\n" -" --flip-levels Flip levels upside-down.\n" -" -d, --datadir DIR Load Game data from DIR (default: automatic)\n" -" --debug Enables the debug mode, which is useful for " -"developers.\n" -" --help Display a help message summarizing command-line\n" -" options, license and game controls.\n" -" --usage Display a brief message summarizing command-line " -"options.\n" -" --version Display the version of SuperTux you're running.\n" +"Options:\n" +" -f, --fullscreen Run in fullscreen mode\n" +" -w, --window Run in window mode\n" +" -g, --geometry WIDTHxHEIGHT Run SuperTux in given resolution\n" +" --disable-sfx Disable sound effects\n" +" --disable-music Disable music\n" +" --help Show this help message\n" +" --version Display SuperTux version and quit\n" +" --show-fps Display framerate in levels\n" +" --record-demo FILE LEVEL Record a demo to FILE\n" +" --play-demo FILE LEVEL Play a recorded demo\n" "\n" msgstr "" -"Display Options:\n" -" -f, --fullscreen Im Vollbildmodus starten\n" -" -w, --window Im Fenstermodus starten\n" -" --opengl OpenGL benutzen\n" -" --sdl SDL Software renderer benutzen\n" +"Optionen:\n" +" -f, --fullscreen Vollbild-Modus\n" +" -w, --window Fenster-Modus\n" +" -g, --geometry WIDTHxHEIGHT SuperTux mit gewünschter Auflösung starten\n" +" --disable-sfx Sound deaktivieren\n" +" --disable-music Musik deaktivieren\n" +" --help Diesen Hilfetext anzeigen\n" +" --version SuperTux Version anzeigen und beenden\n" +" --show-fps FPS anzeigen\n" +" --record-demo FILE LEVEL Demo in Datei FILE aufzeichnen\n" +" --play-demo FILE LEVEL Demo aus Datei FILE abspielen\n" "\n" -"Sound Options:\n" -" --disable-sound Sound deaktivieren\n" -" --disable-music Musik deaktivieren\n" -"\n" -"Misc Options:\n" -" -j, --joystick NUM Joystick NUM benutzen (default: 0)\n" -" --joymap XAXIS:YAXIS:A:B:START\n" -" Belegung der Joystick Knöpfe und Axen einstellen\n" -" --leveleditor Startet den Level Editor\n" -" --worldmap Startet im Worldmap Modus\n" -" -d, --datadir DIR Verzeichnis mit Spieldaten (standard: automatisch)\n" -" --debug Debug Modus aktivieren\n" -" --help diese Hilfe anzeigen und beenden\n" -" --usage kurzen Hilfstext über Optionen anzeigen\n" -" --version Versionsinformationen anzeigen\n" -"\n" - -#: lib/app/setup.cpp:858 -#, c-format -msgid "" -"Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--" -"debug] | [--usage | --help | --version] [--leveleditor] [--worldmap] [--flip-" -"levels] FILENAME\n" -msgstr "" -"Aufruf: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--" -"debug] | [--usage | --help | --version] [--leveleditor] [--worldmap] [--flip-" -"levels] DATEI\n" - -#: lib/gui/menu.cpp:68 -msgid "Yes" -msgstr "Ja" - -#: lib/gui/menu.cpp:69 -msgid "No" -msgstr "Nein" - -#: lib/gui/menu.cpp:237 -msgid "Up cursor" -msgstr "Nach Oben" - -#: lib/gui/menu.cpp:240 -msgid "Down cursor" -msgstr "Nach Unten" - -#: lib/gui/menu.cpp:243 -msgid "Left cursor" -msgstr "Nach Links" - -#: lib/gui/menu.cpp:246 -msgid "Right cursor" -msgstr "Nach Rechts" - -#: lib/gui/menu.cpp:249 -msgid "Return" -msgstr "Return" - -#: lib/gui/menu.cpp:252 -msgid "Space" -msgstr "Space" - -#: lib/gui/menu.cpp:255 -msgid "Right Shift" -msgstr "Shift Rechts" - -#: lib/gui/menu.cpp:258 -msgid "Left Shift" -msgstr "Shift Links" - -#: lib/gui/menu.cpp:261 -msgid "Right Control" -msgstr "Steuerung Rechts" - -#: lib/gui/menu.cpp:264 -msgid "Left Control" -msgstr "Steuerung Links" - -#: lib/gui/menu.cpp:267 -msgid "Right Alt" -msgstr "Alt Rechts" - -#: lib/gui/menu.cpp:270 -msgid "Left Alt" -msgstr "Alt Links" - -#: src/worldmap.cpp:802 -msgid "GAMEOVER" -msgstr "Game Over" -#: src/worldmap.cpp:805 src/gameloop.cpp:922 -#, c-format -msgid "COINS: %d" -msgstr "Münzen: %d" - -#: src/worldmap.cpp:810 -msgid "Total Statistics" -msgstr "Gesamt Statistiken" - -#: src/worldmap.cpp:963 src/gameloop.cpp:843 -msgid "SCORE" -msgstr "Punkte" - -#: src/worldmap.cpp:967 src/gameloop.cpp:865 src/gameloop.cpp:866 -msgid "COINS" -msgstr "Münzen" - -#: src/worldmap.cpp:988 src/worldmap.cpp:989 src/gameloop.cpp:887 -#: src/gameloop.cpp:888 -msgid "LIVES" -msgstr "Leben" - -#: src/title.cpp:124 src/misc.cpp:98 -msgid "Contrib Levels" -msgstr "Zusatzlevel" +#: src/game_session.cpp:99 +#: src/worldmap/worldmap.cpp:146 +msgid "Pause" +msgstr "Pause" -#: src/title.cpp:143 src/title.cpp:216 src/misc.cpp:129 src/misc.cpp:140 -#: src/misc.cpp:153 src/misc.cpp:164 src/leveleditor.cpp:67 -#: src/leveleditor.cpp:77 -msgid "Back" -msgstr "Zurück" +#: src/game_session.cpp:101 +#: src/worldmap/worldmap.cpp:148 +msgid "Continue" +msgstr "Weiterspielen" -#: src/title.cpp:351 -msgid "" -"Copyright (c) 2003 SuperTux Devel Team\n" -"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" -"are welcome to redistribute it under certain conditions; see the file " -"COPYING\n" -"for details.\n" -msgstr "" -"Copyright (c) 2003 SuperTux Devel Team\n" -"Diese Spiel kommt OHNE GEWÄHRLEISTUNG. Dies ist freie Software und sie\n" -"dürfen sie gerne unter bestimmten Bedingungen weiterverteilen; Details " -"finden\n" -"Sie in der Datei COPYING.\n" +#: src/game_session.cpp:102 +#: src/options_menu.cpp:49 +#: src/title.cpp:274 +#: src/worldmap/worldmap.cpp:149 +msgid "Options" +msgstr "Einstellungen" -#: src/title.cpp:408 -msgid "Are you sure you want to delete slot" -msgstr "Sind sie sicher, dass sie den Spielstand löschen wollen?" +#: src/game_session.cpp:104 +msgid "Abort Level" +msgstr "Level Abbrechen" -#: src/gameloop.cpp:204 +#: src/game_session.cpp:222 msgid "contributed by " msgstr "von" -#: src/gameloop.cpp:209 +#: src/game_session.cpp:226 msgid "Best Level Statistics" -msgstr "Bester Level Statistik" - -#: src/gameloop.cpp:646 -msgid "PAUSE - Press 'P' To Play" -msgstr "PAUSE - Drücke 'P' zum Spielen" - -#: src/gameloop.cpp:651 -msgid "Playing: " -msgstr "Spiele:" +msgstr "Level-Rekorde" -#: src/gameloop.cpp:848 -msgid "Press ESC To Return" -msgstr "Drücke ESC um zurückzukehren" - -#: src/gameloop.cpp:853 -msgid "TIME's UP" -msgstr "Zeit ist um" - -#: src/gameloop.cpp:858 -msgid "TIME" -msgstr "Zeit" - -#: src/gameloop.cpp:916 -msgid "Result:" -msgstr "Ergebnis:" - -#: src/gameloop.cpp:919 -#, c-format -msgid "SCORE: %d" -msgstr "Punkte: %d" - -#: src/gameloop.cpp:950 -msgid "Slot" -msgstr "Speicherplatz" - -#: src/gameloop.cpp:951 -msgid "Free" -msgstr "frei" - -#: src/statistics.cpp:111 +#: src/statistics.cpp:87 msgid "- Best Level Statistics -" -msgstr "- Beste level Statistik -" - -#: src/statistics.cpp:115 -msgid "Max score:" -msgstr "Max Punkte:" +msgstr "- Level-Rekorde -" -#: src/statistics.cpp:135 +#: src/statistics.cpp:105 +#, c-format msgid "Max coins collected:" -msgstr "Max Münzen gesammelt:" +msgstr "Münzen gesammelt:" -#: src/statistics.cpp:137 +#: src/statistics.cpp:109 +#, c-format msgid "Max fragging:" -msgstr "Max besiegt:" +msgstr "Gegner besiegt:" -#: src/statistics.cpp:139 +#: src/statistics.cpp:113 +#, c-format msgid "Min time needed:" -msgstr "Min Zeit benötigt:" +msgstr "Schnellste Zeit:" -#: src/statistics.cpp:168 +#: src/statistics.cpp:122 #, c-format -msgid "Max score: %d" -msgstr "Max Punkte: %d" +msgid "Max secrets found:" +msgstr "Verstecke gefunden:" -#: src/statistics.cpp:174 +#: src/statistics.cpp:154 #, c-format msgid "Max coins collected: %d / %d" -msgstr "Max Münzen gesammelt: %d / %d" +msgstr "Münzen gesammelt: %d / %d" -#: src/statistics.cpp:178 +#: src/statistics.cpp:158 #, c-format msgid "Max fragging: %d / %d" -msgstr "Max besiegt: %d / %d" +msgstr "Gegner besiegt: %d / %d" -#: src/statistics.cpp:182 +#: src/statistics.cpp:165 #, c-format -msgid "Min time needed: %d / %d" -msgstr "Min Zeit benötigt: %d / %d" +msgid "Min time needed: %02d:%02d" +msgstr "Schnellste Zeit: %02d:%02d" -#: src/misc.cpp:97 src/misc.cpp:156 -msgid "Start Game" -msgstr "Spiel Beginnen" +#: src/statistics.cpp:169 +#, c-format +msgid "Max secrets found: %d / %d" +msgstr "Verstecke gefunden: %d / %d" -#: src/misc.cpp:99 src/misc.cpp:104 src/misc.cpp:179 src/misc.cpp:186 -msgid "Options" -msgstr "Einstellungen" +#: src/statistics.cpp:206 +msgid "You" +msgstr "Gerade" -#: src/misc.cpp:100 src/leveleditor.cpp:562 -msgid "Level Editor" -msgstr "Level Editor" +#: src/statistics.cpp:207 +msgid "Best" +msgstr "Rekord" -#: src/misc.cpp:101 -msgid "Credits" -msgstr "Mitwirkende" +#: src/statistics.cpp:209 +msgid "Coins" +msgstr "Münzen" -#: src/misc.cpp:102 -msgid "Quit" -msgstr "Beenden" +#: src/statistics.cpp:217 +msgid "Secrets" +msgstr "Verstecke" -#: src/misc.cpp:107 -msgid "OpenGL " -msgstr "OpenGL" +#: src/statistics.cpp:225 +msgid "Time" +msgstr "Zeit" -#: src/misc.cpp:109 -msgid "OpenGL (not supported)" -msgstr "OpenGL (nicht vorhanden)" +#: src/player_status.cpp:198 +msgid "COINS" +msgstr "Münzen" -#: src/misc.cpp:111 +#: src/options_menu.cpp:51 msgid "Fullscreen" msgstr "Vollbild" -#: src/misc.cpp:114 src/misc.cpp:119 +#: src/options_menu.cpp:52 msgid "Sound" msgstr "Sound" -#: src/misc.cpp:115 src/misc.cpp:120 +#: src/options_menu.cpp:53 msgid "Music" msgstr "Musik" -#: src/misc.cpp:122 -msgid "Show FPS " -msgstr "FPS anzeigen" - -#: src/misc.cpp:123 +#: src/options_menu.cpp:54 msgid "Setup Keys" -msgstr "Tasten einstellen" +msgstr "Tastenbelegung" -#: src/misc.cpp:126 +#: src/options_menu.cpp:55 msgid "Setup Joystick" -msgstr "Joystick einstellen" - -#: src/misc.cpp:131 -msgid "Keyboard Setup" -msgstr "Tastatur einstellen" - -#: src/misc.cpp:133 -msgid "Left move" -msgstr "Nach Links" - -#: src/misc.cpp:134 -msgid "Right move" -msgstr "Nach Rechts" - -#: src/misc.cpp:135 -msgid "Up/Activate" -msgstr "Nach Oben/Aktivieren" - -#: src/misc.cpp:136 -msgid "Down/Duck" -msgstr "Nach Unten/Ducken" - -#: src/misc.cpp:137 -msgid "Jump" -msgstr "Springen" - -#: src/misc.cpp:138 -msgid "Power/Run" -msgstr "Power/Rennen" - -#: src/misc.cpp:144 -msgid "Joystick Setup" -msgstr "Joystick Einstellungen" - -#: src/misc.cpp:148 -msgid "A button" -msgstr "A Knopf" - -#: src/misc.cpp:149 -msgid "B button" -msgstr "B Knopf" - -#: src/misc.cpp:166 -msgid "Save Game" -msgstr "Spiel Speichern" - -#: src/misc.cpp:176 src/misc.cpp:183 -msgid "Pause" -msgstr "Pause" - -#: src/misc.cpp:178 src/misc.cpp:185 -msgid "Continue" -msgstr "Fortsetzen" - -#: src/misc.cpp:181 -msgid "Abort Level" -msgstr "Level Abbrechen" - -#: src/misc.cpp:188 -msgid "Quit Game" -msgstr "Spiel Beenden" - -#: src/misc.cpp:190 -msgid "Enter your name:" -msgstr "Geben Sie ihren Namen ein:" - -#: src/leveleditor.cpp:61 -msgid "Load Subset" -msgstr "Subset laden" +msgstr "Joystickbelegung" + +#: src/options_menu.cpp:57 +#: src/title.cpp:87 +#: src/title.cpp:138 +#: src/title.cpp:188 +#: src/control/joystickkeyboardcontroller.cpp:575 +#: src/control/joystickkeyboardcontroller.cpp:659 +msgid "Back" +msgstr "Zurück" -#: src/leveleditor.cpp:70 -msgid "New Level Subset" -msgstr "Neues Level-subset" +#: src/title.cpp:81 +#: src/title.cpp:272 +msgid "Start Game" +msgstr "Spiel starten" -#: src/leveleditor.cpp:72 -msgid "Filename " -msgstr "Dateiname" +#: src/title.cpp:116 +#: src/title.cpp:273 +msgid "Contrib Levels" +msgstr "Zusatzlevel" -#: src/leveleditor.cpp:73 -msgid "Title " -msgstr "Titel" +#: src/title.cpp:275 +msgid "Credits" +msgstr "Mitwirkende" -#: src/leveleditor.cpp:74 -msgid "Description" -msgstr "Beschreibung" +#: src/title.cpp:276 +msgid "Quit" +msgstr "Beenden" -#: src/leveleditor.cpp:75 -msgid "Create" -msgstr "Erzeugen" +#: src/title.cpp:314 +msgid "" +"Copyright (c) 2006 SuperTux Devel Team\n" +"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to\n" +"redistribute it under certain conditions; see the file COPYING for details.\n" +msgstr "" +"Copyright (c) 2003 SuperTux Devel Team\n" +"Für dieses Spiel besteht KEINERLEI GARANTIE. Dieses Spiel ist freie Software, die Sie unter\n" +"bestimmten Bedingungen weitergeben dürfen; Details finden Sie in der Datei COPYING.\n" -#: src/leveleditor.cpp:80 -msgid "Level Editor Menu" -msgstr "Level Editor" +#: src/title.cpp:416 +#: src/title.cpp:421 +msgid "Slot" +msgstr "Spielstand" -#: src/leveleditor.cpp:82 -msgid "Return to Level Editor" -msgstr "Zurück zum Level Editor" +#: src/title.cpp:416 +msgid "Free" +msgstr "Frei" -#: src/leveleditor.cpp:83 -msgid "Create Level Subset" -msgstr "Level-subset erstellen" +#: src/control/joystickkeyboardcontroller.cpp:566 +msgid "Keyboard Setup" +msgstr "Tastenbelegung" -#: src/leveleditor.cpp:84 -msgid "Load Level Subset" -msgstr "Level-subset laden" +#: src/control/joystickkeyboardcontroller.cpp:568 +msgid "Up" +msgstr "Oben" -#: src/leveleditor.cpp:86 -msgid "Quit Level Editor" -msgstr "Level Editor Beenden" +#: src/control/joystickkeyboardcontroller.cpp:569 +msgid "Down" +msgstr "Unten" -#: src/leveleditor.cpp:89 -msgid "Level Settings" -msgstr "Level-Einstellungen" +#: src/control/joystickkeyboardcontroller.cpp:570 +msgid "Left" +msgstr "Links" -#: src/leveleditor.cpp:91 -msgid "Name " -msgstr "Name" +#: src/control/joystickkeyboardcontroller.cpp:571 +msgid "Right" +msgstr "Rechts" -#: src/leveleditor.cpp:92 -msgid "Author " -msgstr "Autor" +#: src/control/joystickkeyboardcontroller.cpp:572 +#: src/control/joystickkeyboardcontroller.cpp:652 +msgid "Jump" +msgstr "Springen" -#: src/leveleditor.cpp:93 -msgid "Width " -msgstr "Breite" +#: src/control/joystickkeyboardcontroller.cpp:573 +#: src/control/joystickkeyboardcontroller.cpp:653 +msgid "Action" +msgstr "Aktion" -#: src/leveleditor.cpp:94 -msgid "Height " -msgstr "Höhe" +#: src/control/joystickkeyboardcontroller.cpp:587 +#: src/control/joystickkeyboardcontroller.cpp:670 +msgid "None" +msgstr "Keine" -#: src/leveleditor.cpp:96 -msgid "Apply" -msgstr "Anwenden" +#: src/control/joystickkeyboardcontroller.cpp:589 +msgid "Up cursor" +msgstr "Nach Oben" -#: src/leveleditor.cpp:104 -msgid "Eraser" -msgstr "Radiergummie" +#: src/control/joystickkeyboardcontroller.cpp:591 +msgid "Down cursor" +msgstr "Nach Unten" -#: src/leveleditor.cpp:136 -msgid "Trampoline" -msgstr "Trampolin" +#: src/control/joystickkeyboardcontroller.cpp:593 +msgid "Left cursor" +msgstr "Nach Links" -#: src/leveleditor.cpp:137 -msgid "Flying Platform" -msgstr "Fliegende Platform" +#: src/control/joystickkeyboardcontroller.cpp:595 +msgid "Right cursor" +msgstr "Nach Rechts" -#: src/leveleditor.cpp:141 -msgid "Edtit foreground tiles" -msgstr "Vordergrund Bearbeiten" +#: src/control/joystickkeyboardcontroller.cpp:597 +msgid "Return" +msgstr "Eingabetaste" -#: src/leveleditor.cpp:143 -msgid "Edit interactive tiles" -msgstr "Interaktive Teile Bearbeiten" +#: src/control/joystickkeyboardcontroller.cpp:599 +msgid "Space" +msgstr "Leertaste" -#: src/leveleditor.cpp:145 -msgid "Edit background tiles" -msgstr "Hintergrund Bearbeiten" +#: src/control/joystickkeyboardcontroller.cpp:601 +msgid "Right Shift" +msgstr "Umschalt Rechts" -#: src/leveleditor.cpp:149 -msgid "Next sector" -msgstr "Nächster Sektor" +#: src/control/joystickkeyboardcontroller.cpp:603 +msgid "Left Shift" +msgstr "Umschalt Links" -#: src/leveleditor.cpp:150 -msgid "Prevous sector" -msgstr "Letzter Sektor" +#: src/control/joystickkeyboardcontroller.cpp:605 +msgid "Right Control" +msgstr "Steuerung Rechts" -#: src/leveleditor.cpp:151 -msgid "Next level" -msgstr "Nächster Level" +#: src/control/joystickkeyboardcontroller.cpp:607 +msgid "Left Control" +msgstr "Steuerung Links" -#: src/leveleditor.cpp:152 -msgid "Prevous level" -msgstr "Letzter Level" +#: src/control/joystickkeyboardcontroller.cpp:609 +msgid "Right Alt" +msgstr "Alt Rechts" -#: src/leveleditor.cpp:153 -msgid "Save level" -msgstr "Level speichern" +#: src/control/joystickkeyboardcontroller.cpp:611 +msgid "Left Alt" +msgstr "Alt Links" -#: src/leveleditor.cpp:154 -msgid "Test level" -msgstr "Test Level" +#: src/control/joystickkeyboardcontroller.cpp:621 +msgid "Press Key" +msgstr "Taste drücken" -#: src/leveleditor.cpp:155 -msgid "Setup level" -msgstr "Level-Einstellungen" +#: src/control/joystickkeyboardcontroller.cpp:649 +msgid "Joystick Setup" +msgstr "Joystickbelegung" -#: src/leveleditor.cpp:237 src/leveleditor.cpp:727 src/leveleditor.cpp:752 -#: src/leveleditor.cpp:841 -msgid "Level not saved. Wanna to?" -msgstr "Level wurde noch nicht gespeichert. Jetzt speichern?" +#: src/control/joystickkeyboardcontroller.cpp:654 +msgid "Pause/Menu" +msgstr "Pause/Menü" -#: src/leveleditor.cpp:363 -#, c-format -msgid "Level %d doesn't exist. Create it?" -msgstr "Level %d exisitiert nicht. Jetzte erstellen?" +#: src/control/joystickkeyboardcontroller.cpp:656 +msgid "No Joysticks found" +msgstr "Keine Joysticks gefunden" -#: src/leveleditor.cpp:585 -msgid "F1 for help" -msgstr "Für Hilfe F1 drücken" +#: src/control/joystickkeyboardcontroller.cpp:681 +msgid "Press Button" +msgstr "Knopf drücken" -#: src/leveleditor.cpp:587 -msgid "Choose a level subset" -msgstr "Wählen Sie ein Level-Subset aus" +#: src/gui/menu.cpp:63 +msgid "Yes" +msgstr "Ja" -#: src/leveleditor.cpp:778 -msgid "No more sectors exist. Create another?" -msgstr "Keine weiteren Sektoren vorhanden. Einen weiteren erzeugen?" +#: src/gui/menu.cpp:64 +msgid "No" +msgstr "Nein" -#: src/leveleditor.cpp:936 -msgid "" -"This is the built-in level editor. Its aim is to be intuitive\n" -"and simple to use, so it should be pretty straightforward.\n" -"\n" -"To open a level, first you'll have to select a level subset from\n" -"the menu (or create your own).\n" -"A level subset is basically a collection of levels.\n" -"They can then be played from the Contrib menu.\n" -"\n" -"To access the menu from the level editor, just press Esc.\n" -"\n" -"You are currently looking at the level. To scroll it, just\n" -"press the right mouse button and drag the mouse. It will move like\n" -"a strategy game.\n" -"You can also use the arrow keys and Page Up/Down.\n" -"\n" -"'+' and '-' keys can be used to zoom the level in/out.\n" -"\n" -"You probably already noticed those floating groups of buttons.\n" -"Each one serves a different purpose. To select a certain button\n" -"just press the Left mouse button on it. A few buttons have key\n" -"shortcuts. You can find them by pressing the Right mouse button on\n" -"a button. That will also show what that button does.\n" -"Groups of buttons can also be moved around by just dragging them,\n" -"while pressing the Left mouse button.\n" -"\n" -"Let's learn a bit of what each group of buttons does, shall we?\n" -"\n" -"To starting putting tiles and objects around use the bigger group\n" -"of buttons. Each button is a different tile. To put it on the level,\n" -"just press it and then left click in the level.\n" -"You can also copy tiles from the level by using the middle mouse button.\n" -"Use the mouse wheel to scroll that group of buttons. You will find\n" -"enemies and game objects in the bottom.\n" -msgstr "" +#: src/trigger/secretarea_trigger.cpp:76 +msgid "You found a secret area!" +msgstr "Neues Versteck gefunden!" -#: src/leveleditor.cpp:972 -msgid "" -"The Foreground/Interactive/Background buttons may be used to\n" -"see and edit the respective layer. Levels have three tiles layers:\n" -"Foreground - tiles are drawn on top of everything and have no contact\n" -"with the player.\n" -"Interactive - these are the tiles that have contact with the player.\n" -"Background - tiles are drawn underneath everything and have no contact\n" -"with the player.\n" -"The unselected layers will be drawn semi-transparently.\n" -"\n" -"Last, but not least, the group of buttons that's left serves\n" -"to do related actions with the level.\n" -"From left to right:\n" -"Mini arrows - can be used to choose other sectors.\n" -"Sectors are mini-levels, so to speak, that can be accessed using a door.\n" -"Big arrows - choose other level in the same level subset.\n" -"Diskette - save the level\n" -"Tux - test the level\n" -"Tools - set a few settings for the level, including resizing it.\n" -"\n" -"We have reached the end of this Howto.\n" -"\n" -"Don't forget to send us a few cool levels. :)\n" -"\n" -"Enjoy,\n" -" SuperTux development team\n" -"\n" -"PS: If you are looking for something more powerful, you might like to\n" -"try FlexLay. FlexLay is a level editor that supports several games,\n" -"including SuperTux. It is an independent project.\n" -"Webpage: http://pingus.seul.org/~grumbel/flexlay/" -msgstr "" +#: src/object/level_time.cpp:77 +msgid "TIME's UP" +msgstr "Zeit abgelaufen" -#: src/leveleditor.cpp:1012 -msgid "- Level Editor's Help -" -msgstr "- Level Editor Hilfe -" +#: src/object/level_time.cpp:82 +msgid "TIME" +msgstr "Zeit" -#: src/leveleditor.cpp:1016 -#, c-format -msgid "Press any key to continue - Page %d/%d" -msgstr "Um fortzufahren beliebige Taste drücken - Seite %d/%d" +#: src/worldmap/worldmap.cpp:151 +msgid "Quit World" +msgstr "Welt verlassen" -#: src/object/player.cpp:279 -#, c-format -msgid "New max combo: %d" -msgstr "Neue Max Kombination: %d" diff --git a/src/control/joystickkeyboardcontroller.cpp b/src/control/joystickkeyboardcontroller.cpp index 52ff9e25d..d31e5c43a 100644 --- a/src/control/joystickkeyboardcontroller.cpp +++ b/src/control/joystickkeyboardcontroller.cpp @@ -570,7 +570,7 @@ JoystickKeyboardController::KeyboardMenu::KeyboardMenu( add_controlfield(Controller::LEFT, _("Left")); add_controlfield(Controller::RIGHT, _("Right")); add_controlfield(Controller::JUMP, _("Jump")); - add_controlfield(Controller::ACTION, _("Shoot/Run")); + add_controlfield(Controller::ACTION, _("Action")); add_hl(); add_back(_("Back")); update(); @@ -650,7 +650,7 @@ JoystickKeyboardController::JoystickMenu::JoystickMenu( add_hl(); if(controller->joysticks.size() > 0) { add_controlfield(Controller::JUMP, _("Jump")); - add_controlfield(Controller::ACTION, _("Shoot/Run")); + add_controlfield(Controller::ACTION, _("Action")); add_controlfield(Controller::PAUSE_MENU, _("Pause/Menu")); } else { add_deactive(-1, _("No Joysticks found")); diff --git a/src/statistics.cpp b/src/statistics.cpp index 213d3eb1f..731dc4d3f 100644 --- a/src/statistics.cpp +++ b/src/statistics.cpp @@ -181,7 +181,7 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S // abort if we have no backdrop if (!backdrop) return; - int box_w = 130+130+130; + int box_w = 160+110+110; int box_h = 30+20+20+20; int box_x = (int)((SCREEN_WIDTH - box_w) / 2); int box_y = (int)(SCREEN_HEIGHT / 2) - box_h; @@ -192,8 +192,8 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S int bd_y = box_y + (box_h / 2) - (bd_h / 2); int col1_x = box_x; - int col2_x = col1_x+130; - int col3_x = col2_x+130; + int col2_x = col1_x+160; + int col3_x = col2_x+110; int row1_y = box_y; int row2_y = row1_y+30; @@ -203,10 +203,10 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S context.draw_surface(backdrop, Vector(bd_x, bd_y), LAYER_GUI); char buf[129]; - context.draw_text(white_text, "You", Vector(col2_x, row1_y), LEFT_ALLIGN, LAYER_GUI); - context.draw_text(white_text, "Best", Vector(col3_x, row1_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(white_text, _("You"), Vector(col2_x, row1_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(white_text, _("Best"), Vector(col3_x, row1_y), LEFT_ALLIGN, LAYER_GUI); - context.draw_text(white_text, "Coins", Vector(col1_x, row2_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(white_text, _("Coins"), Vector(col1_x, row2_y), LEFT_ALLIGN, LAYER_GUI); snprintf(buf, 128, "%d/%d", coins, total_coins); context.draw_text(gold_text, buf, Vector(col2_x, row2_y), LEFT_ALLIGN, LAYER_GUI); if (best_stats && (best_stats->coins > coins)) { @@ -214,7 +214,7 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S } context.draw_text(gold_text, buf, Vector(col3_x, row2_y), LEFT_ALLIGN, LAYER_GUI); - context.draw_text(white_text, "Secrets", Vector(col1_x, row4_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(white_text, _("Secrets"), Vector(col1_x, row4_y), LEFT_ALLIGN, LAYER_GUI); snprintf(buf, 128, "%d/%d", secrets, total_secrets); context.draw_text(gold_text, buf, Vector(col2_x, row4_y), LEFT_ALLIGN, LAYER_GUI); if (best_stats && (best_stats->secrets > secrets)) { @@ -222,7 +222,7 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S } context.draw_text(gold_text, buf, Vector(col3_x, row4_y), LEFT_ALLIGN, LAYER_GUI); - context.draw_text(white_text, "Time", Vector(col1_x, row3_y), LEFT_ALLIGN, LAYER_GUI); + context.draw_text(white_text, _("Time"), Vector(col1_x, row3_y), LEFT_ALLIGN, LAYER_GUI); int csecs = (int)(time * 100); int mins = (int)(csecs / 6000); int secs = (csecs % 6000) / 100; diff --git a/src/trigger/secretarea_trigger.cpp b/src/trigger/secretarea_trigger.cpp index 9beca7b7c..4c96af7da 100644 --- a/src/trigger/secretarea_trigger.cpp +++ b/src/trigger/secretarea_trigger.cpp @@ -27,10 +27,10 @@ #include "main.hpp" #include "sector.hpp" #include "level.hpp" +#include "gettext.hpp" static const float MESSAGE_TIME=3.5; -//TODO: Count numbers of triggered/total secret areas SecretAreaTrigger::SecretAreaTrigger(const lisp::Lisp& reader) { reader.get("x", bbox.p1.x); @@ -40,14 +40,12 @@ SecretAreaTrigger::SecretAreaTrigger(const lisp::Lisp& reader) reader.get("height", h); bbox.set_size(w, h); - reader.get("message", message); message_displayed = false; } SecretAreaTrigger::SecretAreaTrigger(const Rect& area) { bbox = area; - message = "You found a secret area!"; //FIXME: translation missing message_displayed = false; } @@ -64,7 +62,6 @@ SecretAreaTrigger::write(lisp::Writer& writer) writer.write_float("y", bbox.p1.y); writer.write_float("width", bbox.get_width()); writer.write_float("height", bbox.get_height()); - writer.write_string("message", message); writer.end_list("secretarea"); } @@ -72,16 +69,16 @@ SecretAreaTrigger::write(lisp::Writer& writer) void SecretAreaTrigger::draw(DrawingContext& context) { - if (message_timer.started()) { - context.push_transform(); - context.set_translation(Vector(0, 0)); - Vector pos = Vector(0, SCREEN_HEIGHT/2 - gold_text->get_height()/2); - context.draw_center_text(gold_text, message, pos, LAYER_GUI); - context.pop_transform(); - } - if (message_timer.check()) { - remove_me(); - } + if (message_timer.started()) { + context.push_transform(); + context.set_translation(Vector(0, 0)); + Vector pos = Vector(0, SCREEN_HEIGHT/2 - gold_text->get_height()/2); + context.draw_center_text(gold_text, _("You found a secret area!"), pos, LAYER_GUI); + context.pop_transform(); + } + if (message_timer.check()) { + remove_me(); + } } void diff --git a/src/trigger/secretarea_trigger.hpp b/src/trigger/secretarea_trigger.hpp index 02186a0fc..993f1f436 100644 --- a/src/trigger/secretarea_trigger.hpp +++ b/src/trigger/secretarea_trigger.hpp @@ -38,7 +38,6 @@ public: void draw(DrawingContext& context); private: - std::string message; Timer message_timer; bool message_displayed; }; -- 2.11.0