-Fix bugs where resources from source directory weren't always found

-Create a complete german translation as example

SVN-Revision: 2245

diff --git a/.cvsignore b/.cvsignore
index fd7e01b..9b6b3ac 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -26,4 +26,4 @@ supertux
 *.exe
 config.h.in
 .sconf_temp
-
+.emacs

diff --git a/data/levels/bonus1/abednego-level1.stl b/data/levels/bonus1/abednego-level1.stl
index 1836977..2a8b273 100644 (file)
--- a/data/levels/bonus1/abednego-level1.stl
+++ b/data/levels/bonus1/abednego-level1.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "Abednego")
-  (name "Flight Test")
+  (name (_ "Flight Test"))
   (width  550)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/abednego-level2.stl b/data/levels/bonus1/abednego-level2.stl
index 3f71b16..9705590 100644 (file)
--- a/data/levels/bonus1/abednego-level2.stl
+++ b/data/levels/bonus1/abednego-level2.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "Abednego")
-  (name "Dungeons but no Dragons")
+  (name (_ "Dungeons but no Dragons"))
   (width  300)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/abednego-level3.stl b/data/levels/bonus1/abednego-level3.stl
index cf6f201..2759616 100644 (file)
--- a/data/levels/bonus1/abednego-level3.stl
+++ b/data/levels/bonus1/abednego-level3.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "Abednego")
-  (name "Lies!")
+  (name (_ "Lies!"))
   (width  300)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/abednego-level4.stl b/data/levels/bonus1/abednego-level4.stl
index 54e5bba..9a03c5a 100644 (file)
--- a/data/levels/bonus1/abednego-level4.stl
+++ b/data/levels/bonus1/abednego-level4.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "Abednego")
-  (name "Train Leaves in One Minute")
+  (name (_ "Train Leaves in One Minute"))
   (width  500)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/bonus-level1.stl b/data/levels/bonus1/bonus-level1.stl
index 38f056c..4b1a831 100644 (file)
--- a/data/levels/bonus1/bonus-level1.stl
+++ b/data/levels/bonus1/bonus-level1.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Bonus Dias!")
+  (name (_ "Bonus Dias!"))
   (width  300)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/bonus-level2.stl b/data/levels/bonus1/bonus-level2.stl
index ebd9379..eba3d9c 100644 (file)
--- a/data/levels/bonus1/bonus-level2.stl
+++ b/data/levels/bonus1/bonus-level2.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Castle Gate")
+  (name (_ "Castle Gate"))
   (width  500)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/bonus-level3.stl b/data/levels/bonus1/bonus-level3.stl
index 3fb3df2..e2d5b93 100644 (file)
--- a/data/levels/bonus1/bonus-level3.stl
+++ b/data/levels/bonus1/bonus-level3.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "A Long Way Home")
+  (name (_ "A Long Way Home"))
   (width  500)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/bonus-level4.stl b/data/levels/bonus1/bonus-level4.stl
index 7d49d6c..9117a5a 100644 (file)
--- a/data/levels/bonus1/bonus-level4.stl
+++ b/data/levels/bonus1/bonus-level4.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Bonus Island Castle")
+  (name (_ "Bonus Island Castle"))
   (width  500)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/bonus-level5.stl b/data/levels/bonus1/bonus-level5.stl
index a367de4..fa72e53 100644 (file)
--- a/data/levels/bonus1/bonus-level5.stl
+++ b/data/levels/bonus1/bonus-level5.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Area 42")
+  (name (_ "Area 42"))
   (width  1042)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/de.po b/data/levels/bonus1/de.po
index e7ff6e7..7352337 100644 (file)
--- a/data/levels/bonus1/de.po
+++ b/data/levels/bonus1/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bonus 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 02:33+0100\n"
+"POT-Creation-Date: 2004-12-06 18:08+0100\n"
 "PO-Revision-Date: 2004-12-02 02:34+0100\n"
 "Last-Translator:  <matze@braunis.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -17,13 +17,66 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/levels/bonus1/bonus-level4.stl:5
+#, fuzzy
+msgid "Bonus Island Castle"
+msgstr "Bonusinsel I"
+
+#: data/levels/bonus1/bonus-level5.stl:5
+msgid "Area 42"
+msgstr "Area 42"
+
+#: data/levels/bonus1/info:3 data/levels/bonus1/worldmap.stwm:4
+msgid "Bonus Island I"
+msgstr "Bonusinsel I"
+
+#: data/levels/bonus1/matr1x-level1.stl:5
+msgid "Pipe Down Over There"
+msgstr "Leg die Rohre mal herüber"
+
+#: data/levels/bonus1/matr1x-level2.stl:5
+msgid "Something Fishy"
+msgstr "Etwas fischiges"
+
+#: data/levels/bonus1/matr1x-level3.stl:5
+msgid "Fire In The Sky"
+msgstr "Feuer im Himmel"
+
 #: data/levels/bonus1/wansti-level1.stl:5
 msgid "Semi-Frozen"
 msgstr "Halb-Gefroren"
 
-#: data/levels/bonus1/worldmap.stwm:4
-msgid "Bonus Island I"
-msgstr "Bonusinsel I"
+#: data/levels/bonus1/wansti-level2.stl:5
+msgid "Cave Of Mirrors"
+msgstr "Spiegelsaal"
+
+#: data/levels/bonus1/wansti-level3.stl:5
+msgid "A Maze In The Sky"
+msgstr "Ein Labyrinth im Himmel"
+
+#: data/levels/bonus1/wansti-level4.stl:5
+msgid "Collapse Imminent!"
+msgstr "Einsturzgefährdet"
+
+#: data/levels/bonus1/wansti-level5.stl:5
+msgid "Tip Of The Iceberg"
+msgstr "Die Spietze des Eisbergs"
+
+#: data/levels/bonus1/abednego-level1.stl:5
+msgid "Flight Test"
+msgstr "Flugprüfung"
+
+#: data/levels/bonus1/abednego-level2.stl:5
+msgid "Dungeons but no Dragons"
+msgstr "Verliese, aber keine Drachen"
+
+#: data/levels/bonus1/abednego-level3.stl:5
+msgid "Lies!"
+msgstr "Lügen!"
+
+#: data/levels/bonus1/abednego-level4.stl:5
+msgid "Train Leaves in One Minute"
+msgstr "Der Zug fährt in einer Minute ab"
 
 #: data/levels/bonus1/worldmap.stwm:131
 msgid "You found a secret place!"
@@ -76,3 +129,85 @@ msgstr "Torfis Territorium verlassen"
 #: data/levels/bonus1/worldmap.stwm:207
 msgid "Warp home"
 msgstr "Nach Hause beamen"
+
+#: data/levels/bonus1/thompson-level1.stl:5
+msgid "Have I been here before?"
+msgstr "War ich hier schon mal?"
+
+#: data/levels/bonus1/thompson-level2.stl:5
+msgid "Bad Guys Stink!"
+msgstr "Monster sind doof!"
+
+#: data/levels/bonus1/torfi-level1.stl:4
+msgid "A good start"
+msgstr "Ein guter Anfang"
+
+#: data/levels/bonus1/torfi-level2.stl:5
+msgid "Too easy"
+msgstr "Zu einfach"
+
+#: data/levels/bonus1/torfi-level3.stl:5
+msgid "Still too easy"
+msgstr "Immer noch zu einfach"
+
+#: data/levels/bonus1/extro.txt:3
+msgid ""
+"-Congratulations!\n"
+"\n"
+"#You have successfully finished\n"
+"#Bonus Island I\n"
+"\n"
+"\tfeaturing levels contributed by\n"
+"\tJason W. Thompson\n"
+"\tTorfi Gunnarsson\n"
+"\tAbednego\n"
+"\tMatr1x\n"
+"\n"
+"\t\n"
+"#If you didn't clear all levels yet,\n"
+"#find your way back home and take \n"
+"#another path. There is still more\n"
+"#challenge waiting for you!\n"
+"\n"
+"#And there is a secret level to be\n"
+"#found as well...\n"
+"\t\n"
+"#A big \"Thank you\" goes out to\n"
+"#everyone who contributed to this\n"
+"#release. We hope you enjoyed it!"
+msgstr ""
+"-Herzlichen Glückwunsch!\n"
+"\n"
+"#Du hast die Bonusinsel I\n"
+"#erfolgreich abgeschlossen.\n"
+"\n"
+"\tPräsentiert wurden Levels von\n"
+"\tJason W. Thompson\n"
+"\tTorfi Gunnarsson\n"
+"\tAbednego\n"
+"\tMatr1x\n"
+"\n"
+"\t\n"
+"#Wenn du noch nicht alle Levels gespielt\n"
+"#hast suche den Weg zurück nach Hause\n"
+"#und gehe einen anderen Weg. Es erwarten\n"
+"#dich noch mehr Herausforderungen!\n"
+"\n"
+"#Und man kann auch einen geheimen Level\n"
+"#entdecken...\n"
+"\n"
+"#Ein herzliches \"Dankeschön\" an alle\n"
+"#die an diesem Release mitgewirkt haben.\n"
+"#Wir hoffen es hat ihnen gefallen!"
+
+#: data/levels/bonus1/bonus-level1.stl:5
+msgid "Bonus Dias!"
+msgstr "Bonus Dias!"
+
+#: data/levels/bonus1/bonus-level2.stl:5
+msgid "Castle Gate"
+msgstr "Burgtor"
+
+#: data/levels/bonus1/bonus-level3.stl:5
+msgid "A Long Way Home"
+msgstr "Ein langer Weg nach Hause"

diff --git a/data/levels/bonus1/extro.txt b/data/levels/bonus1/extro.txt
index f613385..affea77 100644 (file)
--- a/data/levels/bonus1/extro.txt
+++ b/data/levels/bonus1/extro.txt
@@ -20,8 +20,8 @@
 #And there is a secret level to be
 #found as well...
        
-#A big "Thank you" goes out to
+#A big \"Thank you\" goes out to
 #everyone who contributed to this
-#release. We hope you enjoyed it!))
+#release. We hope you enjoyed it!"))
 )
 

diff --git a/data/levels/bonus1/matr1x-level1.stl b/data/levels/bonus1/matr1x-level1.stl
index d66b8e7..894826c 100644 (file)
--- a/data/levels/bonus1/matr1x-level1.stl
+++ b/data/levels/bonus1/matr1x-level1.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "matr1x")
-  (name "Pipe Down Over There")
+  (name (_ "Pipe Down Over There"))
   (width  500)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/matr1x-level2.stl b/data/levels/bonus1/matr1x-level2.stl
index e5597ad..ef05a37 100644 (file)
--- a/data/levels/bonus1/matr1x-level2.stl
+++ b/data/levels/bonus1/matr1x-level2.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "Matr1x")
-  (name "Something Fishy")
+  (name (_ "Something Fishy"))
   (width  505)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/matr1x-level3.stl b/data/levels/bonus1/matr1x-level3.stl
index 5b63c44..66baa85 100644 (file)
--- a/data/levels/bonus1/matr1x-level3.stl
+++ b/data/levels/bonus1/matr1x-level3.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "Matr1x")
-  (name "Fire In The Sky")
+  (name (_ "Fire In The Sky"))
   (width  500)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/thompson-level1.stl b/data/levels/bonus1/thompson-level1.stl
index e51bab6..36a17a4 100644 (file)
--- a/data/levels/bonus1/thompson-level1.stl
+++ b/data/levels/bonus1/thompson-level1.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "Jason Thompson")
-  (name "Have I been here before?")
+  (name (_ "Have I been here before?"))
   (width  215)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/thompson-level2.stl b/data/levels/bonus1/thompson-level2.stl
index 43b7835..c7d577b 100644 (file)
--- a/data/levels/bonus1/thompson-level2.stl
+++ b/data/levels/bonus1/thompson-level2.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "Jason W. Thompson")
-  (name "Bad Guys Stink!")
+  (name (_ "Bad Guys Stink!"))
   (width  500)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/torfi-level1.stl b/data/levels/bonus1/torfi-level1.stl
index 69be55f..3851132 100644 (file)
--- a/data/levels/bonus1/torfi-level1.stl
+++ b/data/levels/bonus1/torfi-level1.stl
@@ -1,7 +1,7 @@
 ;SuperTux-Level
 (supertux-level
   (version 1)
-  (name "A good start")
+  (name (_ "A good start"))
   (author "Torfi Gunnarsson")
   (music "Mortimers_chipdisko.mod")
   (background "arctis.jpg")

diff --git a/data/levels/bonus1/torfi-level2.stl b/data/levels/bonus1/torfi-level2.stl
index ff800ed..0d73ce1 100644 (file)
--- a/data/levels/bonus1/torfi-level2.stl
+++ b/data/levels/bonus1/torfi-level2.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "Torfi Gunnarsson")
-  (name "Too easy")
+  (name (_ "Too easy"))
   (width  240)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/torfi-level3.stl b/data/levels/bonus1/torfi-level3.stl
index 78e85d6..ceb518f 100644 (file)
--- a/data/levels/bonus1/torfi-level3.stl
+++ b/data/levels/bonus1/torfi-level3.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "Torfi Gunnarsson")
-  (name "Still too easy")
+  (name (_ "Still too easy"))
   (width  200)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/wansti-level2.stl b/data/levels/bonus1/wansti-level2.stl
index 1c79333..ec6010f 100644 (file)
--- a/data/levels/bonus1/wansti-level2.stl
+++ b/data/levels/bonus1/wansti-level2.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Cave Of Mirrors")
+  (name (_ "Cave Of Mirrors"))
   (width  500)
   (height 15)
   (start_pos_x    170)

diff --git a/data/levels/bonus1/wansti-level3.stl b/data/levels/bonus1/wansti-level3.stl
index 7f79b95..764fe47 100644 (file)
--- a/data/levels/bonus1/wansti-level3.stl
+++ b/data/levels/bonus1/wansti-level3.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "A Maze In The Sky")
+  (name (_ "A Maze In The Sky"))
   (width  515)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/wansti-level4.stl b/data/levels/bonus1/wansti-level4.stl
index f5be5ef..dd23198 100644 (file)
--- a/data/levels/bonus1/wansti-level4.stl
+++ b/data/levels/bonus1/wansti-level4.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Collapse Imminent!")
+  (name (_ "Collapse Imminent!"))
   (width  500)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/bonus1/wansti-level5.stl b/data/levels/bonus1/wansti-level5.stl
index d8c9471..46d14bb 100644 (file)
--- a/data/levels/bonus1/wansti-level5.stl
+++ b/data/levels/bonus1/wansti-level5.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Tip Of The Iceberg")
+  (name (_ "Tip Of The Iceberg"))
   (width  550)
   (height 15)
   (start_pos_x    100)

diff --git a/data/levels/contribs/level3.stl b/data/levels/contribs/level3.stl
index 892d8d6..4a88ea9 100644 (file)
--- a/data/levels/contribs/level3.stl
+++ b/data/levels/contribs/level3.stl
@@ -1,7 +1,7 @@
 ;SuperTux-Level
 (supertux-level
   (version 1)
-  (name "Een weg door de wolken")
+  (name (_ "Een weg door de wolken"))
   (author "Tobe Deprez")
   (music "Mortimers_chipdisko.mod")
   (background "")

diff --git a/data/levels/world1/de.po b/data/levels/world1/de.po
index e9b5543..5a64ad4 100644 (file)
--- a/data/levels/world1/de.po
+++ b/data/levels/world1/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: world 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-05 17:38+0100\n"
+"POT-Creation-Date: 2004-12-06 10:10+0100\n"
 "PO-Revision-Date: 2004-12-02 02:25+0100\n"
 "Last-Translator:  <matze@braunis.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -66,7 +66,75 @@ msgstr ""
 
 #: data/levels/world1/worldmap.stwm:4
 msgid "Icyisland"
-msgstr ""
+msgstr "Eisige Insel"
+
+#: data/levels/world1/level10.stl:5
+msgid "23rd Airborne"
+msgstr "23 Mann Luftverteidigung"
+
+#: data/levels/world1/level11.stl:5
+msgid "Night Chill"
+msgstr "Kalte Nacht"
+
+#: data/levels/world1/level12.stl:5
+msgid "Into the Stars"
+msgstr "Zu den Sternen"
+
+#: data/levels/world1/level13.stl:5
+msgid "Above the Arctic Skies"
+msgstr "Über den Wolken"
+
+#: data/levels/world1/level14.stl:5
+msgid "Entrance to the Cave"
+msgstr "Höhleneingang"
+
+#: data/levels/world1/level15.stl:5
+msgid "Under the Ice"
+msgstr "Unter dem Eis"
+
+#: data/levels/world1/level16.stl:5
+msgid "Living in a Fridge"
+msgstr "Leben im Kühlschrank"
+
+#: data/levels/world1/level17.stl:5
+msgid "'...or is it just me?'"
+msgstr "'... oder bin ich das?'"
+
+#: data/levels/world1/level18.stl:5
+msgid "Ice in the Hole"
+msgstr "Eisloch"
+
+#: data/levels/world1/level19.stl:5
+msgid "Miyamoto Monument"
+msgstr "Miyamoto Monument"
+
+#: data/levels/world1/level20.stl:5
+msgid "End of the Tunnel"
+msgstr "Licht am Ende des Tunnels"
+
+#: data/levels/world1/level21.stl:5
+msgid "A Path in the Clouds"
+msgstr "Ein Pfad durch die Wolken"
+
+#: data/levels/world1/level22.stl:5
+msgid "No more Mr Ice Guy"
+msgstr "Genug Eisjungs"
+
+#: data/levels/world1/level23.stl:5
+msgid "The Escape"
+msgstr "Die Flucht"
+
+#: data/levels/world1/level24.stl:5
+msgid "The Shattered Bridge"
+msgstr "Brückentrümmer"
+
+#: data/levels/world1/level25.stl:5
+msgid "Arctic Ruins"
+msgstr "arktische Ruinen"
+
+#: data/levels/world1/level26.stl:5
+msgid "The Castle of Nolok"
+msgstr "Noloks Festung"
 
 #: data/levels/world1/level1.stl:5
 msgid "Welcome to Antarctica"
@@ -78,7 +146,31 @@ msgstr "Die Reise Beginnt"
 
 #: data/levels/world1/level3.stl:5
 msgid "Via Nostalgica"
-msgstr ""
+msgstr "Nostalgiestraße"
+
+#: data/levels/world1/level4.stl:5
+msgid "Tobgle Road"
+msgstr "Tobgle Weg"
+
+#: data/levels/world1/level5.stl:5
+msgid "The Somewhat Smaller Bath"
+msgstr "Der etwas schmallere Weg"
+
+#: data/levels/world1/level6.stl:5
+msgid "The Frosted Fields"
+msgstr "Eisige Felder"
+
+#: data/levels/world1/level7.stl:5
+msgid "Oh no! More Snowballs!"
+msgstr "Oh Nein! Noch mehr Schneebälle!"
+
+#: data/levels/world1/level8.stl:5
+msgid "Stone Cold"
+msgstr "Steinkalt"
+
+#: data/levels/world1/level9.stl:5
+msgid "Grumbel's Sense of Snow"
+msgstr "Grumbels Schneegespür"
 
 #: data/levels/world1/extro.txt:7
 #, fuzzy

diff --git a/data/levels/world1/level1.stl b/data/levels/world1/level1.stl
index 79ae25f..fafc4dc 100644 (file)
--- a/data/levels/world1/level1.stl
+++ b/data/levels/world1/level1.stl
@@ -3,9 +3,6 @@
   (version 1)
   (author "SuperTux Team")
   (name (_ "Welcome to Antarctica"))
-  (name-pt_PT "Bem-vindo à Antártida")
-  (name-de "Willkommen in Antarctica")
-  (name-es "Bienvenido a la Antártida")
   (width  310)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level10.stl b/data/levels/world1/level10.stl
index 8c56922..89b0cd2 100644 (file)
--- a/data/levels/world1/level10.stl
+++ b/data/levels/world1/level10.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "23rd Airborne")
-  (name-de "23 Mann Luftverteidigung")
-  (name-es "23º aerotransportado")
-  (name-pt_PT "23º aerotransportado")
+  (name (_ "23rd Airborne"))
   (width  515)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level11.stl b/data/levels/world1/level11.stl
index c880e04..f45f92b 100644 (file)
--- a/data/levels/world1/level11.stl
+++ b/data/levels/world1/level11.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Night Chill")
-  (name-pt_PT "Noite Fria")
-  (name-de "Eine kalte Nacht")
-  (name-es "Noche fria")
+  (name (_ "Night Chill"))
   (width  515)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level12.stl b/data/levels/world1/level12.stl
index c3da6b2..b57c5bb 100644 (file)
--- a/data/levels/world1/level12.stl
+++ b/data/levels/world1/level12.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Into the Stars")
-  (name-pt_PT "Até às Estrelas")
-  (name-de "Griff nach den Sternen")
-  (name-es "Entre las estrellas")
+  (name (_ "Into the Stars"))
   (width  520)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level13.stl b/data/levels/world1/level13.stl
index 0da03eb..4f1d3a8 100644 (file)
--- a/data/levels/world1/level13.stl
+++ b/data/levels/world1/level13.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Above the Arctic Skies")
+  (name (_ "Above the Arctic Skies"))
   (width  290)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level14.stl b/data/levels/world1/level14.stl
index 6b28a41..7da7d1f 100644 (file)
--- a/data/levels/world1/level14.stl
+++ b/data/levels/world1/level14.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Entrance to the Cave")
-  (name-pt_PT "Entrada para a Gruta")
-  (name-de "Eingang der Höhle")
-  (name-es "Entrada a la cueva")
+  (name (_ "Entrance to the Cave"))
   (width  510)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level15.stl b/data/levels/world1/level15.stl
index 71c0ee9..ecab7d5 100644 (file)
--- a/data/levels/world1/level15.stl
+++ b/data/levels/world1/level15.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Under the Ice")
-  (name-pt_PT "Debaixo do Gelo")
-  (name-de "Unter dem Eis")
-  (name-es "Bajo el hielo")
+  (name (_ "Under the Ice"))
   (width  510)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level16.stl b/data/levels/world1/level16.stl
index fe5ea79..cfe82bc 100644 (file)
--- a/data/levels/world1/level16.stl
+++ b/data/levels/world1/level16.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Living in a Fridge")
-  (name-pt_PT "Vivendo numa Frigideira")
-  (name-de "Leben im Kühlschrank")
-  (name-es "Viviendo en un frigorífico")
+  (name (_ "Living in a Fridge"))
   (width  510)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level17.stl b/data/levels/world1/level17.stl
index 45054d9..0c5be8a 100644 (file)
--- a/data/levels/world1/level17.stl
+++ b/data/levels/world1/level17.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "'...or is it just me?'")
-  (name-pt_PT "'... ou é apenas de mim?'")
-  (name-de "'...oder bin ich das?'")
-  (name-es "'...o, ¿eso es solo mio?'")
+  (name (_ "'...or is it just me?'"))
   (width  515)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level18.stl b/data/levels/world1/level18.stl
index 95ec2d1..31d8b0b 100644 (file)
--- a/data/levels/world1/level18.stl
+++ b/data/levels/world1/level18.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Ice in the Hole")
-  (name-pt_PT "Gelo no Buraco")
-  (name-de "Eisiges Loch")
-  (name-es "Hielo en el agujero")
+  (name (_ "Ice in the Hole"))
   (width  500)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level19.stl b/data/levels/world1/level19.stl
index 290b918..eba5cd1 100644 (file)
--- a/data/levels/world1/level19.stl
+++ b/data/levels/world1/level19.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Miyamoto Monument")
+  (name (_ "Miyamoto Monument"))
   (width  505)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level2.stl b/data/levels/world1/level2.stl
index f60a401..2575f36 100644 (file)
--- a/data/levels/world1/level2.stl
+++ b/data/levels/world1/level2.stl
@@ -3,9 +3,6 @@
   (version 1)
   (author "SuperTux Team")
   (name (_ "The Journey Begins"))
-  (name-pt_PT "A Aventura Começa")
-  (name-de "Das Abenteuer beginnt")
-  (name-es "La aventura comienza")
   (width  300)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level20.stl b/data/levels/world1/level20.stl
index 08dc613..8de394a 100644 (file)
--- a/data/levels/world1/level20.stl
+++ b/data/levels/world1/level20.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "End of the Tunnel")
+  (name (_ "End of the Tunnel"))
   (width  510)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level21.stl b/data/levels/world1/level21.stl
index 7a7aed9..d5a0dbe 100644 (file)
--- a/data/levels/world1/level21.stl
+++ b/data/levels/world1/level21.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "A Path in the Clouds")
+  (name (_ "A Path in the Clouds"))
   (width  525)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level22.stl b/data/levels/world1/level22.stl
index 443eb0b..802ee22 100644 (file)
--- a/data/levels/world1/level22.stl
+++ b/data/levels/world1/level22.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "No more Mr Ice Guy")
+  (name (_ "No more Mr Ice Guy"))
   (width  260)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level23.stl b/data/levels/world1/level23.stl
index 0d11f0f..533cc2a 100644 (file)
--- a/data/levels/world1/level23.stl
+++ b/data/levels/world1/level23.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "The Escape")
+  (name (_ "The Escape"))
   (width  515)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level24.stl b/data/levels/world1/level24.stl
index 2a7729f..a59f639 100644 (file)
--- a/data/levels/world1/level24.stl
+++ b/data/levels/world1/level24.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "The Shattered Bridge")
+  (name (_ "The Shattered Bridge"))
   (width  525)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level25.stl b/data/levels/world1/level25.stl
index 1a82052..ccfd0a0 100644 (file)
--- a/data/levels/world1/level25.stl
+++ b/data/levels/world1/level25.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Arctic Ruins")
+  (name (_ "Arctic Ruins"))
   (width  500)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level26.stl b/data/levels/world1/level26.stl
index bf1e36c..52af070 100644 (file)
--- a/data/levels/world1/level26.stl
+++ b/data/levels/world1/level26.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "The Castle of Nolok")
+  (name (_ "The Castle of Nolok"))
   (width  525)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level4.stl b/data/levels/world1/level4.stl
index b99b156..91b118a 100644 (file)
--- a/data/levels/world1/level4.stl
+++ b/data/levels/world1/level4.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Tobgle Road")
-  (name-pt_PT "A Estrada Tobgle")
-  (name-de "Tobgle Passage")
-  (name-es "Camino de Tobgle")
+  (name (_ "Tobgle Road"))
   (width  270)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level5.stl b/data/levels/world1/level5.stl
index 5849c8c..3b4451a 100644 (file)
--- a/data/levels/world1/level5.stl
+++ b/data/levels/world1/level5.stl
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "Philippe Saint-Pierre")
-  (name "The Somewhat Smaller Bath")
+  (name (_ "The Somewhat Smaller Bath"))
   (width  355)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level6.stl b/data/levels/world1/level6.stl
index bf81c11..8cc7741 100644 (file)
--- a/data/levels/world1/level6.stl
+++ b/data/levels/world1/level6.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "The Frosted Fields")
-  (name-pt_PT "Os Campos Congelados")
-  (name-de "Vereiste Felder")
-  (name-es "Los campos helados")
+  (name (_ "The Frosted Fields"))
   (width  510)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level7.stl b/data/levels/world1/level7.stl
index 6648a39..db6b6f6 100644 (file)
--- a/data/levels/world1/level7.stl
+++ b/data/levels/world1/level7.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "Voluptuous Pachyderm")
-  (name "Oh no! More Snowballs!")
-  (name-pt_PT "Oh não! Mais Bolas de Neve!")
-  (name-de "Oh nein! Noch mehr Schneebälle!")
-  (name-es "¡O no!¡Más bolas de nieve!")
+  (name (_ "Oh no! More Snowballs!"))
   (width  525)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level8.stl b/data/levels/world1/level8.stl
index b628975..e06e03d 100644 (file)
--- a/data/levels/world1/level8.stl
+++ b/data/levels/world1/level8.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Stone Cold")
-  (name-pt_PT "Pedra Gelada")
-  (name-de "Kalt wie Stein")
-  (name-es "Piedra fría")
+  (name (_ "Stone Cold"))
   (width  520)
   (height 19)
   (start_pos_x    100)

diff --git a/data/levels/world1/level9.stl b/data/levels/world1/level9.stl
index 2386cfb..84ec757 100644 (file)
--- a/data/levels/world1/level9.stl
+++ b/data/levels/world1/level9.stl
@@ -2,10 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Grumbel's Sense of Snow")
-  (name-pt_PT "Sensação de Neve do Grumbel")
-  (name-de "Grumbels Gespür für Schnee")
-  (name-es "Sensación de nieve de Grumbel")
+  (name (_ "Grumbel's Sense of Snow"))
   (width  525)
   (height 19)
   (start_pos_x    100)

diff --git a/data/locale/de.po b/data/locale/de.po
index 04356dc..c256976 100644 (file)
--- a/data/locale/de.po
+++ b/data/locale/de.po
@@ -7,248 +7,436 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.1.1\n"
-"Report-Msgid-Bugs-To: super-tux-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2004-10-20 14:06-0600\n"
-"PO-Revision-Date: 2004-06-03 00:29+0200\n"
-"Last-Translator:  <matze@braunis.de>\n"
+"POT-Creation-Date: 2004-12-05 18:22+0100\n"
+"PO-Revision-Date: 2004-12-06 18:26+0100\n"
+"Last-Translator: Matze Braun <matze@braunis.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/gameloop.cpp:205
-msgid "by "
-msgstr ""
+#: 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/gameloop.cpp:211
-msgid "Level Vertically Flipped!"
+#: 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/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/title.cpp:350
+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/gameloop.cpp:215
+#: src/title.cpp:404
+msgid "Are you sure you want to delete slot"
+msgstr "Sind sie sicher, dass sie den Spielstand löschen wollen?"
+
+#: src/gameloop.cpp:204
+msgid "contributed by "
+msgstr "von"
+
+#: src/gameloop.cpp:209
 msgid "Best Level Statistics"
-msgstr ""
+msgstr "Bester Level Statistik"
 
-#: src/gameloop.cpp:670
+#: src/gameloop.cpp:646
 msgid "PAUSE - Press 'P' To Play"
-msgstr ""
+msgstr "PAUSE - Drücke 'P' zum Spielen"
 
-#: src/gameloop.cpp:675
+#: src/gameloop.cpp:651
 msgid "Playing: "
-msgstr ""
-
-#: src/gameloop.cpp:850 src/worldmap.cpp:1111
-msgid "SCORE"
-msgstr ""
+msgstr "Spiele:"
 
-#: src/gameloop.cpp:855
+#: src/gameloop.cpp:848
 msgid "Press ESC To Return"
-msgstr ""
+msgstr "Drücke ESC um zurückzukehren"
 
-#: src/gameloop.cpp:860
+#: src/gameloop.cpp:853
 msgid "TIME's UP"
-msgstr ""
+msgstr "Zeit ist um"
 
-#: src/gameloop.cpp:864
+#: src/gameloop.cpp:858
 msgid "TIME"
-msgstr ""
-
-#: src/gameloop.cpp:871 src/gameloop.cpp:872 src/worldmap.cpp:1115
-msgid "COINS"
-msgstr ""
-
-#: src/gameloop.cpp:893 src/gameloop.cpp:894 src/worldmap.cpp:1136
-#: src/worldmap.cpp:1137
-msgid "LIVES"
-msgstr ""
+msgstr "Zeit"
 
 #: src/gameloop.cpp:916
 msgid "Result:"
-msgstr ""
+msgstr "Ergebnis:"
 
 #: src/gameloop.cpp:919
 #, c-format
 msgid "SCORE: %d"
-msgstr ""
+msgstr "Punkte: %d"
 
-#: src/gameloop.cpp:922 src/worldmap.cpp:955
-#, c-format
-msgid "COINS: %d"
-msgstr ""
-
-#: src/gameloop.cpp:956
+#: src/gameloop.cpp:950
 msgid "Slot"
-msgstr ""
+msgstr "Speicherplatz"
 
-#: src/gameloop.cpp:956
+#: src/gameloop.cpp:951
 msgid "Free"
-msgstr ""
+msgstr "frei"
 
-#: src/leveleditor.cpp:64
-msgid "Load Subset"
-msgstr ""
+#: src/statistics.cpp:111
+msgid "- Best Level Statistics -"
+msgstr "- Beste level Statistik -"
 
-#: src/leveleditor.cpp:70 src/leveleditor.cpp:80 src/misc.cpp:125
-#: src/misc.cpp:136 src/misc.cpp:149 src/misc.cpp:160 src/title.cpp:142
-#: src/title.cpp:220
-msgid "Back"
-msgstr ""
+#: src/statistics.cpp:115
+msgid "Max score:"
+msgstr "Max Punkte:"
 
-#: src/leveleditor.cpp:73
+#: src/statistics.cpp:135
+msgid "Max coins collected:"
+msgstr "Max Münzen gesammelt:"
+
+#: src/statistics.cpp:137
+msgid "Max fragging:"
+msgstr "Max besiegt:"
+
+#: src/statistics.cpp:139
+msgid "Min time needed:"
+msgstr "Min Zeit benötigt:"
+
+#: src/statistics.cpp:168
+#, c-format
+msgid "Max score:             %d"
+msgstr "Max Punkte: %d"
+
+#: src/statistics.cpp:174
+#, c-format
+msgid "Max coins collected:   %d / %d"
+msgstr "Max Münzen gesammelt: %d / %d"
+
+#: src/statistics.cpp:178
+#, c-format
+msgid "Max fragging:          %d / %d"
+msgstr "Max besiegt: %d / %d"
+
+#: src/statistics.cpp:182
+#, c-format
+msgid "Min time needed:       %d / %d"
+msgstr "Min Zeit benötigt: %d / %d"
+
+#: src/misc.cpp:97
+#: src/misc.cpp:156
+msgid "Start Game"
+msgstr "Spiel Beginnen"
+
+#: src/misc.cpp:99
+#: src/misc.cpp:104
+#: src/misc.cpp:179
+#: src/misc.cpp:186
+msgid "Options"
+msgstr "Einstellungen"
+
+#: src/misc.cpp:100
+#: src/leveleditor.cpp:562
+msgid "Level Editor"
+msgstr "Level Editor"
+
+#: src/misc.cpp:101
+msgid "Credits"
+msgstr "Mitwirkende"
+
+#: src/misc.cpp:102
+msgid "Quit"
+msgstr "Beenden"
+
+#: src/misc.cpp:107
+msgid "OpenGL    "
+msgstr "OpenGL"
+
+#: src/misc.cpp:109
+msgid "OpenGL (not supported)"
+msgstr "OpenGL (nicht vorhanden)"
+
+#: src/misc.cpp:111
+msgid "Fullscreen"
+msgstr "Ganzer Bildschirm"
+
+#: src/misc.cpp:114
+#: src/misc.cpp:119
+msgid "Sound     "
+msgstr "Sound"
+
+#: src/misc.cpp:115
+#: src/misc.cpp:120
+msgid "Music     "
+msgstr "Musik"
+
+#: src/misc.cpp:122
+msgid "Show FPS  "
+msgstr "FPS anzeigen"
+
+#: src/misc.cpp:123
+msgid "Setup Keys"
+msgstr "Tasten einstellen"
+
+#: src/misc.cpp:126
+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"
+
+#: src/leveleditor.cpp:70
 msgid "New Level Subset"
-msgstr ""
+msgstr "Neues Level-subset"
 
-#: src/leveleditor.cpp:75
+#: src/leveleditor.cpp:72
 msgid "Filename   "
-msgstr ""
+msgstr "Dateiname"
 
-#: src/leveleditor.cpp:76
+#: src/leveleditor.cpp:73
 msgid "Title      "
-msgstr ""
+msgstr "Titel"
 
-#: src/leveleditor.cpp:77
+#: src/leveleditor.cpp:74
 msgid "Description"
-msgstr ""
+msgstr "Beschreibung"
 
-#: src/leveleditor.cpp:78
-#, fuzzy
+#: src/leveleditor.cpp:75
 msgid "Create"
-msgstr "Mitwirkende"
+msgstr "Erzeugen"
 
-#: src/leveleditor.cpp:83
-#, fuzzy
+#: src/leveleditor.cpp:80
 msgid "Level Editor Menu"
 msgstr "Level Editor"
 
-#: src/leveleditor.cpp:85
-#, fuzzy
+#: src/leveleditor.cpp:82
 msgid "Return to Level Editor"
-msgstr "Level Editor"
+msgstr "Zurück zum Level Editor"
 
-#: src/leveleditor.cpp:86
+#: src/leveleditor.cpp:83
 msgid "Create Level Subset"
-msgstr ""
+msgstr "Level-subset erstellen"
 
-#: src/leveleditor.cpp:87
+#: src/leveleditor.cpp:84
 msgid "Load Level Subset"
-msgstr ""
+msgstr "Level-subset laden"
 
-#: src/leveleditor.cpp:89
-#, fuzzy
+#: src/leveleditor.cpp:86
 msgid "Quit Level Editor"
-msgstr "Level Editor"
+msgstr "Level Editor Beenden"
 
-#: src/leveleditor.cpp:92
+#: src/leveleditor.cpp:89
 msgid "Level Settings"
-msgstr ""
+msgstr "Level-Einstellungen"
 
-#: src/leveleditor.cpp:94
+#: src/leveleditor.cpp:91
 msgid "Name    "
-msgstr ""
+msgstr "Name"
 
-#: src/leveleditor.cpp:95
+#: src/leveleditor.cpp:92
 msgid "Author  "
-msgstr ""
+msgstr "Autor"
 
-#: src/leveleditor.cpp:96
+#: src/leveleditor.cpp:93
 msgid "Width   "
-msgstr ""
+msgstr "Breite"
 
-#: src/leveleditor.cpp:97
+#: src/leveleditor.cpp:94
 msgid "Height  "
-msgstr ""
+msgstr "Höhe"
 
-#: src/leveleditor.cpp:99
+#: src/leveleditor.cpp:96
 msgid "Apply"
-msgstr ""
+msgstr "Anwenden"
 
-#: src/leveleditor.cpp:109
+#: src/leveleditor.cpp:104
 msgid "Eraser"
-msgstr ""
+msgstr "Radiergummie"
 
-#: src/leveleditor.cpp:141
+#: src/leveleditor.cpp:136
 msgid "Trampoline"
-msgstr ""
+msgstr "Trampolin"
 
-#: src/leveleditor.cpp:142
+#: src/leveleditor.cpp:137
 msgid "Flying Platform"
-msgstr ""
+msgstr "Fliegende Platform"
 
-#: src/leveleditor.cpp:143
-msgid "Door"
-msgstr ""
-
-#: src/leveleditor.cpp:146
+#: src/leveleditor.cpp:141
 msgid "Edtit foreground tiles"
-msgstr ""
+msgstr "Vordergrund Bearbeiten"
 
-#: src/leveleditor.cpp:148
+#: src/leveleditor.cpp:143
 msgid "Edit interactive tiles"
-msgstr ""
+msgstr "Interaktive Teile Bearbeiten"
 
-#: src/leveleditor.cpp:150
+#: src/leveleditor.cpp:145
 msgid "Edit background tiles"
-msgstr ""
+msgstr "Hintergrund Bearbeiten"
 
-#: src/leveleditor.cpp:154
+#: src/leveleditor.cpp:149
 msgid "Next sector"
-msgstr ""
+msgstr "Nächster Sektor"
 
-#: src/leveleditor.cpp:155
+#: src/leveleditor.cpp:150
 msgid "Prevous sector"
-msgstr ""
+msgstr "Letzter Sektor"
 
-#: src/leveleditor.cpp:156
+#: src/leveleditor.cpp:151
 msgid "Next level"
-msgstr ""
+msgstr "Nächster Level"
 
-#: src/leveleditor.cpp:157
+#: src/leveleditor.cpp:152
 msgid "Prevous level"
-msgstr ""
+msgstr "Letzter Level"
 
-#: src/leveleditor.cpp:158
-#, fuzzy
+#: src/leveleditor.cpp:153
 msgid "Save level"
-msgstr "Spiel Beginnen"
+msgstr "Level speichern"
 
-#: src/leveleditor.cpp:159
+#: src/leveleditor.cpp:154
 msgid "Test level"
-msgstr ""
+msgstr "Test Level"
 
-#: src/leveleditor.cpp:160
+#: src/leveleditor.cpp:155
 msgid "Setup level"
-msgstr ""
+msgstr "Level-Einstellungen"
 
-#: src/leveleditor.cpp:242 src/leveleditor.cpp:718 src/leveleditor.cpp:743
-#: src/leveleditor.cpp:834
+#: src/leveleditor.cpp:237
+#: src/leveleditor.cpp:727
+#: src/leveleditor.cpp:752
+#: src/leveleditor.cpp:841
 msgid "Level not saved. Wanna to?"
-msgstr ""
+msgstr "Level wurde noch nicht gespeichert. Jetzt speichern?"
 
-#: src/leveleditor.cpp:357
+#: src/leveleditor.cpp:363
 #, c-format
 msgid "Level %d doesn't exist. Create it?"
-msgstr ""
+msgstr "Level %d exisitiert nicht. Jetzte erstellen?"
 
-#: src/leveleditor.cpp:560 src/misc.cpp:96
-msgid "Level Editor"
-msgstr "Level Editor"
-
-#: src/leveleditor.cpp:583
+#: src/leveleditor.cpp:585
 msgid "F1 for help"
-msgstr ""
+msgstr "Für Hilfe F1 drücken"
 
-#: src/leveleditor.cpp:585
+#: src/leveleditor.cpp:587
 msgid "Choose a level subset"
-msgstr ""
+msgstr "Wählen Sie ein Level-Subset aus"
 
-#: src/leveleditor.cpp:769
+#: src/leveleditor.cpp:778
 msgid "No more sectors exist. Create another?"
-msgstr ""
+msgstr "Keine weiteren Sektoren vorhanden. Einen weiteren erzeugen?"
 
-#: src/leveleditor.cpp:921
+#: src/leveleditor.cpp:936
 msgid ""
-"This is the built-in level editor. It's aim is to be intuitive\n"
-"and simple to use, so it should be pretty straight forward.\n"
+"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"
@@ -257,24 +445,24 @@ msgid ""
 "\n"
 "To access the menu from the level editor, just press Esc.\n"
 "\n"
-"You are currently looking to the level, to scroll it, just\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 in/out the level.\n"
+"'+' and '-' keys can be used to zoom the level in/out.\n"
 "\n"
-"You probably already noticed those floating group of buttons.\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 know it by pressing the Right mouse button on\n"
-"it. That will also show what that button does.\n"
-"Group of buttons can also be move around by just dragging them,\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 do, shall we?\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 gropup\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"
@@ -282,18 +470,18 @@ msgid ""
 "enemies and game objects in the bottom.\n"
 msgstr ""
 
-#: src/leveleditor.cpp:957
+#: src/leveleditor.cpp:972
 msgid ""
 "The Foreground/Interactive/Background buttons may be used to\n"
-"see and edit the respective layer. Level's have three tiles layers:\n"
-"Foreground - tiles are drawn in top of everything and have no contact\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 in bottom of everything and have no contact\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"
-"At last, but not least, the group of buttons that's left serves\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"
@@ -301,7 +489,7 @@ msgid ""
 "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, incluiding resizing it.\n"
+"Tools - set a few settings for the level, including resizing it.\n"
 "\n"
 "We have reached the end of this Howto.\n"
 "\n"
@@ -310,328 +498,23 @@ msgid ""
 "Enjoy,\n"
 "  SuperTux development team\n"
 "\n"
-"ps: If you are looking for something more powerfull, you can give it a\n"
-"try to FlexLay. FlexLay is a level editor that supports several games,\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/leveleditor.cpp:997
-#, fuzzy
+#: src/leveleditor.cpp:1012
 msgid "- Level Editor's Help -"
-msgstr "Level Editor"
+msgstr "- Level Editor Hilfe -"
 
-#: src/leveleditor.cpp:1001
+#: src/leveleditor.cpp:1016
 #, c-format
 msgid "Press any key to continue - Page %d/%d"
-msgstr ""
-
-#: src/misc.cpp:93 src/misc.cpp:152
-msgid "Start Game"
-msgstr "Spiel Beginnen"
-
-#: src/misc.cpp:94 src/title.cpp:112
-msgid "Contrib Levels"
-msgstr "Zusatzlevel"
-
-#: src/misc.cpp:95 src/misc.cpp:100 src/misc.cpp:175 src/misc.cpp:182
-msgid "Options"
-msgstr "Einstellungen"
-
-#: src/misc.cpp:97
-msgid "Credits"
-msgstr "Mitwirkende"
-
-#: src/misc.cpp:98
-msgid "Quit"
-msgstr "Beenden"
-
-#: src/misc.cpp:103
-msgid "OpenGL    "
-msgstr ""
-
-#: src/misc.cpp:105
-msgid "OpenGL (not supported)"
-msgstr ""
-
-#: src/misc.cpp:107
-msgid "Fullscreen"
-msgstr ""
-
-#: src/misc.cpp:110 src/misc.cpp:115
-msgid "Sound     "
-msgstr ""
-
-#: src/misc.cpp:111 src/misc.cpp:116
-msgid "Music     "
-msgstr ""
-
-#: src/misc.cpp:118
-msgid "Show FPS  "
-msgstr ""
-
-#: src/misc.cpp:119
-msgid "Setup Keys"
-msgstr ""
-
-#: src/misc.cpp:122
-msgid "Setup Joystick"
-msgstr ""
+msgstr "Um fortzufahren beliebige Taste drücken - Seite %d/%d"
 
-#: src/misc.cpp:127
-msgid "Keyboard Setup"
-msgstr ""
-
-#: src/misc.cpp:129
-msgid "Left move"
-msgstr ""
-
-#: src/misc.cpp:130
-msgid "Right move"
-msgstr ""
-
-#: src/misc.cpp:131
-msgid "Up/Activate"
-msgstr ""
-
-#: src/misc.cpp:132
-msgid "Down/Duck"
-msgstr ""
-
-#: src/misc.cpp:133
-msgid "Jump"
-msgstr ""
-
-#: src/misc.cpp:134
-msgid "Power/Run"
-msgstr ""
-
-#: src/misc.cpp:140
-msgid "Joystick Setup"
-msgstr ""
-
-#: src/misc.cpp:144
-msgid "A button"
-msgstr ""
-
-#: src/misc.cpp:145
-msgid "B button"
-msgstr ""
-
-#: src/misc.cpp:162
-msgid "Save Game"
-msgstr "Spiel Speichern"
-
-#: src/misc.cpp:172 src/misc.cpp:179
-msgid "Pause"
-msgstr ""
-
-#: src/misc.cpp:174 src/misc.cpp:181
-msgid "Continue"
-msgstr ""
-
-#: src/misc.cpp:177
-msgid "Abort Level"
-msgstr "Level Abbrechen"
-
-#: src/misc.cpp:184
-msgid "Quit Game"
-msgstr "Spiel Beenden"
-
-#: src/misc.cpp:186
-msgid "Enter your name:"
-msgstr ""
-
-#: src/player.cpp:1240
-#, c-format
-msgid "Good! x%d"
-msgstr ""
-
-#: src/player.cpp:1242
-#, c-format
-msgid "Great! x%d"
-msgstr ""
-
-#: src/player.cpp:1244
-#, c-format
-msgid "Awesome! x%d"
-msgstr ""
-
-#: src/player.cpp:1246
-#, c-format
-msgid "Incredible! x%d"
-msgstr ""
-
-#: src/player.cpp:1248
-#, c-format
-msgid "Godlike! ;-) x%d"
-msgstr ""
-
-#: src/player.cpp:1250
-#, c-format
-msgid "Unbelievable!! x%d"
-msgstr ""
-
-#: src/statistics.cpp:113
-msgid "- Best Level Statistics -"
-msgstr ""
-
-#: src/statistics.cpp:117
-msgid "Max score:"
-msgstr ""
-
-#: src/statistics.cpp:137
-msgid "Max coins collected:"
-msgstr ""
-
-#: src/statistics.cpp:139
-msgid "Max fragging:"
-msgstr ""
-
-#: src/statistics.cpp:141
-msgid "Min time needed:"
-msgstr ""
-
-#: src/statistics.cpp:170
+#: src/object/player.cpp:279
 #, c-format
-msgid "Max score:             %d"
-msgstr ""
+msgid "New max combo: %d"
+msgstr "Neue Max Kombination: %d"
 
-#: src/statistics.cpp:176
-#, c-format
-msgid "Max coins collected:   %d / %d"
-msgstr ""
-
-#: src/statistics.cpp:180
-#, c-format
-msgid "Max fragging:          %d / %d"
-msgstr ""
-
-#: src/statistics.cpp:184
-#, c-format
-msgid "Min time needed:       %d / %d"
-msgstr ""
-
-#: src/title.cpp:374
-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 ""
-
-#: src/title.cpp:426
-msgid "Are you sure you want to delete slot"
-msgstr ""
-
-#: src/worldmap.cpp:952
-msgid "GAMEOVER"
-msgstr ""
-
-#: src/worldmap.cpp:959
-msgid "Total Statistics"
-msgstr ""
-
-#: lib/app/setup.cpp:774
-#, c-format
-msgid ""
-"Usage: %s [OPTIONS] FILENAME\n"
-"\n"
-msgstr ""
-
-#: lib/app/setup.cpp:775
-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"
-"\n"
-msgstr ""
-
-#: lib/app/setup.cpp:834
-#, c-format
-msgid ""
-"Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--"
-"debug] | [--usage | --help | --version] [--leveleditor] [--worldmap] [--flip-"
-"levels] FILENAME\n"
-msgstr ""
-
-#: lib/gui/menu.cpp:67
-msgid "Yes"
-msgstr ""
-
-#: lib/gui/menu.cpp:68
-msgid "No"
-msgstr ""
-
-#: lib/gui/menu.cpp:236
-msgid "Up cursor"
-msgstr ""
-
-#: lib/gui/menu.cpp:239
-msgid "Down cursor"
-msgstr ""
-
-#: lib/gui/menu.cpp:242
-msgid "Left cursor"
-msgstr ""
-
-#: lib/gui/menu.cpp:245
-msgid "Right cursor"
-msgstr ""
-
-#: lib/gui/menu.cpp:248
-msgid "Return"
-msgstr ""
-
-#: lib/gui/menu.cpp:251
-msgid "Space"
-msgstr ""
-
-#: lib/gui/menu.cpp:254
-msgid "Right Shift"
-msgstr ""
-
-#: lib/gui/menu.cpp:257
-msgid "Left Shift"
-msgstr ""
-
-#: lib/gui/menu.cpp:260
-msgid "Right Control"
-msgstr ""
-
-#: lib/gui/menu.cpp:263
-msgid "Left Control"
-msgstr ""
-
-#: lib/gui/menu.cpp:266
-msgid "Right Alt"
-msgstr ""
-
-#: lib/gui/menu.cpp:269
-msgid "Left Alt"
-msgstr ""

diff --git a/lib/app/setup.cpp b/lib/app/setup.cpp
index acb1749..7f3917b 100644 (file)
--- a/lib/app/setup.cpp
+++ b/lib/app/setup.cpp
@@ -322,7 +322,7 @@ void Setup::directories()
         {
          std::string exedir = std::string(dirname(exe_file)) + "/";
          
-          datadir = exedir + "../data/"; // SuperTux run from source dir
+          datadir = exedir + "./data/"; // SuperTux run from source dir
           if (access(datadir.c_str(), F_OK) != 0)
             {
              datadir = exedir + "../../data/";  //SuperTux run from source dir (with libtool script)

diff --git a/src/resources.cpp b/src/resources.cpp
index e57ee37..07e0b04 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -313,11 +313,11 @@ void unloadshared(void)
 std::string get_resource_filename(const std::string& resource)
 {
   std::string filepath = st_dir + resource;
-  if(access(filepath.c_str(), R_OK) == 0)
+  if(FileSystem::faccessible(filepath))
     return filepath;
   
   filepath = datadir + resource;
-  if(access(filepath.c_str(), R_OK) == 0)
+  if(FileSystem::faccessible(filepath))
     return filepath;
 
   std::cerr << "Couldn't find resource: '" << resource  << "'." << std::endl;

diff --git a/src/title.cpp b/src/title.cpp
index fad1e81..12f1c25 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -347,10 +347,14 @@ void title(void)
       context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n",
               Vector(0, screen->h - 70), LEFT_ALLIGN, LAYER_FOREGROUND1);
       context.draw_text(white_small_text,
-        _("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"), Vector(0, screen->h - 70 + white_small_text->get_height()), LEFT_ALLIGN, LAYER_FOREGROUND1);
+        _(
+"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"
+        ),
+        Vector(0, screen->h - 70 + white_small_text->get_height()),
+        LEFT_ALLIGN, LAYER_FOREGROUND1);
 
       /* Don't draw menu, if quit is true */
       Menu* menu = Menu::current();