From ef1ca12bb64f5ec7e7ef0c5d5bf272120a553211 Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Mon, 22 Jun 2009 21:04:30 +0100 Subject: [PATCH] Prepare Linux 0.6 release --- configure.ac | 2 +- po/POTFILES.in | 1 - po/en_GB.po | 44 ++++++++++++++++++++++---------------------- po/lander.pot | 46 +++++++++++++++++++++++----------------------- po/sv.po | 44 ++++++++++++++++++++++---------------------- src/Makefile.am | 2 +- 6 files changed, 69 insertions(+), 70 deletions(-) diff --git a/configure.ac b/configure.ac index dc37c9b..43c085b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Lunar Lander], [0.6], +AC_INIT([Lunar Lander], [0.6.0], [Nick Gasson ], [lander]) AM_INIT_AUTOMAKE([-Wall -Werror]) diff --git a/po/POTFILES.in b/po/POTFILES.in index c1eba6e..da89d5b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -27,7 +27,6 @@ src/Viewport.cpp src/Asteroid.hpp src/Viewport.hpp src/Font.cpp -src/LoadOnce.hpp src/Platform.hpp src/Key.hpp src/ConfigFile.hpp diff --git a/po/en_GB.po b/po/en_GB.po index 84de9c2..8b2afb9 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lander 0.9\n" "Report-Msgid-Bugs-To: nick@cakesniffer.co.uk\n" -"POT-Creation-Date: 2009-04-22 21:21+0100\n" +"POT-Creation-Date: 2009-06-22 21:02+0100\n" "PO-Revision-Date: 2008-04-19 01:09+0100\n" "Last-Translator: Nick Gasson \n" "Language-Team: English (British)\n" @@ -16,96 +16,96 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/Main.cpp:137 +#: src/Main.cpp:141 #, c-format msgid "Runtime Error: %s\n" msgstr "Runtime Error: %s\n" -#: src/Game.cpp:115 src/Game.cpp:752 +#: src/Game.cpp:117 src/Game.cpp:760 #, c-format msgid "Score: %d" msgstr "Score: %d" -#: src/Game.cpp:688 +#: src/Game.cpp:696 #, fuzzy msgid "Press SPACE to continue" msgstr "Press SPACE to continue" -#: src/Game.cpp:746 +#: src/Game.cpp:754 msgid "Land now" msgstr "Land now" -#: src/Game.cpp:768 +#: src/Game.cpp:776 #, c-format msgid "Level %d" msgstr "Level %d" -#: src/Game.cpp:787 +#: src/Game.cpp:795 msgid "Paused" msgstr "Paused" -#: src/HighScores.cpp:177 +#: src/HighScores.cpp:184 #, fuzzy msgid "Press SPACE or FIRE to return" msgstr "Press SPACE or FIRE to return" -#: src/HighScores.cpp:192 +#: src/HighScores.cpp:199 #, fuzzy msgid "Well done - You got a high score" msgstr "Well done - You got a high score" -#: src/HighScores.cpp:197 +#: src/HighScores.cpp:204 #, fuzzy msgid "Press ENTER or FIRE to continue" msgstr "Press ENTER or FIRE to continue" -#: src/HighScores.cpp:203 +#: src/HighScores.cpp:210 #, c-format msgid "Name? %s" msgstr "Name? %s" -#: src/Options.cpp:262 +#: src/Options.cpp:264 msgid "Use UP and DOWN to select options" msgstr "" -#: src/Options.cpp:267 +#: src/Options.cpp:269 msgid "Use LEFT and RIGHT to change values" msgstr "" -#: src/Options.cpp:272 +#: src/Options.cpp:274 #, fuzzy msgid "Press FIRE or RETURN to exit" msgstr "Press SPACE or FIRE to return" -#: src/Options.cpp:279 +#: src/Options.cpp:281 msgid "Please restart the game to change the resolution" msgstr "" -#: src/Menu.cpp:245 +#: src/Menu.cpp:247 msgid "Use the arrow keys to rotate the ship" msgstr "" -#: src/Menu.cpp:246 +#: src/Menu.cpp:248 msgid "Press the up arrow to fire the thruster" msgstr "" -#: src/Menu.cpp:247 +#: src/Menu.cpp:249 msgid "Smaller landing pads give you more points" msgstr "" -#: src/Menu.cpp:248 +#: src/Menu.cpp:250 msgid "Press P to pause the game" msgstr "" -#: src/Menu.cpp:249 +#: src/Menu.cpp:251 msgid "Press escape to self destruct" msgstr "" -#: src/Menu.cpp:250 +#: src/Menu.cpp:252 msgid "You can only land safely when then speed bar is green" msgstr "" -#: src/Menu.cpp:251 +#: src/Menu.cpp:253 msgid "Collect the spinning rings to unlock the landing pads" msgstr "" diff --git a/po/lander.pot b/po/lander.pot index fd4d7de..c8cf990 100644 --- a/po/lander.pot +++ b/po/lander.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lander 0.5.3\n" +"Project-Id-Version: lander 0.6.0\n" "Report-Msgid-Bugs-To: nick@cakesniffer.co.uk\n" -"POT-Creation-Date: 2009-04-22 21:21+0100\n" +"POT-Creation-Date: 2009-06-22 21:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,90 +16,90 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/Main.cpp:137 +#: src/Main.cpp:141 #, c-format msgid "Runtime Error: %s\n" msgstr "" -#: src/Game.cpp:115 src/Game.cpp:752 +#: src/Game.cpp:117 src/Game.cpp:760 #, c-format msgid "Score: %d" msgstr "" -#: src/Game.cpp:688 +#: src/Game.cpp:696 msgid "Press SPACE to continue" msgstr "" -#: src/Game.cpp:746 +#: src/Game.cpp:754 msgid "Land now" msgstr "" -#: src/Game.cpp:768 +#: src/Game.cpp:776 #, c-format msgid "Level %d" msgstr "" -#: src/Game.cpp:787 +#: src/Game.cpp:795 msgid "Paused" msgstr "" -#: src/HighScores.cpp:177 +#: src/HighScores.cpp:184 msgid "Press SPACE or FIRE to return" msgstr "" -#: src/HighScores.cpp:192 +#: src/HighScores.cpp:199 msgid "Well done - You got a high score" msgstr "" -#: src/HighScores.cpp:197 +#: src/HighScores.cpp:204 msgid "Press ENTER or FIRE to continue" msgstr "" -#: src/HighScores.cpp:203 +#: src/HighScores.cpp:210 #, c-format msgid "Name? %s" msgstr "" -#: src/Options.cpp:262 +#: src/Options.cpp:264 msgid "Use UP and DOWN to select options" msgstr "" -#: src/Options.cpp:267 +#: src/Options.cpp:269 msgid "Use LEFT and RIGHT to change values" msgstr "" -#: src/Options.cpp:272 +#: src/Options.cpp:274 msgid "Press FIRE or RETURN to exit" msgstr "" -#: src/Options.cpp:279 +#: src/Options.cpp:281 msgid "Please restart the game to change the resolution" msgstr "" -#: src/Menu.cpp:245 +#: src/Menu.cpp:247 msgid "Use the arrow keys to rotate the ship" msgstr "" -#: src/Menu.cpp:246 +#: src/Menu.cpp:248 msgid "Press the up arrow to fire the thruster" msgstr "" -#: src/Menu.cpp:247 +#: src/Menu.cpp:249 msgid "Smaller landing pads give you more points" msgstr "" -#: src/Menu.cpp:248 +#: src/Menu.cpp:250 msgid "Press P to pause the game" msgstr "" -#: src/Menu.cpp:249 +#: src/Menu.cpp:251 msgid "Press escape to self destruct" msgstr "" -#: src/Menu.cpp:250 +#: src/Menu.cpp:252 msgid "You can only land safely when then speed bar is green" msgstr "" -#: src/Menu.cpp:251 +#: src/Menu.cpp:253 msgid "Collect the spinning rings to unlock the landing pads" msgstr "" diff --git a/po/sv.po b/po/sv.po index 92c3fd7..659cb79 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lander 0.5.1\n" "Report-Msgid-Bugs-To: nick@cakesniffer.co.uk\n" -"POT-Creation-Date: 2009-04-22 21:21+0100\n" +"POT-Creation-Date: 2009-06-22 21:02+0100\n" "PO-Revision-Date: 2009-02-23 15:11+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: \n" @@ -17,90 +17,90 @@ msgstr "" "X-Poedit-Language: Swedish\n" "X-Poedit-Country: SWEDEN\n" -#: src/Main.cpp:137 +#: src/Main.cpp:141 #, c-format msgid "Runtime Error: %s\n" msgstr "Koerfel: %s\n" -#: src/Game.cpp:115 src/Game.cpp:752 +#: src/Game.cpp:117 src/Game.cpp:760 #, c-format msgid "Score: %d" msgstr "Poaeng: %d" -#: src/Game.cpp:688 +#: src/Game.cpp:696 msgid "Press SPACE to continue" msgstr "Tryck MELLANSLAG foer att fortsaetta" -#: src/Game.cpp:746 +#: src/Game.cpp:754 msgid "Land now" msgstr "Landa nu" -#: src/Game.cpp:768 +#: src/Game.cpp:776 #, c-format msgid "Level %d" msgstr "Bana %d" -#: src/Game.cpp:787 +#: src/Game.cpp:795 msgid "Paused" msgstr "Pausat" -#: src/HighScores.cpp:177 +#: src/HighScores.cpp:184 msgid "Press SPACE or FIRE to return" msgstr "Tryck MELLANSLAG eller SKJUT foer att aatergaa" -#: src/HighScores.cpp:192 +#: src/HighScores.cpp:199 msgid "Well done - You got a high score" msgstr "Bra jobbat - du slog rekord" -#: src/HighScores.cpp:197 +#: src/HighScores.cpp:204 msgid "Press ENTER or FIRE to continue" msgstr "Tryck RETUR eller SKJUT foer att fortsaetta" -#: src/HighScores.cpp:203 +#: src/HighScores.cpp:210 #, c-format msgid "Name? %s" msgstr "Namn? %s" -#: src/Options.cpp:262 +#: src/Options.cpp:264 msgid "Use UP and DOWN to select options" msgstr "Anvaend UPP och NED foer att vaelja alternativ" -#: src/Options.cpp:267 +#: src/Options.cpp:269 msgid "Use LEFT and RIGHT to change values" msgstr "Anvaend VAENSTER och HOEGER foer att aendra vaerden" -#: src/Options.cpp:272 +#: src/Options.cpp:274 msgid "Press FIRE or RETURN to exit" msgstr "Tryck SKJUT eller RETUR foer att avsluta" -#: src/Options.cpp:279 +#: src/Options.cpp:281 msgid "Please restart the game to change the resolution" msgstr "" -#: src/Menu.cpp:245 +#: src/Menu.cpp:247 msgid "Use the arrow keys to rotate the ship" msgstr "Anvaend piltangenterna foer att rotera skeppet" -#: src/Menu.cpp:246 +#: src/Menu.cpp:248 msgid "Press the up arrow to fire the thruster" msgstr "Tryck upp-piltagenten foer att anvaenda raketmotorn" -#: src/Menu.cpp:247 +#: src/Menu.cpp:249 msgid "Smaller landing pads give you more points" msgstr "Mindre landningsplattor ger dig fler poaeng" -#: src/Menu.cpp:248 +#: src/Menu.cpp:250 msgid "Press P to pause the game" msgstr "Tryck P för att pausa spelet" -#: src/Menu.cpp:249 +#: src/Menu.cpp:251 msgid "Press escape to self destruct" msgstr "Tryck escape för att tillintetgoera dig sjaelv" -#: src/Menu.cpp:250 +#: src/Menu.cpp:252 msgid "You can only land safely when then speed bar is green" msgstr "Du kan bara landa saekert naer hastighetsmaetaren aer groen" -#: src/Menu.cpp:251 +#: src/Menu.cpp:253 msgid "Collect the spinning rings to unlock the landing pads" msgstr "Samla de snurrande ringarna för att laasa upp landningsplattorna" diff --git a/src/Makefile.am b/src/Makefile.am index ca67fb2..6196480 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ AM_CXXFLAGS=$(LANDER_CFLAGS) $(SDL_CFLAGS) -Wall AM_LDFLAGS=$(LANDER_LIBS) $(SDL_LIBS) $(BOOST_FILESYSTEM_LIB) -lGLU $(LTLIBINTL) lander_SOURCES = Main.cpp Game.hpp Game.cpp \ Font.cpp Font.hpp HighScores.cpp HighScores.hpp Input.cpp \ - Input.hpp Platform.hpp LoadOnce.hpp GraphicsFwd.hpp \ + Input.hpp Platform.hpp GraphicsFwd.hpp \ OpenGL.cpp OpenGL.hpp Menu.cpp Menu.hpp Emitter.cpp \ Emitter.hpp ScreenManager.cpp ScreenManager.hpp \ ObjectGrid.hpp ObjectGrid.cpp Asteroid.hpp Asteroid.cpp \ -- 2.39.2