From: Mathnerd314 <man.is.allan@gmail.com>
Date: Sat, 10 Jul 2010 15:50:46 +0000 (+0000)
Subject: Update and run normalize-po-files.sh
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=63ae7e5dca1c9fbe843e556fa6142b6820dc7279;p=supertux.git

Update and run normalize-po-files.sh

SVN-Revision: 6642
---

diff --git a/data/levels/test/nb.po b/data/levels/test/nb.po
index 2bfc09fe5..dd7e45d91 100644
--- a/data/levels/test/nb.po
+++ b/data/levels/test/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 10:22+0200\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-07-13 18:53+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -17,211 +17,346 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: data/levels/test/1holes.stl:4 data/levels/test/holes.stl:3
-#: data/levels/test/secret.stl:3 data/levels/test/stacking.stl:4
-#: data/levels/test/totem.stl:4
-msgid "Totem Test"
-msgstr "Totemtest"
+#: data/levels/test/BackGround.stl:3
+msgid "Forest Background Test"
+msgstr ""
+
+#: data/levels/test/bicycle_platform.stl:3
+msgid "Bicycle Platform Test"
+msgstr ""
+
+#: data/levels/test/candle.stl:3
+msgid "Candle Scripting Test"
+msgstr ""
+
+#: data/levels/test/captainsnowball.stl:3
+msgid "Captain Snowball Test (Welcome to Antarctica)"
+msgstr ""
 
-#: data/levels/test/BackGround.stl:3 data/levels/test/auto.stl:3
-#: data/levels/test/break.stl:3 data/levels/test/burn.stl:3
-#: data/levels/test/castle_snow.stl:3 data/levels/test/direction.stl:3
-#: data/levels/test/dropcrush.stl:3 data/levels/test/grab.stl:3
-#: data/levels/test/lantern.stl:3 data/levels/test/magicblocks.stl:3
-#: data/levels/test/menutest.stl:3 data/levels/test/oddbug.stl:3
-#: data/levels/test/reset.stl:3 data/levels/test/scriptdoor.stl:3
-#: data/levels/test/scripttrigger.stl:3 data/levels/test/simple.stl:3
-#: data/levels/test/slopes.stl:3 data/levels/test/trampoline.stl:3
-#: data/levels/test/tree-exit.stl:3 data/levels/test/unisolid.stl:3
-#: data/levels/test/water.stl:3
-msgid "Unnamed"
-msgstr "Navnløs"
-
-#: data/levels/test/ambient_sound.stl:4
-msgid "Ambient Sound Test"
-msgstr "Omgivelseslydtest"
-
-#: data/levels/test/ambient_sound.stl:146
+#: data/levels/test/captainsnowball.stl:32
 msgid ""
-"-Info\n"
-"#An ambient sound \n"
-"#leveldone music\n"
+"-Bonus Blocks\n"
+"!images/objects/bonus_block/full-0.png\n"
+"#Bonus blocks can contain coins, power-ups or special items to help you in your quest.\n"
+"#\n"
+"#Hit them from below to get at their contents."
 msgstr ""
-"-Info\n"
-"#Omgivelseslyd \n"
-"#Brett fullført\n"
 
-#: data/levels/test/ambient_sound.stl:152
+#: data/levels/test/captainsnowball.stl:41
 msgid ""
-"-Info\n"
-"#An ambient sound \n"
-"#source playing the\n"
-"#rain effect should \n"
-"#be audible here.\n"
-msgstr ""
-"-Info\n"
-"#Omgivelseslyd \n"
-"#med regneffekter\n"
-"#skal høres nå.\n"
-
-#: data/levels/test/ambient_sound.stl:160
+"-Eggs\n"
+"!images/powerups/egg/egg.png\n"
+"#The egg makes Tux grow larger. Tux can then smash wooden blocks with his head."
+msgstr ""
+
+#: data/levels/test/captainsnowball.stl:48
 msgid ""
-"-Info\n"
-"#Waterfall\n"
-"#Volume 0.2\n"
-"#smaller geometry\n"
-"#than rain source\n"
-msgstr ""
-"-Info\n"
-"#Fossefall\n"
-"#Volum 0,2\n"
-"#Mindre geometri\n"
-"#enn regnkilden\n"
-
-#: data/levels/test/ambient_sound.stl:168
+"-Checkpoints\n"
+"!images/objects/resetpoints/bell-m.png\n"
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+msgstr ""
+
+#: data/levels/test/captainsnowball.stl:55
 msgid ""
-"-Info\n"
-"#Lava (Area)\n"
-"#extending right\n"
-msgstr ""
-"-Info\n"
-"#Lava (område)\n"
-"#som går til høyre\n"
-
-#: data/levels/test/autoscroll.stl:3
-msgid "Autoscroll Test (Above the Arctic Skies)"
-msgstr "Autorullingstest («Over skyene»)"
-
-#: data/levels/test/bicycle_platform.stl:3 data/levels/test/candle.stl:3
-#: data/levels/test/dais.stl:3 data/levels/test/platform.stl:3
-#: data/levels/test/pneumatic_platform.stl:3 data/levels/test/pushbutton.stl:3
-#: data/levels/test/switch.stl:3 data/levels/test/wind.stl:3
-msgid "Flying Platform Test"
-msgstr "Flygende plattform-test"
-
-#: data/levels/test/bonus-level4.stl:4
-msgid "Bonus Island Castle"
-msgstr "Bonusøyslott"
-
-#: data/levels/test/bonusblock.stl:4 data/levels/test/rock.stl:3
-msgid "Bonus Block Test"
-msgstr "Bonusblokktest"
-
-#: data/levels/test/bonusblock.stl:139
+"-Running\n"
+"!images/tiles/signs/run.png\n"
+"#The path in front of you is blocked. Gain some speed before jumping to pass over the blocks."
+msgstr ""
+
+#: data/levels/test/captainsnowball.stl:62
 msgid ""
-"-Info\n"
-"#Beware of these crazy\n"
-"#red potions.\n"
-"#Better seek for blue\n"
-"#potions."
-msgstr ""
-"-Info\n"
-"#Pass deg for disse\n"
-"#røde drikkene.\n"
-"#Se heller etter\n"
-"#blå drikker."
-
-#: data/levels/test/darttrap.stl:4 data/levels/test/unstable.stl:3
-msgid "DartTrap Test"
-msgstr "DartTrap-test"
-
-#: data/levels/test/forest1-grumbel.stl:3 data/levels/test/mrtree.stl:3
-msgid "Forest Tiles / Slopes / Foreground Test"
-msgstr "Skogbrikker / bakker / framgrunnstest"
+"-Fire Flower\n"
+"!images/powerups/fireflower/fire_flower-0.png\n"
+"#The fire flower gives Tux the ability to shoot fireballs."
+msgstr ""
 
-#: data/levels/test/forestkeep.stl:4
-msgid "No Name"
-msgstr "Navnløs"
+#: data/levels/test/captainsnowball.stl:69
+msgid ""
+"-Tux Doll\n"
+"!images/powerups/1up/1up.png\n"
+"#The Tux doll gives Tux 100 coins."
+msgstr ""
 
-#: data/levels/test/foresttheme.stl:3
-msgid "Forest Theme Test"
-msgstr "Skogtematest"
+#: data/levels/test/captainsnowball.stl:76
+msgid ""
+"-Secret Areas\n"
+"#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
+msgstr ""
 
-#: data/levels/test/hitfrombelow.stl:3
-msgid "Test of badguys hit from below"
-msgstr "Test av knusing av slemminger nedenfra"
+#: data/levels/test/castletiles.stl:3
+msgid "Castle Tiles Test"
+msgstr ""
+
+#: data/levels/test/chain.stl:3
+msgid "Chain test"
+msgstr ""
 
-#: data/levels/test/hurting_platform.stl:3
-msgid "Sawblade Test"
-msgstr "Sagbladtest"
+#: data/levels/test/crystalcave.stl:3
+msgid "Crystal Cave test"
+msgstr ""
 
-#: data/levels/test/intro.stl:4
-msgid "SuperTux Intro"
-msgstr "SuperTux-intro"
+#: data/levels/test/crystallo.stl:3
+msgid "Crystal Cave (Crystallo Test)"
+msgstr ""
 
-#: data/levels/test/intro2.stl:4
-msgid "Picnic With Penny"
-msgstr "Piknik med Penny"
+#: data/levels/test/darksnow.stl:3
+msgid "Dark Snow Test (+Icecrusher)"
+msgstr ""
 
-#: data/levels/test/intro_scene2.stl:4
-msgid "Nolok Escapes"
-msgstr "Nolok rømmer"
+#: data/levels/test/decal.stl:3
+msgid "Decal Test"
+msgstr ""
 
-#: data/levels/test/keydoors.stl:3
-msgid "key 1 water - to be placed behind waterfall"
-msgstr "nøkkel 1 vann - skal plasseres bak fossen"
+#: data/levels/test/doortest.stl:3
+msgid "Door Test"
+msgstr ""
 
-#: data/levels/test/keydoors.stl:54
-msgid ""
-"#Remember that you can type\n"
-"#sector.add_key(key);\n"
-"#keys are air, wood, earth, fire and water"
+#: data/levels/test/forestkeep.stl:4
+msgid "Forest Keep Test"
 msgstr ""
-"#Husk at du kan skrive\n"
-"#sector.add_key(nøkkel);\n"
-"#Nøklene er «air» (luft),\n"
-"#«wood» (tre), «earth» (jord),\n"
-"#«fire» (ild) og «water» (vann)."
+
+#: data/levels/test/haywire.stl:3
+msgid "Haywire bomb test"
+msgstr ""
+
+#: data/levels/test/icecrusher.stl:3
+msgid "IceCrusher Test"
+msgstr ""
+
+#: data/levels/test/icetest.stl:3
+msgid "Ice test"
+msgstr ""
+
+#: data/levels/test/intro2.stl:4
+msgid "Picnic With Penny"
+msgstr "Piknik med Penny"
 
 #: data/levels/test/kugelblitz.stl:3
 msgid "Kugelblitz Test"
 msgstr "Kugelblitz-test"
 
-#: data/levels/test/laddertest.stl:3
-msgid "Ladder Test"
-msgstr "Stigetest"
-
 #: data/levels/test/light.stl:3
-msgid "One Block Fall-through / Spikes"
-msgstr "Énblokks nedfall / pigger"
+msgid "Lightmap Test"
+msgstr ""
+
+#: data/levels/test/magicblocks.stl:3
+msgid "Magic Block Test"
+msgstr ""
+
+#: data/levels/test/menutest.stl:3
+msgid "Menu as Level Test"
+msgstr ""
+
+#: data/levels/test/newice.stl:3
+msgid "Unnamed (Ice Test)"
+msgstr ""
+
+#: data/levels/test/nightcave.stl:3
+msgid "NightCave test"
+msgstr ""
 
-#: data/levels/test/raintest.stl:4
-msgid "Rain And Ghost Theme Test"
-msgstr "Regn- og spøkelsestematest"
+#: data/levels/test/oddbug.stl:3
+msgid "An Odd Bug"
+msgstr ""
 
-#: data/levels/test/risinglava.stl:3
-msgid "Rising Lava Test"
-msgstr "Voksende lava-test"
+#: data/levels/test/owl.stl:3
+msgid "Owl test"
+msgstr ""
 
-#: data/levels/test/script.stl:3
-msgid "Scripting Test"
-msgstr "Skripttest"
+#: data/levels/test/pneumatic_platform.stl:3
+msgid "Pneumatic Platform Test"
+msgstr ""
 
-#: data/levels/test/sectors.stl:4
-msgid "Sector Test"
-msgstr "Sektortest"
+#: data/levels/test/scripttrigger.stl:3
+msgid "Script Trigger Test"
+msgstr ""
 
-#: data/levels/test/stacking.stl:126
+#: data/levels/test/short_fuse.stl:3
+msgid "Short fuse bomb test"
+msgstr ""
+
+#: data/levels/test/snowair.stl:3
+msgid "Snow Air Tile Test"
+msgstr ""
+
+#: data/levels/test/snowmountain.stl:3
+msgid "Snow Mountain Tiles"
+msgstr ""
+
+#: data/levels/test/snowslope.stl:3
+msgid "Snow Slope Tile Test"
+msgstr ""
+
+#: data/levels/test/stacking.stl:4
+msgid "Enemy Stacking Test"
+msgstr ""
+
+#: data/levels/test/stacking.stl:60
 msgid "images/powerups/egg/egg.sprite"
 msgstr "images/powerups/egg/egg.sprite"
 
+#: data/levels/test/tileplatforms.stl:3
+msgid "Tile Platform Test"
+msgstr ""
+
+#: data/levels/test/totem.stl:4
+msgid "Totem Test"
+msgstr "Totemtest"
+
 #: data/levels/test/transition.stl:3
 msgid "Ghost Forest Transition"
 msgstr "Spøkelsesskogovergang"
 
 #: data/levels/test/treeboss.stl:3
-msgid "Trees Suck"
-msgstr "Tre suger"
+msgid "Trees Suck (Tree Boss Test)"
+msgstr ""
+
+#: data/levels/test/unisolid.stl:3
+msgid "Snow Tileset and Platform Test"
+msgstr ""
 
-#: data/levels/test/verticalforest.stl:5
-msgid "Inside The Tree"
-msgstr "Inni treet"
+#: data/levels/test/unstable_tile.stl:3
+msgid "Unstable tile test"
+msgstr ""
 
-#: data/levels/test/wansti-level4.stl:4
-msgid "Collapse Imminent!"
-msgstr "Sammenbruddet er nærstående!"
+#~ msgid "Unnamed"
+#~ msgstr "Navnløs"
+
+#~ msgid "Ambient Sound Test"
+#~ msgstr "Omgivelseslydtest"
+
+#~ msgid ""
+#~ "-Info\n"
+#~ "#An ambient sound \n"
+#~ "#leveldone music\n"
+#~ msgstr ""
+#~ "-Info\n"
+#~ "#Omgivelseslyd \n"
+#~ "#Brett fullført\n"
+
+#~ msgid ""
+#~ "-Info\n"
+#~ "#An ambient sound \n"
+#~ "#source playing the\n"
+#~ "#rain effect should \n"
+#~ "#be audible here.\n"
+#~ msgstr ""
+#~ "-Info\n"
+#~ "#Omgivelseslyd \n"
+#~ "#med regneffekter\n"
+#~ "#skal høres nå.\n"
+
+#~ msgid ""
+#~ "-Info\n"
+#~ "#Waterfall\n"
+#~ "#Volume 0.2\n"
+#~ "#smaller geometry\n"
+#~ "#than rain source\n"
+#~ msgstr ""
+#~ "-Info\n"
+#~ "#Fossefall\n"
+#~ "#Volum 0,2\n"
+#~ "#Mindre geometri\n"
+#~ "#enn regnkilden\n"
+
+#~ msgid ""
+#~ "-Info\n"
+#~ "#Lava (Area)\n"
+#~ "#extending right\n"
+#~ msgstr ""
+#~ "-Info\n"
+#~ "#Lava (område)\n"
+#~ "#som går til høyre\n"
+
+#~ msgid "Autoscroll Test (Above the Arctic Skies)"
+#~ msgstr "Autorullingstest («Over skyene»)"
+
+#~ msgid "Flying Platform Test"
+#~ msgstr "Flygende plattform-test"
+
+#~ msgid "Bonus Island Castle"
+#~ msgstr "Bonusøyslott"
+
+#~ msgid "Bonus Block Test"
+#~ msgstr "Bonusblokktest"
+
+#~ msgid ""
+#~ "-Info\n"
+#~ "#Beware of these crazy\n"
+#~ "#red potions.\n"
+#~ "#Better seek for blue\n"
+#~ "#potions."
+#~ msgstr ""
+#~ "-Info\n"
+#~ "#Pass deg for disse\n"
+#~ "#røde drikkene.\n"
+#~ "#Se heller etter\n"
+#~ "#blå drikker."
+
+#~ msgid "DartTrap Test"
+#~ msgstr "DartTrap-test"
+
+#~ msgid "Forest Tiles / Slopes / Foreground Test"
+#~ msgstr "Skogbrikker / bakker / framgrunnstest"
+
+#~ msgid "No Name"
+#~ msgstr "Navnløs"
+
+#~ msgid "Forest Theme Test"
+#~ msgstr "Skogtematest"
+
+#~ msgid "Test of badguys hit from below"
+#~ msgstr "Test av knusing av slemminger nedenfra"
+
+#~ msgid "Sawblade Test"
+#~ msgstr "Sagbladtest"
+
+#~ msgid "SuperTux Intro"
+#~ msgstr "SuperTux-intro"
+
+#~ msgid "Nolok Escapes"
+#~ msgstr "Nolok rømmer"
+
+#~ msgid "key 1 water - to be placed behind waterfall"
+#~ msgstr "nøkkel 1 vann - skal plasseres bak fossen"
+
+#~ msgid ""
+#~ "#Remember that you can type\n"
+#~ "#sector.add_key(key);\n"
+#~ "#keys are air, wood, earth, fire and water"
+#~ msgstr ""
+#~ "#Husk at du kan skrive\n"
+#~ "#sector.add_key(nøkkel);\n"
+#~ "#Nøklene er «air» (luft),\n"
+#~ "#«wood» (tre), «earth» (jord),\n"
+#~ "#«fire» (ild) og «water» (vann)."
+
+#~ msgid "Ladder Test"
+#~ msgstr "Stigetest"
+
+#~ msgid "One Block Fall-through / Spikes"
+#~ msgstr "Énblokks nedfall / pigger"
+
+#~ msgid "Rain And Ghost Theme Test"
+#~ msgstr "Regn- og spøkelsestematest"
+
+#~ msgid "Rising Lava Test"
+#~ msgstr "Voksende lava-test"
+
+#~ msgid "Scripting Test"
+#~ msgstr "Skripttest"
+
+#~ msgid "Sector Test"
+#~ msgstr "Sektortest"
+
+#~ msgid "Trees Suck"
+#~ msgstr "Tre suger"
+
+#~ msgid "Inside The Tree"
+#~ msgstr "Inni treet"
 
-#: data/levels/test/willowisp.stl:3
-msgid "WillOWisp Test"
-msgstr "WillOWisp-test"
+#~ msgid "Collapse Imminent!"
+#~ msgstr "Sammenbruddet er nærstående!"
 
+#~ msgid "WillOWisp Test"
+#~ msgstr "WillOWisp-test"
diff --git a/data/levels/test/nn.po b/data/levels/test/nn.po
index 0aa8d3207..54b6be822 100644
--- a/data/levels/test/nn.po
+++ b/data/levels/test/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 10:22+0200\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-07-01 11:20+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -18,211 +18,346 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: data/levels/test/1holes.stl:4 data/levels/test/holes.stl:3
-#: data/levels/test/secret.stl:3 data/levels/test/stacking.stl:4
-#: data/levels/test/totem.stl:4
-msgid "Totem Test"
-msgstr "Totemtest"
+#: data/levels/test/BackGround.stl:3
+msgid "Forest Background Test"
+msgstr ""
+
+#: data/levels/test/bicycle_platform.stl:3
+msgid "Bicycle Platform Test"
+msgstr ""
+
+#: data/levels/test/candle.stl:3
+msgid "Candle Scripting Test"
+msgstr ""
+
+#: data/levels/test/captainsnowball.stl:3
+msgid "Captain Snowball Test (Welcome to Antarctica)"
+msgstr ""
 
-#: data/levels/test/BackGround.stl:3 data/levels/test/auto.stl:3
-#: data/levels/test/break.stl:3 data/levels/test/burn.stl:3
-#: data/levels/test/castle_snow.stl:3 data/levels/test/direction.stl:3
-#: data/levels/test/dropcrush.stl:3 data/levels/test/grab.stl:3
-#: data/levels/test/lantern.stl:3 data/levels/test/magicblocks.stl:3
-#: data/levels/test/menutest.stl:3 data/levels/test/oddbug.stl:3
-#: data/levels/test/reset.stl:3 data/levels/test/scriptdoor.stl:3
-#: data/levels/test/scripttrigger.stl:3 data/levels/test/simple.stl:3
-#: data/levels/test/slopes.stl:3 data/levels/test/trampoline.stl:3
-#: data/levels/test/tree-exit.stl:3 data/levels/test/unisolid.stl:3
-#: data/levels/test/water.stl:3
-msgid "Unnamed"
-msgstr "Namnlaus"
-
-#: data/levels/test/ambient_sound.stl:4
-msgid "Ambient Sound Test"
-msgstr "Omgjevnadslydtest"
-
-#: data/levels/test/ambient_sound.stl:146
+#: data/levels/test/captainsnowball.stl:32
 msgid ""
-"-Info\n"
-"#An ambient sound \n"
-"#leveldone music\n"
+"-Bonus Blocks\n"
+"!images/objects/bonus_block/full-0.png\n"
+"#Bonus blocks can contain coins, power-ups or special items to help you in your quest.\n"
+"#\n"
+"#Hit them from below to get at their contents."
 msgstr ""
-"-Info\n"
-"#Omgjevnadslyd \n"
-"#Brett fullført\n"
 
-#: data/levels/test/ambient_sound.stl:152
+#: data/levels/test/captainsnowball.stl:41
 msgid ""
-"-Info\n"
-"#An ambient sound \n"
-"#source playing the\n"
-"#rain effect should \n"
-"#be audible here.\n"
-msgstr ""
-"-Info\n"
-"#Omgjevnadslyd \n"
-"#med regneffektar\n"
-"#skal hørast no.\n"
-
-#: data/levels/test/ambient_sound.stl:160
+"-Eggs\n"
+"!images/powerups/egg/egg.png\n"
+"#The egg makes Tux grow larger. Tux can then smash wooden blocks with his head."
+msgstr ""
+
+#: data/levels/test/captainsnowball.stl:48
 msgid ""
-"-Info\n"
-"#Waterfall\n"
-"#Volume 0.2\n"
-"#smaller geometry\n"
-"#than rain source\n"
-msgstr ""
-"-Info\n"
-"#Fossefall\n"
-"#Volum 0,2\n"
-"#Mindre geometri\n"
-"#enn regnkjelda\n"
-
-#: data/levels/test/ambient_sound.stl:168
+"-Checkpoints\n"
+"!images/objects/resetpoints/bell-m.png\n"
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+msgstr ""
+
+#: data/levels/test/captainsnowball.stl:55
 msgid ""
-"-Info\n"
-"#Lava (Area)\n"
-"#extending right\n"
-msgstr ""
-"-Info\n"
-"#Lava (område)\n"
-"#som går til høgre\n"
-
-#: data/levels/test/autoscroll.stl:3
-msgid "Autoscroll Test (Above the Arctic Skies)"
-msgstr "Autorullingstest («Over skyene»)"
-
-#: data/levels/test/bicycle_platform.stl:3 data/levels/test/candle.stl:3
-#: data/levels/test/dais.stl:3 data/levels/test/platform.stl:3
-#: data/levels/test/pneumatic_platform.stl:3 data/levels/test/pushbutton.stl:3
-#: data/levels/test/switch.stl:3 data/levels/test/wind.stl:3
-msgid "Flying Platform Test"
-msgstr "Flygande plattform-test"
-
-#: data/levels/test/bonus-level4.stl:4
-msgid "Bonus Island Castle"
-msgstr "Bonusøyslott"
-
-#: data/levels/test/bonusblock.stl:4 data/levels/test/rock.stl:3
-msgid "Bonus Block Test"
-msgstr "Bonusblokktest"
-
-#: data/levels/test/bonusblock.stl:139
+"-Running\n"
+"!images/tiles/signs/run.png\n"
+"#The path in front of you is blocked. Gain some speed before jumping to pass over the blocks."
+msgstr ""
+
+#: data/levels/test/captainsnowball.stl:62
 msgid ""
-"-Info\n"
-"#Beware of these crazy\n"
-"#red potions.\n"
-"#Better seek for blue\n"
-"#potions."
-msgstr ""
-"-Info\n"
-"#Pass deg for desse\n"
-"#raude drikkane.\n"
-"#Sjå heller etter\n"
-"#blå drikkar."
-
-#: data/levels/test/darttrap.stl:4 data/levels/test/unstable.stl:3
-msgid "DartTrap Test"
-msgstr "DartTrap-test"
-
-#: data/levels/test/forest1-grumbel.stl:3 data/levels/test/mrtree.stl:3
-msgid "Forest Tiles / Slopes / Foreground Test"
-msgstr "Skogbrikker / bakkar / framgrunnstest"
+"-Fire Flower\n"
+"!images/powerups/fireflower/fire_flower-0.png\n"
+"#The fire flower gives Tux the ability to shoot fireballs."
+msgstr ""
 
-#: data/levels/test/forestkeep.stl:4
-msgid "No Name"
-msgstr "Namnlaus"
+#: data/levels/test/captainsnowball.stl:69
+msgid ""
+"-Tux Doll\n"
+"!images/powerups/1up/1up.png\n"
+"#The Tux doll gives Tux 100 coins."
+msgstr ""
 
-#: data/levels/test/foresttheme.stl:3
-msgid "Forest Theme Test"
-msgstr "Skogtematest"
+#: data/levels/test/captainsnowball.stl:76
+msgid ""
+"-Secret Areas\n"
+"#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
+msgstr ""
 
-#: data/levels/test/hitfrombelow.stl:3
-msgid "Test of badguys hit from below"
-msgstr "Test av knusing av slemmingar nedanfrå"
+#: data/levels/test/castletiles.stl:3
+msgid "Castle Tiles Test"
+msgstr ""
+
+#: data/levels/test/chain.stl:3
+msgid "Chain test"
+msgstr ""
 
-#: data/levels/test/hurting_platform.stl:3
-msgid "Sawblade Test"
-msgstr "Sagbladtest"
+#: data/levels/test/crystalcave.stl:3
+msgid "Crystal Cave test"
+msgstr ""
 
-#: data/levels/test/intro.stl:4
-msgid "SuperTux Intro"
-msgstr "SuperTux-intro"
+#: data/levels/test/crystallo.stl:3
+msgid "Crystal Cave (Crystallo Test)"
+msgstr ""
 
-#: data/levels/test/intro2.stl:4
-msgid "Picnic With Penny"
-msgstr "Piknik med Penny"
+#: data/levels/test/darksnow.stl:3
+msgid "Dark Snow Test (+Icecrusher)"
+msgstr ""
 
-#: data/levels/test/intro_scene2.stl:4
-msgid "Nolok Escapes"
-msgstr "Nolok rømmer"
+#: data/levels/test/decal.stl:3
+msgid "Decal Test"
+msgstr ""
 
-#: data/levels/test/keydoors.stl:3
-msgid "key 1 water - to be placed behind waterfall"
-msgstr "nøkkel 1 vatn - skal plasserast bak fossen"
+#: data/levels/test/doortest.stl:3
+msgid "Door Test"
+msgstr ""
 
-#: data/levels/test/keydoors.stl:54
-msgid ""
-"#Remember that you can type\n"
-"#sector.add_key(key);\n"
-"#keys are air, wood, earth, fire and water"
+#: data/levels/test/forestkeep.stl:4
+msgid "Forest Keep Test"
 msgstr ""
-"#Hugs at du kan skriva\n"
-"#sector.add_key(nøkkel);\n"
-"#Nøklane er «air» (luft),\n"
-"#«wood» (tre), «earth» (jord),\n"
-"#«fire» (eld) og «water» (vatn)."
+
+#: data/levels/test/haywire.stl:3
+msgid "Haywire bomb test"
+msgstr ""
+
+#: data/levels/test/icecrusher.stl:3
+msgid "IceCrusher Test"
+msgstr ""
+
+#: data/levels/test/icetest.stl:3
+msgid "Ice test"
+msgstr ""
+
+#: data/levels/test/intro2.stl:4
+msgid "Picnic With Penny"
+msgstr "Piknik med Penny"
 
 #: data/levels/test/kugelblitz.stl:3
 msgid "Kugelblitz Test"
 msgstr "Kugelblitz-test"
 
-#: data/levels/test/laddertest.stl:3
-msgid "Ladder Test"
-msgstr "Stigetest"
-
 #: data/levels/test/light.stl:3
-msgid "One Block Fall-through / Spikes"
-msgstr "Éiblokks nedfall / piggar"
+msgid "Lightmap Test"
+msgstr ""
+
+#: data/levels/test/magicblocks.stl:3
+msgid "Magic Block Test"
+msgstr ""
+
+#: data/levels/test/menutest.stl:3
+msgid "Menu as Level Test"
+msgstr ""
+
+#: data/levels/test/newice.stl:3
+msgid "Unnamed (Ice Test)"
+msgstr ""
+
+#: data/levels/test/nightcave.stl:3
+msgid "NightCave test"
+msgstr ""
 
-#: data/levels/test/raintest.stl:4
-msgid "Rain And Ghost Theme Test"
-msgstr "Regn- og spøkjelsestematest"
+#: data/levels/test/oddbug.stl:3
+msgid "An Odd Bug"
+msgstr ""
 
-#: data/levels/test/risinglava.stl:3
-msgid "Rising Lava Test"
-msgstr "Veksande lava-test"
+#: data/levels/test/owl.stl:3
+msgid "Owl test"
+msgstr ""
 
-#: data/levels/test/script.stl:3
-msgid "Scripting Test"
-msgstr "Skripttest"
+#: data/levels/test/pneumatic_platform.stl:3
+msgid "Pneumatic Platform Test"
+msgstr ""
 
-#: data/levels/test/sectors.stl:4
-msgid "Sector Test"
-msgstr "Sektortest"
+#: data/levels/test/scripttrigger.stl:3
+msgid "Script Trigger Test"
+msgstr ""
 
-#: data/levels/test/stacking.stl:126
+#: data/levels/test/short_fuse.stl:3
+msgid "Short fuse bomb test"
+msgstr ""
+
+#: data/levels/test/snowair.stl:3
+msgid "Snow Air Tile Test"
+msgstr ""
+
+#: data/levels/test/snowmountain.stl:3
+msgid "Snow Mountain Tiles"
+msgstr ""
+
+#: data/levels/test/snowslope.stl:3
+msgid "Snow Slope Tile Test"
+msgstr ""
+
+#: data/levels/test/stacking.stl:4
+msgid "Enemy Stacking Test"
+msgstr ""
+
+#: data/levels/test/stacking.stl:60
 msgid "images/powerups/egg/egg.sprite"
 msgstr "images/powerups/egg/egg.sprite"
 
+#: data/levels/test/tileplatforms.stl:3
+msgid "Tile Platform Test"
+msgstr ""
+
+#: data/levels/test/totem.stl:4
+msgid "Totem Test"
+msgstr "Totemtest"
+
 #: data/levels/test/transition.stl:3
 msgid "Ghost Forest Transition"
 msgstr "Spøkjelsesskogovergang"
 
 #: data/levels/test/treeboss.stl:3
-msgid "Trees Suck"
-msgstr "Tre suger"
+msgid "Trees Suck (Tree Boss Test)"
+msgstr ""
+
+#: data/levels/test/unisolid.stl:3
+msgid "Snow Tileset and Platform Test"
+msgstr ""
 
-#: data/levels/test/verticalforest.stl:5
-msgid "Inside The Tree"
-msgstr "Inni treet"
+#: data/levels/test/unstable_tile.stl:3
+msgid "Unstable tile test"
+msgstr ""
 
-#: data/levels/test/wansti-level4.stl:4
-msgid "Collapse Imminent!"
-msgstr "Samanbrotet er nærståande!"
+#~ msgid "Unnamed"
+#~ msgstr "Namnlaus"
+
+#~ msgid "Ambient Sound Test"
+#~ msgstr "Omgjevnadslydtest"
+
+#~ msgid ""
+#~ "-Info\n"
+#~ "#An ambient sound \n"
+#~ "#leveldone music\n"
+#~ msgstr ""
+#~ "-Info\n"
+#~ "#Omgjevnadslyd \n"
+#~ "#Brett fullført\n"
+
+#~ msgid ""
+#~ "-Info\n"
+#~ "#An ambient sound \n"
+#~ "#source playing the\n"
+#~ "#rain effect should \n"
+#~ "#be audible here.\n"
+#~ msgstr ""
+#~ "-Info\n"
+#~ "#Omgjevnadslyd \n"
+#~ "#med regneffektar\n"
+#~ "#skal hørast no.\n"
+
+#~ msgid ""
+#~ "-Info\n"
+#~ "#Waterfall\n"
+#~ "#Volume 0.2\n"
+#~ "#smaller geometry\n"
+#~ "#than rain source\n"
+#~ msgstr ""
+#~ "-Info\n"
+#~ "#Fossefall\n"
+#~ "#Volum 0,2\n"
+#~ "#Mindre geometri\n"
+#~ "#enn regnkjelda\n"
+
+#~ msgid ""
+#~ "-Info\n"
+#~ "#Lava (Area)\n"
+#~ "#extending right\n"
+#~ msgstr ""
+#~ "-Info\n"
+#~ "#Lava (område)\n"
+#~ "#som går til høgre\n"
+
+#~ msgid "Autoscroll Test (Above the Arctic Skies)"
+#~ msgstr "Autorullingstest («Over skyene»)"
+
+#~ msgid "Flying Platform Test"
+#~ msgstr "Flygande plattform-test"
+
+#~ msgid "Bonus Island Castle"
+#~ msgstr "Bonusøyslott"
+
+#~ msgid "Bonus Block Test"
+#~ msgstr "Bonusblokktest"
+
+#~ msgid ""
+#~ "-Info\n"
+#~ "#Beware of these crazy\n"
+#~ "#red potions.\n"
+#~ "#Better seek for blue\n"
+#~ "#potions."
+#~ msgstr ""
+#~ "-Info\n"
+#~ "#Pass deg for desse\n"
+#~ "#raude drikkane.\n"
+#~ "#Sjå heller etter\n"
+#~ "#blå drikkar."
+
+#~ msgid "DartTrap Test"
+#~ msgstr "DartTrap-test"
+
+#~ msgid "Forest Tiles / Slopes / Foreground Test"
+#~ msgstr "Skogbrikker / bakkar / framgrunnstest"
+
+#~ msgid "No Name"
+#~ msgstr "Namnlaus"
+
+#~ msgid "Forest Theme Test"
+#~ msgstr "Skogtematest"
+
+#~ msgid "Test of badguys hit from below"
+#~ msgstr "Test av knusing av slemmingar nedanfrå"
+
+#~ msgid "Sawblade Test"
+#~ msgstr "Sagbladtest"
+
+#~ msgid "SuperTux Intro"
+#~ msgstr "SuperTux-intro"
+
+#~ msgid "Nolok Escapes"
+#~ msgstr "Nolok rømmer"
+
+#~ msgid "key 1 water - to be placed behind waterfall"
+#~ msgstr "nøkkel 1 vatn - skal plasserast bak fossen"
+
+#~ msgid ""
+#~ "#Remember that you can type\n"
+#~ "#sector.add_key(key);\n"
+#~ "#keys are air, wood, earth, fire and water"
+#~ msgstr ""
+#~ "#Hugs at du kan skriva\n"
+#~ "#sector.add_key(nøkkel);\n"
+#~ "#Nøklane er «air» (luft),\n"
+#~ "#«wood» (tre), «earth» (jord),\n"
+#~ "#«fire» (eld) og «water» (vatn)."
+
+#~ msgid "Ladder Test"
+#~ msgstr "Stigetest"
+
+#~ msgid "One Block Fall-through / Spikes"
+#~ msgstr "Éiblokks nedfall / piggar"
+
+#~ msgid "Rain And Ghost Theme Test"
+#~ msgstr "Regn- og spøkjelsestematest"
+
+#~ msgid "Rising Lava Test"
+#~ msgstr "Veksande lava-test"
+
+#~ msgid "Scripting Test"
+#~ msgstr "Skripttest"
+
+#~ msgid "Sector Test"
+#~ msgstr "Sektortest"
+
+#~ msgid "Trees Suck"
+#~ msgstr "Tre suger"
+
+#~ msgid "Inside The Tree"
+#~ msgstr "Inni treet"
 
-#: data/levels/test/willowisp.stl:3
-msgid "WillOWisp Test"
-msgstr "WillOWisp-test"
+#~ msgid "Collapse Imminent!"
+#~ msgstr "Samanbrotet er nærståande!"
 
+#~ msgid "WillOWisp Test"
+#~ msgstr "WillOWisp-test"
diff --git a/data/levels/world1/ca.po b/data/levels/world1/ca.po
index f2a4f05c3..7011c3b01 100644
--- a/data/levels/world1/ca.po
+++ b/data/levels/world1/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-02-26 21:20+0100\n"
 "Last-Translator: Martí <estopenc@hotmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Benvingut a Antàrtida"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -27,42 +27,43 @@ msgid ""
 "#Hit them from below to get at their contents."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
 "#The egg makes Tux grow larger. Tux can then smash wooden blocks with his head."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
 "#The path in front of you is blocked. Gain some speed before jumping to pass over the blocks."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#The fire flower gives Tux the ability to shoot fireballs."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
 "#The Tux doll gives Tux 100 coins."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
diff --git a/data/levels/world1/cs.po b/data/levels/world1/cs.po
index 74f44bd64..81a66fb62 100644
--- a/data/levels/world1/cs.po
+++ b/data/levels/world1/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-01-28 12:30+0100\n"
 "Last-Translator: Ondřej Hošek <ondra.hosek@gmail.com>\n"
 "Language-Team: Czech\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Vítejte na Antarktidě"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -27,42 +27,43 @@ msgid ""
 "#Hit them from below to get at their contents."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
 "#The egg makes Tux grow larger. Tux can then smash wooden blocks with his head."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
 "#The path in front of you is blocked. Gain some speed before jumping to pass over the blocks."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#The fire flower gives Tux the ability to shoot fireballs."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
 "#The Tux doll gives Tux 100 coins."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
diff --git a/data/levels/world1/da.po b/data/levels/world1/da.po
index cd8f30995..731fc157a 100644
--- a/data/levels/world1/da.po
+++ b/data/levels/world1/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-06-18 19:45+0200\n"
 "Last-Translator: Anders <anders@ersej.dk>\n"
 "Language-Team:  <da@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Velkommen til Antarktis"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -32,42 +32,43 @@ msgid ""
 "#Hit them from below to get at their contents."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
 "#The egg makes Tux grow larger. Tux can then smash wooden blocks with his head."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
 "#The path in front of you is blocked. Gain some speed before jumping to pass over the blocks."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#The fire flower gives Tux the ability to shoot fireballs."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
 "#The Tux doll gives Tux 100 coins."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
diff --git a/data/levels/world1/de.po b/data/levels/world1/de.po
index fd53d7890..8dff21db7 100644
--- a/data/levels/world1/de.po
+++ b/data/levels/world1/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: world 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-05-20 14:17+0100\n"
 "Last-Translator: Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Willkommen in der Antarktis"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -39,7 +39,7 @@ msgstr ""
 "#\n"
 "#Durch Anstoßen von unten geben sie ihren Inhalt frei."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
@@ -49,17 +49,15 @@ msgstr ""
 "!images/powerups/egg/egg.png\n"
 "#Ein Ei lässt Tux wachsen. Tux kann dann Holzblöcke mit dem Kopf zertrümmern."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
-"-Checkpoints\n"
-"!images/objects/resetpoints/bell-m.png\n"
-"#Wird ein Kontrollpunkt durch Berührung aktiviert, so startet Tux hier statt am Anfang einer Level - solange noch 25 Münzen übrig sind."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
@@ -69,7 +67,7 @@ msgstr ""
 "!images/tiles/signs/run.png\n"
 "#Der Weg zum Ziel ist versperrt! Die Blöcke rechts von hier können nur rennend übersprungen werden."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
@@ -79,7 +77,7 @@ msgstr ""
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#Die Feuerblume verleiht Tux die Möglichkeit, Feuerbälle zu werfen."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
@@ -89,7 +87,7 @@ msgstr ""
 "!images/powerups/1up/1up.png\n"
 "#Der Pinguin ist 100 Münzen auf einmal wert."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
@@ -331,6 +329,15 @@ msgstr ""
 msgid "Icyisland"
 msgstr "Eisinsel"
 
+#~ msgid ""
+#~ "-Checkpoints\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+#~ msgstr ""
+#~ "-Checkpoints\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Wird ein Kontrollpunkt durch Berührung aktiviert, so startet Tux hier statt am Anfang einer Level - solange noch 25 Münzen übrig sind."
+
 #~ msgid "You found a secret area!"
 #~ msgstr "Neues Versteck gefunden!"
 
diff --git a/data/levels/world1/es.po b/data/levels/world1/es.po
index abe334fc1..bbdd53590 100644
--- a/data/levels/world1/es.po
+++ b/data/levels/world1/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2006-10-03 23:32+0100\n"
 "Last-Translator: Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Bienvenido a la Antártida"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -27,42 +27,43 @@ msgid ""
 "#Hit them from below to get at their contents."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
 "#The egg makes Tux grow larger. Tux can then smash wooden blocks with his head."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
 "#The path in front of you is blocked. Gain some speed before jumping to pass over the blocks."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#The fire flower gives Tux the ability to shoot fireballs."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
 "#The Tux doll gives Tux 100 coins."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
diff --git a/data/levels/world1/fi.po b/data/levels/world1/fi.po
index 0b324ede1..e23823055 100644
--- a/data/levels/world1/fi.po
+++ b/data/levels/world1/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: world 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-07-15 17:07+0200\n"
 "Last-Translator: Jan Solanti <jhs@psonet.com>\n"
 "Language-Team: Finnish <gnome-fi-laatu-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Tervetuloa Etelämantereelle"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -37,7 +37,7 @@ msgstr ""
 "#\n"
 "#Saadaksesi niiden sisällöt iske niitä alhaalta."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
@@ -47,17 +47,15 @@ msgstr ""
 "!images/powerups/egg/egg.png\n"
 "#Muna kasvattaa Tuxia. Täten hän voi rikkoa puulaatikoita päällään."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
-"-Tallennuspisteet\n"
-"!images/objects/resetpoints/bell-m.png\n"
-"#Kun olet aktivoinut tallennuspisteen, jatkat kuolintapauksessa sen luota, mikäli sinulla on vähintään 25 kolikkoa jäljellä."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
@@ -67,7 +65,7 @@ msgstr ""
 "!images/tiles/signs/run.png\n"
 "#Tie edessäsi on tukossa. Ota vauhtia ennen kuin hyppäät päästäksesi esteen yli."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
@@ -77,7 +75,7 @@ msgstr ""
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#Tulikukka antaa Tuxille kyvyn heittää tulipalloja."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
@@ -87,7 +85,7 @@ msgstr ""
 "!images/powerups/1up/1up.png\n"
 "#Pingviininukke antaa Tuxille 100 kolikkoa."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
@@ -326,6 +324,15 @@ msgstr ""
 msgid "Icyisland"
 msgstr "Jääsaari"
 
+#~ msgid ""
+#~ "-Checkpoints\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+#~ msgstr ""
+#~ "-Tallennuspisteet\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Kun olet aktivoinut tallennuspisteen, jatkat kuolintapauksessa sen luota, mikäli sinulla on vähintään 25 kolikkoa jäljellä."
+
 #~ msgid "You found a secret area!"
 #~ msgstr "Löysit salaisen paikan!"
 
diff --git a/data/levels/world1/hu.po b/data/levels/world1/hu.po
index ff666f1c2..0f1c5a8d4 100644
--- a/data/levels/world1/hu.po
+++ b/data/levels/world1/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTuX world1 hungarian translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-05-20 13:41+0100\n"
 "Last-Translator: Kővágó Zoltán <DirtY.iCE.hu@gmail.com>\n"
 "Language-Team: Kővágó Zoltán (DirtY iCE) <DirtY.iCE.hu@gmail.com>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Üdvözlet Az Antarktiszon!"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -36,7 +36,7 @@ msgstr ""
 "#\n"
 "#Üsd meg őket alulról, hogy megkapd a tartalmát."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
@@ -46,17 +46,15 @@ msgstr ""
 "!images/powerups/egg/egg.png\n"
 "#A tojástól Tux megnő, így szét tudja törni a fa dobozokat a fejével."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
-"-Ellenőrző pontok:\n"
-"!images/objects/resetpoints/bell-m.png\n"
-"#Aktiváld az ellenőrző pontot. Ha meghalsz, és még van 25 érméd, allata fogod újrakezdeni (és nem a pálya elején)."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
@@ -66,7 +64,7 @@ msgstr ""
 "!images/tiles/signs/run.png\n"
 "#Az út le van zárva. Neki kel futnod, hogy át tudd ugrani."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
@@ -76,7 +74,7 @@ msgstr ""
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#A tűzvirág segítségével Tux tűzgolyókat lőhet."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
@@ -86,7 +84,7 @@ msgstr ""
 "!images/powerups/1up/1up.png\n"
 "#Ha elkapod, kapsz 100 érmét."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
@@ -274,6 +272,15 @@ msgstr ""
 msgid "Icyisland"
 msgstr "Jégsziget"
 
+#~ msgid ""
+#~ "-Checkpoints\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+#~ msgstr ""
+#~ "-Ellenőrző pontok:\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Aktiváld az ellenőrző pontot. Ha meghalsz, és még van 25 érméd, allata fogod újrakezdeni (és nem a pálya elején)."
+
 #~ msgid "You found a secret area!"
 #~ msgstr "Megtaláltál egy titkos területet!"
 
diff --git a/data/levels/world1/lt.po b/data/levels/world1/lt.po
index 63a036372..309ddb33f 100644
--- a/data/levels/world1/lt.po
+++ b/data/levels/world1/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: world 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-04-01 18:46+0300\n"
 "Last-Translator: Andrius Å tikonas <stikonas@gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Sveikas atvykęs į Antarktidą"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -29,7 +29,7 @@ msgid ""
 "#Hit them from below to get at their contents."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 #, fuzzy
 msgid ""
 "-Eggs\n"
@@ -40,28 +40,29 @@ msgstr ""
 "!images/powerups/egg/egg.png\n"
 "#Kaiušinis užaugina Tuxą didesniu. Tuxas tada gali daužyti medinius blokelius sus savo galva."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
 "#The path in front of you is blocked. Gain some speed before jumping to pass over the blocks."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#The fire flower gives Tux the ability to shoot fireballs."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
@@ -71,7 +72,7 @@ msgstr ""
 "!images/powerups/1up/1up.png\n"
 "#Tux lėlė duoda Tuxui 100 monetų."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
diff --git a/data/levels/world1/nb.po b/data/levels/world1/nb.po
index 8a6bbc1da..3401a25bd 100644
--- a/data/levels/world1/nb.po
+++ b/data/levels/world1/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-07-13 19:15+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Velkommen til sørpolen"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -35,7 +35,7 @@ msgstr ""
 "#\n"
 "#Knus blokkene nedenfra for å få tak i det de inneholder."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
@@ -45,17 +45,15 @@ msgstr ""
 "!images/powerups/egg/egg.png\n"
 "#Egget får deg til å vokse deg større. Du kan da knuse treblokker med hodet."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
-"-Bjelle\n"
-"!images/objects/resetpoints/bell-m.png\n"
-"#Ring med bjella. Har du minst 25 mynter igjen, vil du da gjenoppstå på bjelleplassen når du dør."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
@@ -65,7 +63,7 @@ msgstr ""
 "!images/tiles/signs/run.png\n"
 "#Veien framfor deg er stengt. Du må løpe fort for å kunne klare å hoppe over hindrene."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
@@ -75,7 +73,7 @@ msgstr ""
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#Ildblomsten gir deg evnen til å skyte ildkuler."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
@@ -85,7 +83,7 @@ msgstr ""
 "!images/powerups/1up/1up.png\n"
 "#Tux-dokka gir deg 100 mynter."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
@@ -322,6 +320,15 @@ msgstr ""
 msgid "Icyisland"
 msgstr "Isøya"
 
+#~ msgid ""
+#~ "-Checkpoints\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+#~ msgstr ""
+#~ "-Bjelle\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Ring med bjella. Har du minst 25 mynter igjen, vil du da gjenoppstå på bjelleplassen når du dør."
+
 #~ msgid "Icyisland levels"
 #~ msgstr "Isøya-brett"
 
diff --git a/data/levels/world1/nn.po b/data/levels/world1/nn.po
index 661e1be37..f2e24daff 100644
--- a/data/levels/world1/nn.po
+++ b/data/levels/world1/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-07-01 10:49+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Velkommen til sørpolen"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -36,7 +36,7 @@ msgstr ""
 "#\n"
 "#Knus blokkene nedanfrå for å få tak i det dei inneheld."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
@@ -46,17 +46,15 @@ msgstr ""
 "!images/powerups/egg/egg.png\n"
 "#Egget får deg til å veksa deg større. Du kan då knusa treblokker med hovudet."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
-"-Bjølle\n"
-"!images/objects/resetpoints/bell-m.png\n"
-"#Ring med bjølla. Har du minst 25 myntar att, vil du då gjenoppstå på bjølleplassen når du døyr."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
@@ -66,7 +64,7 @@ msgstr ""
 "!images/tiles/signs/run.png\n"
 "#Vegen framfor deg er stengt. Du må springa fort for å kunna klara å hoppa over hindera."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
@@ -76,7 +74,7 @@ msgstr ""
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#Eldblomen gjev deg evna til å skyta eldkuler."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
@@ -86,7 +84,7 @@ msgstr ""
 "!images/powerups/1up/1up.png\n"
 "#Tux-dokka gjev deg 100 myntar."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
@@ -323,6 +321,15 @@ msgstr ""
 msgid "Icyisland"
 msgstr "Isøya"
 
+#~ msgid ""
+#~ "-Checkpoints\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+#~ msgstr ""
+#~ "-Bjølle\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Ring med bjølla. Har du minst 25 myntar att, vil du då gjenoppstå på bjølleplassen når du døyr."
+
 #~ msgid "Icyisland levels"
 #~ msgstr "Isøya-brett"
 
diff --git a/data/levels/world1/pt_BR.po b/data/levels/world1/pt_BR.po
index 96ce61830..8b313a307 100644
--- a/data/levels/world1/pt_BR.po
+++ b/data/levels/world1/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-04-16 19:10-0300\n"
 "Last-Translator: Krishna <krishnalelis@gmail.com>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Bem-vindo à Antártida"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -36,7 +36,7 @@ msgstr ""
 "#Blocos Bônus podem conter moedsa, poderes, ou itens especiais que lhe ajudarão em sua busca#\n"
 "#Atinja-os por baixo para obter seus conteúdos."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
@@ -46,17 +46,15 @@ msgstr ""
 "!images/powerups/egg/egg.png\n"
 "#Os ovos fazem o Tux crescer. Tux, então, pode quebrar os blocos de madeira com a cabeça."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
-"-Pontos de verificação\n"
-"!images/objects/resetpoints/bell-m.png\n"
-"#Ative o ponto de verificação. Desde que você tenha pelo menos 25 moedas, você poderá reiniciar o nível a partir dele."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
@@ -66,7 +64,7 @@ msgstr ""
 "!images/tiles/signs/run.png\n"
 "#O caminho à sua frente está bloqueado. Ganhe alguma velocidade antes de pular por sobre os blocos."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
@@ -76,7 +74,7 @@ msgstr ""
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#A flor de fogo dá ao Tux o poder de atirar bolas de fogo."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
@@ -86,7 +84,7 @@ msgstr ""
 "!images/powerups/1up/1up.png\n"
 "O boneco do Tux dá ao Tux 100 moedas."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
@@ -329,6 +327,15 @@ msgstr ""
 msgid "Icyisland"
 msgstr "Ilha Glacial"
 
+#~ msgid ""
+#~ "-Checkpoints\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+#~ msgstr ""
+#~ "-Pontos de verificação\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Ative o ponto de verificação. Desde que você tenha pelo menos 25 moedas, você poderá reiniciar o nível a partir dele."
+
 #~ msgid "Icyisland levels"
 #~ msgstr "Níveis da Ilha de Gelo"
 
diff --git a/data/levels/world1/ro.po b/data/levels/world1/ro.po
index 1c2d11ad7..a87021de5 100644
--- a/data/levels/world1/ro.po
+++ b/data/levels/world1/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-07-20 19:08+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Bunvenit in Antarctica"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -36,7 +36,7 @@ msgstr ""
 "#\n"
 "#Loveste-le de jos pentru a ajunge la continutul lor."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
@@ -46,17 +46,15 @@ msgstr ""
 "!images/powerups/egg/egg.png\n"
 "#Ouale il fac pe Tux mai mare. Apoi Tux poate sa sparga blocuri de lemn cu capul sau."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
-"-Puncte de verificare \n"
-"!images/objects/resetpoints/bell-m.png\n"
-"#Activeaza punctul de verificare. Atata timp cat ai cel putin 25 monezi, poti  reincerca nivelul de la acest punct."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
@@ -66,7 +64,7 @@ msgstr ""
 "!images/tiles/signs/run.png\n"
 "#Calea din fata ta este blocata. Mareste viteza inainte de a sari pentru a putea trece peste blocuri."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
@@ -76,7 +74,7 @@ msgstr ""
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#Floarea de foc ii da lui Tux abilitatea de a trage cu mingi de foc."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
@@ -86,7 +84,7 @@ msgstr ""
 "!images/powerups/1up/1up.png\n"
 "#Papusa Tux ii da lui Tux 100 de monezi."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
@@ -326,6 +324,15 @@ msgstr ""
 msgid "Icyisland"
 msgstr "Insula inghetata"
 
+#~ msgid ""
+#~ "-Checkpoints\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+#~ msgstr ""
+#~ "-Puncte de verificare \n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Activeaza punctul de verificare. Atata timp cat ai cel putin 25 monezi, poti  reincerca nivelul de la acest punct."
+
 #~ msgid "You found a secret area!"
 #~ msgstr "Ai gasit o zona secreta!"
 
diff --git a/data/levels/world1/sl.po b/data/levels/world1/sl.po
index e8795bf67..7aaa61c9b 100644
--- a/data/levels/world1/sl.po
+++ b/data/levels/world1/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-03-11 12:16+0100\n"
 "Last-Translator: Marko Burjek <email4marko@gmail.com>\n"
 "Language-Team:  <sl@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Dobrodošli na Antarktiki"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -32,42 +32,43 @@ msgid ""
 "#Hit them from below to get at their contents."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
 "#The egg makes Tux grow larger. Tux can then smash wooden blocks with his head."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
 "#The path in front of you is blocked. Gain some speed before jumping to pass over the blocks."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#The fire flower gives Tux the ability to shoot fireballs."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
 "#The Tux doll gives Tux 100 coins."
 msgstr ""
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
diff --git a/data/levels/world1/sv.po b/data/levels/world1/sv.po
index 4a034b74e..3a2145c2b 100644
--- a/data/levels/world1/sv.po
+++ b/data/levels/world1/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 16:25+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2010-03-02 17:44+0100\n"
 "Last-Translator: Arvid Norlander <anmaster@berlios.de>\n"
 "Language-Team: Swedish <supertux-devel@lists.lethargik.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "Välkommen till Antarktis"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:48
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -38,7 +38,7 @@ msgstr ""
 "#\n"
 "#Träffa dem från undersidan för att nå deras innehåll."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:57
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
@@ -48,17 +48,15 @@ msgstr ""
 "!images/powerups/egg/egg.png\n"
 "#Ägget får Tux att växa. Tux kan då krossa träblock med sitt huvud."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:64
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
-"-Kontrollpunkter\n"
-"!images/objects/resetpoints/bell-m.png\n"
-"#Aktivera kontrollpunkten. Så länge som du har åtminstone 25 mynt kvar, kan du starta om nivån från här."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:71
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
@@ -68,7 +66,7 @@ msgstr ""
 "!images/tiles/signs/run.png\n"
 "#Vägen framför dig är blockerad. Ta sats och få upp farten innan du hoppar över blocken."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:78
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
@@ -78,7 +76,7 @@ msgstr ""
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#Eldsblomman ger Tux förmågan att skjuta klot av eld."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:85
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
@@ -88,14 +86,13 @@ msgstr ""
 "!images/powerups/1up/1up.png\n"
 "#En Tux-\"docka\" ger Tux 100 mynt."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:92
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
 msgstr ""
 "-Hemliga platser\n"
-"#Många nivåer innehåller hemliga platser bakom vad som syns vara helt vanliga väggar. Titta efter ledtrådar för att "
-"hitta dem."
+"#Många nivåer innehåller hemliga platser bakom vad som syns vara helt vanliga väggar. Titta efter ledtrådar för att hitta dem."
 
 #: data/levels/world1/02 - The Journey Begins.stl:3
 msgid "The Journey Begins"
@@ -328,5 +325,14 @@ msgstr ""
 msgid "Icyisland"
 msgstr "Isön"
 
+#~ msgid ""
+#~ "-Checkpoints\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+#~ msgstr ""
+#~ "-Kontrollpunkter\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Aktivera kontrollpunkten. Så länge som du har åtminstone 25 mynt kvar, kan du starta om nivån från här."
+
 #~ msgid "You found a secret area!"
 #~ msgstr "Du har hittat en hemlig plats!"
diff --git a/data/levels/world1/zh_CN.po b/data/levels/world1/zh_CN.po
index 480a753ef..05319bfb1 100644
--- a/data/levels/world1/zh_CN.po
+++ b/data/levels/world1/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Supertux 0.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-08-13 21:29+0800\n"
 "Last-Translator: Liu Sizhuang <chinatslsz@hotmail.com>\n"
 "Language-Team: Simplified Chinese <i18n-zh@list.google.com>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Welcome to Antarctica"
 msgstr "欢迎来到南极"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:30
+#: data/levels/world1/01 - Welcome to Antarctica.stl:54
 msgid ""
 "-Bonus Blocks\n"
 "!images/objects/bonus_block/full-0.png\n"
@@ -36,7 +36,7 @@ msgstr ""
 "#\n"
 "#从下方撞击它可以得到内容"
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:39
+#: data/levels/world1/01 - Welcome to Antarctica.stl:63
 msgid ""
 "-Eggs\n"
 "!images/powerups/egg/egg.png\n"
@@ -46,17 +46,15 @@ msgstr ""
 "!images/powerups/egg/egg.png\n"
 "#蛋可以使Tux长大. 然后Tux就可以用头撞破木块."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:46
+#: data/levels/world1/01 - Welcome to Antarctica.stl:70
 msgid ""
 "-Checkpoints\n"
 "!images/objects/resetpoints/bell-m.png\n"
-"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+"#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here.\n"
+" Statistics are only recorded if you don't need to respawn at a checkpoint."
 msgstr ""
-"-存盘点\n"
-"!images/objects/resetpoints/bell-m.png\n"
-"#激活这个存盘点. 只要你有至少25个金币, 你就可以从此处继续."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:53
+#: data/levels/world1/01 - Welcome to Antarctica.stl:78
 msgid ""
 "-Running\n"
 "!images/tiles/signs/run.png\n"
@@ -66,7 +64,7 @@ msgstr ""
 "!images/tiles/signs/run.png\n"
 "#前方的道路被封. 跳跃前加速就可以越过这些砖块."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:60
+#: data/levels/world1/01 - Welcome to Antarctica.stl:85
 msgid ""
 "-Fire Flower\n"
 "!images/powerups/fireflower/fire_flower-0.png\n"
@@ -76,7 +74,7 @@ msgstr ""
 "!images/powerups/fireflower/fire_flower-0.png\n"
 "#火之花赐予Tux发射火球的能力."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:67
+#: data/levels/world1/01 - Welcome to Antarctica.stl:92
 msgid ""
 "-Tux Doll\n"
 "!images/powerups/1up/1up.png\n"
@@ -86,7 +84,7 @@ msgstr ""
 "!images/powerups/1up/1up.png\n"
 "#给Tux 100金币."
 
-#: data/levels/world1/01 - Welcome to Antarctica.stl:74
+#: data/levels/world1/01 - Welcome to Antarctica.stl:99
 msgid ""
 "-Secret Areas\n"
 "#Many levels contain secret areas behind what seems to be plain walls. Look for clues to find them."
@@ -311,5 +309,14 @@ msgstr ""
 msgid "Icyisland"
 msgstr "冰之岛"
 
+#~ msgid ""
+#~ "-Checkpoints\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#Activate the checkpoint. As long as you have at least 25 coins left, you can retry the level from here."
+#~ msgstr ""
+#~ "-存盘点\n"
+#~ "!images/objects/resetpoints/bell-m.png\n"
+#~ "#激活这个存盘点. 只要你有至少25个金币, 你就可以从此处继续."
+
 #~ msgid "You found a secret area!"
 #~ msgstr "你找到了一个秘密区域!"
diff --git a/data/locale/ca.po b/data/locale/ca.po
index 45d3eed6b..9d8f32ed2 100644
--- a/data/locale/ca.po
+++ b/data/locale/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-02-19 18:27+0100\n"
 "Last-Translator: Martí <estopenc@hotmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,18 +18,33 @@ msgstr ""
 "X-Generator: KBabel 1.9\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Millors estadístiques del nivell"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Monedes"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Secrets"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Temps"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -49,146 +64,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Millors estadístiques del nivell"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Màxim de monedes"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Màxima matança:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Mínim temps necessari:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Màxima puntuació:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Tu"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Millor"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr ""
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Monedes"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr ""
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Secrets"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr ""
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Temps"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Tornar"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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 ""
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Nivells aportats"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "aportat per"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Continuar"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Has trobat un lloc secret!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Opcions"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Sortir del nivell"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Configurar Controls"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Configurar Joystick"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Amunt"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Ajupir-se"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Alt esquerre"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Alt dret"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Saltar"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Acci"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pausa/Menú"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Mirar a l'esquerra"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Mirar a la dreta"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr ""
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Tornar"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "No hi ha Joystick instalat"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Cap"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Apreta botó..."
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Configurar Controls"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr ""
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Amunt"
@@ -241,23 +252,17 @@ msgstr "Alt esquerre"
 msgid "Press Key"
 msgstr "Apreta la tecla"
 
-#: src/supertux/menu/main_menu.cpp:39
-msgid "Start Game"
-msgstr "Començar el joc"
-
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Nivells aportats"
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
 msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Opcions"
+#: src/supertux/menu/main_menu.cpp:39
+msgid "Start Game"
+msgstr "Començar el joc"
 
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
@@ -267,30 +272,6 @@ msgstr "Cr
 msgid "Quit"
 msgstr "Sortir"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr ""
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Continuar"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Sortir del nivell"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr ""
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr ""
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -384,31 +365,10 @@ msgstr "M
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Configurar Joystick"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pausa/Menú"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "No hi ha Joystick instalat"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Apreta botó..."
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pausa"
@@ -417,6 +377,48 @@ msgstr "Pausa"
 msgid "Quit World"
 msgstr "Sortir d'aquest món"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Màxim de monedes"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Màxima matança:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Mínim temps necessari:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Màxima puntuació:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Tu"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Millor"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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 ""
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Has trobat un lloc secret!"
+
+#~ msgid "contributed by "
+#~ msgstr "aportat per"
+
 #~ msgid "Slot"
 #~ msgstr "Ranura"
 
diff --git a/data/locale/cs.po b/data/locale/cs.po
index 59e7363a8..d3e6083ba 100644
--- a/data/locale/cs.po
+++ b/data/locale/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-02-02 17:15+0100\n"
 "Last-Translator: Ondřej Hošek <ondra.hosek@gmail.com>\n"
 "Language-Team: Czech\n"
@@ -18,18 +18,33 @@ msgstr ""
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Statistika nejlepších v úrovni"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Mince"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Skrýše"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Čas"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -49,149 +64,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Statistika nejlepších v úrovni"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Nejvíce sesbíraních mincí:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Nejvíce zneškodněných protivníků:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Nejméně času:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Nejvíce nalezených skrýší"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Ty"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Nejlepší"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Doplňky"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Mince"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr ""
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Skrýše"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr ""
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Čas"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Zpět"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
-"Tato hra přichází BEZ JAKÉKOLIV ZÁRUKY. Tento program je volný software; smíš jej\n"
-"distribuovat dle pokynů v souboru COPYING.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Přispěné úrovně"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "Autor: "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Pokračovat"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Našel jsi tajnou skrýš!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Nastavení"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Přerušit úroveň"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Nastavit klávesnici"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Nastavit joystick"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Nahoru"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Dolů"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Vlevo"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Vpravo"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Skok"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Akce"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pauza/Menu"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Kouknout vlevo"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Kouknout vpravo"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Konzole"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Zpět"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Nenalezen žádný joystick"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Nic"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Stiskni tlačítko"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Nastavit klávesnici"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Konzole"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Å ipka nahoru"
@@ -244,24 +252,18 @@ msgstr "Levý Alt"
 msgid "Press Key"
 msgstr "Stiskni klávesu"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr ""
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Spustit hru"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Přispěné úrovně"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Doplňky"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Nastavení"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Autoři"
@@ -270,30 +272,6 @@ msgstr "Autoři"
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr ""
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Pokračovat"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Přerušit úroveň"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr ""
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr ""
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -385,31 +363,10 @@ msgstr "Hudba (vypnutá)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Nastavit joystick"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pauza/Menu"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Nenalezen žádný joystick"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Stiskni tlačítko"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pauza"
@@ -418,6 +375,51 @@ msgstr "Pauza"
 msgid "Quit World"
 msgstr "Opustit svět"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Nejvíce sesbíraních mincí:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Nejvíce zneškodněných protivníků:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Nejméně času:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Nejvíce nalezených skrýší"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Ty"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Nejlepší"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
+"Tato hra přichází BEZ JAKÉKOLIV ZÁRUKY. Tento program je volný software; smíš jej\n"
+"distribuovat dle pokynů v souboru COPYING.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Našel jsi tajnou skrýš!"
+
+#~ msgid "contributed by "
+#~ msgstr "Autor: "
+
 #~ msgid "Slot"
 #~ msgstr "Hra"
 
diff --git a/data/locale/da.po b/data/locale/da.po
index 5175eb47c..8e3a4f93d 100644
--- a/data/locale/da.po
+++ b/data/locale/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-04-24 11:20+0200\n"
 "Last-Translator: Anders Schlichtkrull <anders@ersej.dk>\n"
 "Language-Team:  <da@li.org>\n"
@@ -18,18 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Bedste bane statistikker"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Mønter"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Hemmeligheder"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Tid"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -49,149 +64,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Bedste bane statistikker"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Flest mønter indsamlet:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Flest fjender nedlagt:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Kortest tid brugt:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Flest hemmeligheder fundet:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Dig"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Bedste"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Tilføjelser"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Mønter"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Tjek online"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Hemmeligheder"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Tjek online (slået fra)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Tid"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Tilbage"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
-"Dette spil kommer UDEN NOGET GARANTI. Det er fri software og du er velkommen til\n"
-"at videredistribuere det under visse forhold. Se filen COPYING for mere information.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Andre baner"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "lavet af "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Fortsæt"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Du har fundet et hemmeligt område"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Indstillinger"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Forlad bane"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Indstil tastatur"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Indstil Joystick"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Op"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Ned"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Venstre"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Højre"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Hop"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Handling"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pause/Menu"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Se til højre"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Se til venstre"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Konsol"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Tilbage"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Intet Joystick fundet"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Ingen"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Tryk på en knap"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Indstil tastatur"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Konsol"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Pil op"
@@ -244,24 +252,18 @@ msgstr "Venstre Alt"
 msgid "Press Key"
 msgstr "Tryk på en tast"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr ""
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Start spil"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Andre baner"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Tilføjelser"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Indstillinger"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Rulletekst"
@@ -270,30 +272,6 @@ msgstr "Rulletekst"
 msgid "Quit"
 msgstr "Afslut spil"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr ""
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Fortsæt"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Forlad bane"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Tjek online"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Tjek online (slået fra)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -385,31 +363,10 @@ msgstr "Musik (sl
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Indstil Joystick"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pause/Menu"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Intet Joystick fundet"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Tryk på en knap"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pause"
@@ -418,6 +375,51 @@ msgstr "Pause"
 msgid "Quit World"
 msgstr "Forlad verden"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Flest mønter indsamlet:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Flest fjender nedlagt:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Kortest tid brugt:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Flest hemmeligheder fundet:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Dig"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Bedste"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
+"Dette spil kommer UDEN NOGET GARANTI. Det er fri software og du er velkommen til\n"
+"at videredistribuere det under visse forhold. Se filen COPYING for mere information.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Du har fundet et hemmeligt område"
+
+#~ msgid "contributed by "
+#~ msgstr "lavet af "
+
 #~ msgid "Slot"
 #~ msgstr "Plads"
 
diff --git a/data/locale/de.po b/data/locale/de.po
index c4d2c2428..ecd157e4a 100644
--- a/data/locale/de.po
+++ b/data/locale/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2010-02-27 23:18+0100\n"
 "Last-Translator: Florian Forster <octo at verplant.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -24,20 +24,33 @@ msgstr ""
 "X-Poedit-KeywordsList: draw_text;draw_center_text;_\n"
 "X-Poedit-SearchPath-0: src\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
-msgstr "Aufruf: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
+msgstr ""
+
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Level-Rekorde"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Münzen"
+
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Verstecke"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Zeit"
 
-#: src/supertux//main.cpp:230
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
-" [OPTIONS] [LEVELFILE]\n"
 "\n"
-msgstr ""
-" [OPTIONS] [LEVELDATEI]\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
 "\n"
-
-#: src/supertux//main.cpp:231
-msgid ""
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -57,167 +70,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
-msgstr ""
-"Optionen:\n"
-"  -f, --fullscreen             Vollbild-Modus\n"
-"  -w, --window                 Fenster-Modus\n"
-"  -g, --geometry WIDTHxHEIGHT  SuperTux mit gewünschter Auflösung starten\n"
-"  -a, --aspect WIDTH:HEIGHT    Seitenverhältnis des Monitors angeben\n"
-"  --renderer RENDERER          Verwende den sdl, opengl oder auto Renderer\n"
-"  --disable-sfx                Soundeffekte deaktivieren\n"
-"  --disable-music              Musik deaktivieren\n"
-"  -h, --help                   Diesen Hilfetext anzeigen\n"
-"  -v, --version                SuperTux-Version anzeigen und beenden\n"
-"  --console                    Entwickler-Konsole einschalten\n"
-"  --noconsole                  Entwickler-Konsole ausschalten\n"
-"  --show-fps                   FPS-Anzeige einschalten\n"
-"  --no-show-fps                FPS-Anzeige aussschalten\n"
-"  --record-demo FILE LEVEL     Demo in Datei FILE aufzeichnen\n"
-"  --play-demo FILE LEVEL       Demo aus Datei FILE abspielen\n"
-"  -s, --debug-scripts          Script-Debugger aktivieren\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
 "\n"
+msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Level-Rekorde"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Münzen gesammelt:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Gegner besiegt:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Schnellste Zeit:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Verstecke gefunden:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Aktuell"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Rekord"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Erweiterungen"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Münzen"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Liste herunterladen"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Verstecke"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Liste herunterladen (deaktiviert)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Zeit"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Zurück"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 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/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Zusatzlevel"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "von "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Weiterspielen"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Neues Versteck gefunden!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Einstellungen"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr "Hoch geht's…"
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Level Abbrechen"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Tastenbelegung"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Joystickbelegung"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Oben"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Unten"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Links"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Rechts"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Springen"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Aktion"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pause/Menü"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Links umsehen"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Rechts umsehen"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr "Oben umsehen"
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr "Unten umsehen"
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Konsole"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr "Mit \"Hoch\" springen"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Zurück"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Keine Joysticks gefunden"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr "Nach Joysticks suchen"
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Keine"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Knopf drücken"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Tastenbelegung"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Konsole"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Oben"
@@ -270,24 +258,18 @@ msgstr "Alt (links)"
 msgid "Press Key"
 msgstr "Taste drücken"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Sprache"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr "<automatisch erkennen>"
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Spiel starten"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Zusatzlevel"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Erweiterungen"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Einstellungen"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Abspann"
@@ -296,30 +278,6 @@ msgstr "Abspann"
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Sprache"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr "<automatisch erkennen>"
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Weiterspielen"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Level Abbrechen"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Liste herunterladen"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Liste herunterladen (deaktiviert)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr "Sprache auswählen"
@@ -411,31 +369,10 @@ msgstr "Musik (deaktiviert)"
 msgid "Configure key-action mappings"
 msgstr "Tastenbelegung der Tastatur konfigurieren"
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Joystickbelegung"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr "Tastenbeledung des Joysticks konfigurieren"
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pause/Menü"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Keine Joysticks gefunden"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr "Nach Joysticks suchen"
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Knopf drücken"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pause"
@@ -443,3 +380,98 @@ msgstr "Pause"
 #: src/supertux/menu/worldmap_menu.cpp:30
 msgid "Quit World"
 msgstr "Welt verlassen"
+
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Münzen gesammelt:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Gegner besiegt:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Schnellste Zeit:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Verstecke gefunden:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Aktuell"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Rekord"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 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/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr "Hoch geht's…"
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Neues Versteck gefunden!"
+
+#~ msgid "Usage: "
+#~ msgstr "Aufruf: "
+
+#~ msgid ""
+#~ " [OPTIONS] [LEVELFILE]\n"
+#~ "\n"
+#~ msgstr ""
+#~ " [OPTIONS] [LEVELDATEI]\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "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"
+#~ "  -a, --aspect WIDTH:HEIGHT    Run SuperTux with given aspect ratio\n"
+#~ "  -d, --default                Reset video settings to default values\n"
+#~ "  --renderer RENDERER          Use sdl, opengl, or auto to render\n"
+#~ "  --disable-sfx                Disable sound effects\n"
+#~ "  --disable-music              Disable music\n"
+#~ "  -h, --help                   Show this help message and quit\n"
+#~ "  -v, --version                Show SuperTux version and quit\n"
+#~ "  --console                    Enable ingame scripting console\n"
+#~ "  --noconsole                  Disable ingame scripting console\n"
+#~ "  --show-fps                   Display framerate in levels\n"
+#~ "  --no-show-fps                Do not display framerate in levels\n"
+#~ "  --record-demo FILE LEVEL     Record a demo to FILE\n"
+#~ "  --play-demo FILE LEVEL       Play a recorded demo\n"
+#~ "  -s, --debug-scripts          Enable script debugger.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Optionen:\n"
+#~ "  -f, --fullscreen             Vollbild-Modus\n"
+#~ "  -w, --window                 Fenster-Modus\n"
+#~ "  -g, --geometry WIDTHxHEIGHT  SuperTux mit gewünschter Auflösung starten\n"
+#~ "  -a, --aspect WIDTH:HEIGHT    Seitenverhältnis des Monitors angeben\n"
+#~ "  --renderer RENDERER          Verwende den sdl, opengl oder auto Renderer\n"
+#~ "  --disable-sfx                Soundeffekte deaktivieren\n"
+#~ "  --disable-music              Musik deaktivieren\n"
+#~ "  -h, --help                   Diesen Hilfetext anzeigen\n"
+#~ "  -v, --version                SuperTux-Version anzeigen und beenden\n"
+#~ "  --console                    Entwickler-Konsole einschalten\n"
+#~ "  --noconsole                  Entwickler-Konsole ausschalten\n"
+#~ "  --show-fps                   FPS-Anzeige einschalten\n"
+#~ "  --no-show-fps                FPS-Anzeige aussschalten\n"
+#~ "  --record-demo FILE LEVEL     Demo in Datei FILE aufzeichnen\n"
+#~ "  --play-demo FILE LEVEL       Demo aus Datei FILE abspielen\n"
+#~ "  -s, --debug-scripts          Script-Debugger aktivieren\n"
+#~ "\n"
+
+#~ msgid "contributed by "
+#~ msgstr "von "
diff --git a/data/locale/es.po b/data/locale/es.po
index 196e8314b..66c86c545 100644
--- a/data/locale/es.po
+++ b/data/locale/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-05-11 01:01+0100\n"
 "Last-Translator: Sergio López - Briñas <sergionirri@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -21,18 +21,34 @@ msgstr ""
 "X-Generator: KBabel 1.9\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Mejores estadísticas del nivel"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+#, fuzzy
+msgid "Coins"
+msgstr "Monedas"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Secretos"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Tiempo"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -52,161 +68,156 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Mejores estadísticas del nivel"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Máximo de monedas:"
-
-#: src/supertux//statistics.cpp:147
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
 #, fuzzy
-msgid "Max fragging:"
-msgstr "Máxima matanza:"
-
-#: src/supertux//statistics.cpp:151
-#, fuzzy
-msgid "Min time needed:"
-msgstr "Mínimo tiempo necesario:"
+msgid "Add-ons"
+msgstr "Complementos"
 
-#: src/supertux//statistics.cpp:155
+#: src/supertux/menu/addon_menu.cpp:60
 #, fuzzy
-msgid "Max secrets found:"
-msgstr "Máxima puntuación:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Tú"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Mejor"
+msgid "Check Online"
+msgstr "Comprobar online"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
+#: src/supertux/menu/addon_menu.cpp:62
 #, fuzzy
-msgid "Coins"
-msgstr "Monedas"
-
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Secretos"
+msgid "Check Online (disabled)"
+msgstr "Comprobar online (deshabilitado)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Tiempo"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Volver"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 El equipo de SuperTux\n"
-"Este juego viene sin ABSOLUTAMENTE NINGUNA GARANTÍA. Esto es software libre, tienes permiso para\n"
-"redistribuirlo bajo ciertas condiciones; mira el archivo COPYING para más detalles.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Niveles aportados"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "aportado por"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Continuar"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "¡Encontraste un area secreta!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Opciones"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Abortar el nivel"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-#, fuzzy
-msgid "Setup Keyboard"
-msgstr "Configurar Controles"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Configurar Joystick"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Arriba"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 #, fuzzy
 msgid "Down"
 msgstr "Agacharse"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 #, fuzzy
 msgid "Left"
 msgstr "Alt izquierdo"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 #, fuzzy
 msgid "Right"
 msgstr "Alt derecho"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Saltar"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 #, fuzzy
 msgid "Action"
 msgstr "Acción"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+#, fuzzy
+msgid "Pause/Menu"
+msgstr "Pausa/Menu"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Mirar a la izquierda"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Mirar a la derecha"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-#, fuzzy
-msgid "Console"
-msgstr "Monedas"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 #, fuzzy
 msgid "Jump with Up"
 msgstr "Saltar con flecha arriba"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Volver"
+#: src/supertux/menu/joystick_menu.cpp:58
+#, fuzzy
+msgid "No Joysticks found"
+msgstr "No hay Joystick instalado"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr "Buscar joysticks"
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 #, fuzzy
 msgid "None"
 msgstr "Ninguna"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+#, fuzzy
+msgid "Press Button"
+msgstr "Presione Botón"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+#, fuzzy
+msgid "Setup Keyboard"
+msgstr "Configurar Controles"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+#, fuzzy
+msgid "Console"
+msgstr "Monedas"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Arriba"
@@ -259,25 +270,18 @@ msgstr "Alt izquierdo"
 msgid "Press Key"
 msgstr "Pulsa la tecla"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Idioma"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Comenzar el juego"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Niveles aportados"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-#, fuzzy
-msgid "Add-ons"
-msgstr "Complementos"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Opciones"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Créditos"
@@ -286,32 +290,6 @@ msgstr "Cr
 msgid "Quit"
 msgstr "Salir"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Idioma"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Continuar"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Abortar el nivel"
-
-#: src/supertux/menu/addon_menu.cpp:60
-#, fuzzy
-msgid "Check Online"
-msgstr "Comprobar online"
-
-#: src/supertux/menu/addon_menu.cpp:62
-#, fuzzy
-msgid "Check Online (disabled)"
-msgstr "Comprobar online (deshabilitado)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr "Seleccionar idioma"
@@ -405,34 +383,10 @@ msgstr "M
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Configurar Joystick"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-#, fuzzy
-msgid "Pause/Menu"
-msgstr "Pausa/Menu"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-#, fuzzy
-msgid "No Joysticks found"
-msgstr "No hay Joystick instalado"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr "Buscar joysticks"
-
-#: src/supertux/menu/joystick_menu.cpp:90
-#, fuzzy
-msgid "Press Button"
-msgstr "Presione Botón"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pausa"
@@ -441,6 +395,54 @@ msgstr "Pausa"
 msgid "Quit World"
 msgstr "Salir de este Mundo"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Máximo de monedas:"
+
+#: src/supertux/statistics.cpp:147
+#, fuzzy
+msgid "Max fragging:"
+msgstr "Máxima matanza:"
+
+#: src/supertux/statistics.cpp:151
+#, fuzzy
+msgid "Min time needed:"
+msgstr "Mínimo tiempo necesario:"
+
+#: src/supertux/statistics.cpp:155
+#, fuzzy
+msgid "Max secrets found:"
+msgstr "Máxima puntuación:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Tú"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Mejor"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 El equipo de SuperTux\n"
+"Este juego viene sin ABSOLUTAMENTE NINGUNA GARANTÍA. Esto es software libre, tienes permiso para\n"
+"redistribuirlo bajo ciertas condiciones; mira el archivo COPYING para más detalles.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "¡Encontraste un area secreta!"
+
+#~ msgid "contributed by "
+#~ msgstr "aportado por"
+
 #~ msgid "Slot"
 #~ msgstr "Ranura"
 
diff --git a/data/locale/fi.po b/data/locale/fi.po
index 0ed6788ce..88c65eb79 100644
--- a/data/locale/fi.po
+++ b/data/locale/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-07-15 17:10+0200\n"
 "Last-Translator: Jan Solanti <jhs@psonet.com>\n"
 "MIME-Version: 1.0\n"
@@ -23,18 +23,33 @@ msgstr ""
 "X-Poedit-KeywordsList: draw_text;draw_center_text;_\n"
 "X-Poedit-SearchPath-0: src\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Tason ennätykset"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Kolikot"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Salaisuudet"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Aika"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -54,149 +69,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Tason ennätykset"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Kerätyt kolikot:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Tapetut viholliset:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Nopein aika:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Löydetyt salaisuudet:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Nyt"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Ennätys"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Lisäosat"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Kolikot"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Päivitä lista"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Salaisuudet"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Päivitä lista (Ei käytössä)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Aika"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Takaisin"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
-"Tälle ohjelmalle ei myönnetä MINKÄÄNLAISTA TAKUUTA.Tämä on vapaa ohjelmisto, \n"
-"jota saa levittää tietyin ehdoin. Lisätietoja saat tiedostosta COPYING\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Lisätasot"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "Tekijä: "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Jatka"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Löysit salaisen paikan!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Asetukset"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Keskeytä taso"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Määritä näppäimet"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Määritä joystick"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Ylös"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Alas"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Vasen"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Oikea"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Hyppy"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Toiminta"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Tauko/Valikko"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Katso vasemmalle"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Katso oikealle"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Konsoli"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Takaisin"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Joystickejä ei löydetty"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Tyhjä"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Paina nappia"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Määritä näppäimet"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Konsoli"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Ylös"
@@ -249,24 +257,18 @@ msgstr "Alt (vasen)"
 msgid "Press Key"
 msgstr "Paina näppäintä"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr ""
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Aloita peli"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Lisätasot"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Lisäosat"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Asetukset"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Tekijät"
@@ -275,30 +277,6 @@ msgstr "Tekij
 msgid "Quit"
 msgstr "Lopeta"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr ""
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Jatka"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Keskeytä taso"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Päivitä lista"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Päivitä lista (Ei käytössä)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -390,31 +368,10 @@ msgstr "Musiikki (Ei k
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Määritä joystick"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Tauko/Valikko"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Joystickejä ei löydetty"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Paina nappia"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Tauko"
@@ -423,6 +380,51 @@ msgstr "Tauko"
 msgid "Quit World"
 msgstr "Poistu valikkoon"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Kerätyt kolikot:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Tapetut viholliset:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Nopein aika:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Löydetyt salaisuudet:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Nyt"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Ennätys"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
+"Tälle ohjelmalle ei myönnetä MINKÄÄNLAISTA TAKUUTA.Tämä on vapaa ohjelmisto, \n"
+"jota saa levittää tietyin ehdoin. Lisätietoja saat tiedostosta COPYING\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Löysit salaisen paikan!"
+
+#~ msgid "contributed by "
+#~ msgstr "Tekijä: "
+
 #~ msgid "Slot"
 #~ msgstr "Lohko"
 
diff --git a/data/locale/fr.po b/data/locale/fr.po
index af5817c78..1c2d8634f 100644
--- a/data/locale/fr.po
+++ b/data/locale/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-01-23 17:18+0100\n"
 "Last-Translator: Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>\n"
 "Language-Team: Français\n"
@@ -20,18 +20,33 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "X-Poedit-Basepath: D:\\msys\\1.0\\build\\supertux\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Statistiques des meilleurs niveaux"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Pièces"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Secrets"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Temps"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -51,146 +66,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Statistiques des meilleurs niveaux"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Pièces max :"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Frags max :"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Temps min :"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Maximul des endroits secrets trouvés:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Vous"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Meilleur"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr ""
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Pièces"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr ""
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Secrets"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr ""
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Temps"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Retour"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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 ""
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Contributions"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "contribué par "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Continuer"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Vous avez trouvé un endroit secret"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Options"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Abandonner le niveau"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Configuration du clavier"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Configuration du Joystick"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Haut"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Bas"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Gauche"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Droite"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Sauter"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Action"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pause/Menu"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Regarder à gauche"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Regarder à droite"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Console"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Retour"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Pas de Joystick trouvé"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Aucun(e)"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Appuyez sur un bouton"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Configuration du clavier"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Console"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Monter"
@@ -243,23 +254,17 @@ msgstr "Alt Gauche"
 msgid "Press Key"
 msgstr "Appuyer sur une touche"
 
-#: src/supertux/menu/main_menu.cpp:39
-msgid "Start Game"
-msgstr "Jouer"
-
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Contributions"
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
 msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Options"
+#: src/supertux/menu/main_menu.cpp:39
+msgid "Start Game"
+msgstr "Jouer"
 
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
@@ -269,30 +274,6 @@ msgstr "Crédits"
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr ""
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Continuer"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Abandonner le niveau"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr ""
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr ""
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -384,31 +365,10 @@ msgstr "Musique (désactivée)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Configuration du Joystick"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pause/Menu"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Pas de Joystick trouvé"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Appuyez sur un bouton"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pause"
@@ -417,6 +377,48 @@ msgstr "Pause"
 msgid "Quit World"
 msgstr "Quitter le monde"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Pièces max :"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Frags max :"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Temps min :"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Maximul des endroits secrets trouvés:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Vous"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Meilleur"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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 ""
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Vous avez trouvé un endroit secret"
+
+#~ msgid "contributed by "
+#~ msgstr "contribué par "
+
 #~ msgid "Slot"
 #~ msgstr "Slot"
 
diff --git a/data/locale/hu.po b/data/locale/hu.po
index 1fbd43cc7..cc9290cac 100644
--- a/data/locale/hu.po
+++ b/data/locale/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTuX hungarian translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-10-14 19:20+0200\n"
 "Last-Translator: Kővágó Zoltán <DirtY.iCE.hu@gmail.com>\n"
 "Language-Team: Kővágó Zoltán (DirtY iCE) <DirtY.iCE.hu@gmail.com>\n"
@@ -18,18 +18,33 @@ msgstr ""
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Legjobb Eredmények ezen a Pályán"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Érmék"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Titkok"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Idő"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -49,149 +64,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Legjobb Eredmények ezen a Pályán"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Legtöbb összegyűjtött érme:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Legtöbb megölt ellenség:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Legrövidebb idő:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Legtöbb titok megtalálva:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Most"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Legjobb"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Kiegészítők"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Érmék"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Online Ellenőrzés"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Titkok"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Online Ellenőrzés (letiltva)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Idő"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Vissza"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
-"Ez a program abban a reményben kerül közreadásra, hogy hasznos lesz, de minden egyéb GARANCIA\n"
-"NÉLKÜL. Ez egy szabad szoftver, amit szabadon továbbadhatsz a COPYING fájlban leírt módon.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Plusz Pályák"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "készítő"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Folytat"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Megtaláltál egy titkos területet!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Beállítások"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Pálya Megszakítása"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Billentyűzet Beállítása"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Joystick Beállítása"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Fel"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Le"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Balra"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Jobbra"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Ugrás"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Action"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Szünet/Menü"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Balra Néz"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Jobbra Néz"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Konzol"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr "Fel gombra Ugrás"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Vissza"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Joystick nem található"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Nincs"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Nyomj meg egy Gombot"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Billentyűzet Beállítása"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Konzol"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Fel billentyű"
@@ -244,24 +252,18 @@ msgstr "Bal Alt"
 msgid "Press Key"
 msgstr "Nyomj meg egy Gombot"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Nyelv"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Játék Indítása"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Plusz Pályák"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Kiegészítők"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Beállítások"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Készítők"
@@ -270,30 +272,6 @@ msgstr "Készítők"
 msgid "Quit"
 msgstr "Kilép"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Nyelv"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Folytat"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Pálya Megszakítása"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Online Ellenőrzés"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Online Ellenőrzés (letiltva)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -385,31 +363,10 @@ msgstr "Zene (letiltva)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Joystick Beállítása"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Szünet/Menü"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Joystick nem található"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Nyomj meg egy Gombot"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Szünet"
@@ -418,6 +375,51 @@ msgstr "Szünet"
 msgid "Quit World"
 msgstr "Kilépés a Világból"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Legtöbb összegyűjtött érme:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Legtöbb megölt ellenség:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Legrövidebb idő:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Legtöbb titok megtalálva:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Most"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Legjobb"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
+"Ez a program abban a reményben kerül közreadásra, hogy hasznos lesz, de minden egyéb GARANCIA\n"
+"NÉLKÜL. Ez egy szabad szoftver, amit szabadon továbbadhatsz a COPYING fájlban leírt módon.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Megtaláltál egy titkos területet!"
+
+#~ msgid "contributed by "
+#~ msgstr "készítő"
+
 #~ msgid "Slot"
 #~ msgstr "Hely"
 
diff --git a/data/locale/it.po b/data/locale/it.po
index 6f7266030..9938d1411 100644
--- a/data/locale/it.po
+++ b/data/locale/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-05-12 18:52+0100\n"
 "Last-Translator: Manuela Kessler <exty@exty.ch>\n"
 "Language-Team:  <it@li.org>\n"
@@ -17,18 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Statistiche dei migliori livelli"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Monete"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Segreti"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Tempo"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -48,149 +63,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Statistiche dei migliori livelli"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Monete max:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Vittime max:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Tempo minimo impiegato:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Segreti trovati max:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Tu"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Migliore"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Add-ons"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Monete"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Controlla Online"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Segreti"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Check Online (disattivato)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Tempo"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Indietro"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
-"Questo gioco è fornito SENZA ALCUNA GARANZIA. È un software libero e sei libero di\n"
-"distribuirlo seguendo determinate condizioni; guarda il file COPYING per maggiori informazioni.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Livelli aggiuntivi"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "col contributo di"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Continua"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Hai trovato un'area segreta!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Opzioni"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Esci dal livello"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Configurazione controlli"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Configura Joystick"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Sù"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Giù/Abbassarsi"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Sinistra"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Destra"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Salto"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Azione"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pausa/Menu"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Guardare a sinistra"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Guardare a destra"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Console"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Indietro"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Nessun joystick trovato"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Nessuno"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Premi pulsante"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Configurazione controlli"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Console"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Freccia su"
@@ -243,24 +251,18 @@ msgstr "Alt sinistro"
 msgid "Press Key"
 msgstr "Premi un tasto"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Lingua"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Inizia a giocare"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Livelli aggiuntivi"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Add-ons"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Opzioni"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Crediti"
@@ -269,30 +271,6 @@ msgstr "Crediti"
 msgid "Quit"
 msgstr "Esci"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Lingua"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Continua"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Esci dal livello"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Controlla Online"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Check Online (disattivato)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -384,31 +362,10 @@ msgstr "Musica (disattivata)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Configura Joystick"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pausa/Menu"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Nessun joystick trovato"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Premi pulsante"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pausa"
@@ -417,6 +374,51 @@ msgstr "Pausa"
 msgid "Quit World"
 msgstr "Esci dal mondo"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Monete max:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Vittime max:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Tempo minimo impiegato:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Segreti trovati max:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Tu"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Migliore"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
+"Questo gioco è fornito SENZA ALCUNA GARANZIA. È un software libero e sei libero di\n"
+"distribuirlo seguendo determinate condizioni; guarda il file COPYING per maggiori informazioni.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Hai trovato un'area segreta!"
+
+#~ msgid "contributed by "
+#~ msgstr "col contributo di"
+
 #~ msgid "Yes"
 #~ msgstr "Sì"
 
diff --git a/data/locale/lt.po b/data/locale/lt.po
index 9e87b3fd1..e89b5e793 100644
--- a/data/locale/lt.po
+++ b/data/locale/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertux 0.2-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-04-01 18:36+0300\n"
 "Last-Translator: Andrius Å tikonas <stikonas@gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -19,18 +19,33 @@ msgstr ""
 "X-Poedit-Language: Lithuanian\n"
 "X-Poedit-Country: LITHUANIA\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Geriausia lygio statistika"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Monetos"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Paslaptys"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Laikas"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -50,149 +65,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Geriausia lygio statistika"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Surinkta daugiausiai monetų"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Didžiausias fragmentavimas:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Prireikė mažiausia laiko:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Rasta daugiausia paslapčių:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Tu"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Geriausiai"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Priedai"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Monetos"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Pasitikrinti tinkle"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Paslaptys"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Tikrinimas tinkle (išjungtas)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Laikas"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Atgal"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
-"Šis žaidimas pateikiamas be jokios garantijos. Tai laisva programa, ir jūms leidžiama\n"
-" jį platinti tam tikromis sąlygomis; detales rasi COPYING byloje.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Papildomi lygiai"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "Sukūrė "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Tęsti"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Radai slaptą vietovę!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Nustatymai"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Nutraukti lygį"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Klaviatūros nustatymas"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Vairalazdės nustatymas"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Viršun"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Apačion"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Kairėn"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Dešinėn"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Å okti"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Veiksmas"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pauzė/meniu"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Pažvelgti į kairę"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Pažvelgti į dešinę"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Valdymo pultas"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Atgal"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Vairalazdžių nerasta"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Joks"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Paspausk mygtuką"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Klaviatūros nustatymas"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Valdymo pultas"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Rodyklė viršun"
@@ -245,24 +253,18 @@ msgstr "Kairysis Alt"
 msgid "Press Key"
 msgstr "Paspauskite klavišą"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Kalba"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Pradėti žaidimą"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Papildomi lygiai"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Priedai"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Nustatymai"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Kūrėjų sąrašas"
@@ -271,30 +273,6 @@ msgstr "Kūrėjų sąrašas"
 msgid "Quit"
 msgstr "Baigti"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Kalba"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Tęsti"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Nutraukti lygį"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Pasitikrinti tinkle"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Tikrinimas tinkle (išjungtas)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -386,31 +364,10 @@ msgstr "Muzika (uždrausta)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Vairalazdės nustatymas"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pauzė/meniu"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Vairalazdžių nerasta"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Paspausk mygtuką"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pauzė"
@@ -419,6 +376,51 @@ msgstr "Pauzė"
 msgid "Quit World"
 msgstr "Išeiti iš pasaulio"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Surinkta daugiausiai monetų"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Didžiausias fragmentavimas:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Prireikė mažiausia laiko:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Rasta daugiausia paslapčių:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Tu"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Geriausiai"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
+"Šis žaidimas pateikiamas be jokios garantijos. Tai laisva programa, ir jūms leidžiama\n"
+" jį platinti tam tikromis sąlygomis; detales rasi COPYING byloje.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Radai slaptą vietovę!"
+
+#~ msgid "contributed by "
+#~ msgstr "Sukūrė "
+
 #~ msgid "Yes"
 #~ msgstr "Taip"
 
diff --git a/data/locale/nb.po b/data/locale/nb.po
index 411edfc7e..c2b265d61 100644
--- a/data/locale/nb.po
+++ b/data/locale/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-05-12 08:46+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -20,18 +20,33 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Brettrekorder"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Mynter"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Hemmeligheter"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Tid"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -51,149 +66,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Brettrekorder"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Flest mynter:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Mest knusing:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Korteste tid brukt:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Flest hemmeligheter funnet:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Du"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Best"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Last ned"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Mynter"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Se etter på nettet"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Hemmeligheter"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Se etter på nettet (slått av)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Tid"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Tilbake"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
-"Dette spillet kommer helt uten noen form for garanti. Det er fri programvare, og du kan\n"
-"kopiere det til andre under visse vilkår. Se fila «COPYING» for mer informasjon.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Andre brett"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "Laget av "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Fortsett"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Du fant en hemmelig plass!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Oppsett"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr "Opp vi drar ..."
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Avbryt brett"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Spilltaster"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Styrespak"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Opp"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Ned"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Venstre"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Høyre"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Hopp"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Handling"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pause/meny"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Kikk til venstre"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Kikk til høyre"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr "Kikk opp"
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr "Kikk ned"
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Konsoll"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr "Hopp med opp"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Tilbake"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Fant ingen styrespaker"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr "Søk etter styrespaker"
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Ingen"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Trykk på knapp"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Spilltaster"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Konsoll"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Pil opp"
@@ -246,24 +254,18 @@ msgstr "Venstre-Alt"
 msgid "Press Key"
 msgstr "Trykk på knapp"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Språk"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Start spillet"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Andre brett"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Last ned"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Oppsett"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Bidragsytere"
@@ -272,30 +274,6 @@ msgstr "Bidragsytere"
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Språk"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Fortsett"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Avbryt brett"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Se etter på nettet"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Se etter på nettet (slått av)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr "Velg språk"
@@ -387,31 +365,10 @@ msgstr "Musikk (av)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Styrespak"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pause/meny"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Fant ingen styrespaker"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr "Søk etter styrespaker"
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Trykk på knapp"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pause"
@@ -420,6 +377,51 @@ msgstr "Pause"
 msgid "Quit World"
 msgstr "Avslutt verdenen"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Flest mynter:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Mest knusing:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Korteste tid brukt:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Flest hemmeligheter funnet:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Du"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Best"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
+"Dette spillet kommer helt uten noen form for garanti. Det er fri programvare, og du kan\n"
+"kopiere det til andre under visse vilkår. Se fila «COPYING» for mer informasjon.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr "Opp vi drar ..."
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Du fant en hemmelig plass!"
+
+#~ msgid "contributed by "
+#~ msgstr "Laget av "
+
 #~ msgid "Yes"
 #~ msgstr "Ja"
 
diff --git a/data/locale/ne.po b/data/locale/ne.po
index 001d44793..6ee4cf042 100644
--- a/data/locale/ne.po
+++ b/data/locale/ne.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-03-19 09:33-0400\n"
 "Last-Translator: Prabin Gautam <PRABINGAUTAM@GMAIL.COM>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -18,18 +18,33 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "उत्कृष्ट तह तथ्याङ्क"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "मुद्राहरु"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "गुप्त बस्तुहरु"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "समय"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -49,150 +64,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "उत्कृष्ट तह तथ्याङ्क"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "अधिक मुद्रा संकलन:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "अधिक सफलता:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "चाहिएको न्यूनतम समय"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "अधिक गुप्त बस्तु प्राप्त: "
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "तपाईँ"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "उत्कृष्ट"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "एडन्स"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "मुद्राहरु"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "अनलाइनमा जाँच गर्नुहोस"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "गुप्त बस्तुहरु"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "अनलाइनमा जाँच गर्नुहोस (अक्षम)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "समय"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "पछाडि"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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 ""
-"प्रातिलिपि अधिकार (c) २००७ सुपरटक्स विकास टोली\n"
-"यो खेलले कुनै पनि वारेन्टि वहन गर्दैन।यो एक स्वतन्त्र सफ्टवेर हो ।\n"
-" तपाईंलाई स्वागत गरीन्छ,यसस को पुन:वितरण गर्नको ला ;\n"
-" विस्तृत जानकारीका  लागि कृपया COPYING  फाइल हेर्नुहोस्।\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "योगदान तह"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "योगदान दिने:"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "जारी राख्नुहोस्"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "तपाईँले गुप्त स्थान पत्ता लगाउनुहोस्"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "विकल्पहरु"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "तहको बारेमा"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "कुञ्जीपाटी सेटअप"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "जोयस्टिक सेटअप"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "माथि"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "तल"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "बायाँ"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "दायाँ"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "उफ्रिनु"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "कार्य"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "पज / मेनु"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "अधिक बायाँ"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "अधिक दायाँ"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "कन्सोल"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr "माथि संगै उफ्रिनु"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "पछाडि"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "कुनै जोयस्टिक फेला परेन"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "खालि"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "बटन थिचनुहोस्"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "कुञ्जीपाटी सेटअप"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "कन्सोल"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "कर्सर माथि"
@@ -245,24 +252,18 @@ msgstr "लेफ्ट अल्ट"
 msgid "Press Key"
 msgstr "कि थिच्नुहोस्"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "भाषा"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "खेल शुरु गर्नुहोस"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "योगदान तह"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "एडन्स"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "विकल्पहरु"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "श्रेय"
@@ -271,30 +272,6 @@ msgstr "श्रेय"
 msgid "Quit"
 msgstr "बन्द गर्नुहोस"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "भाषा"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "जारी राख्नुहोस्"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "तहको बारेमा"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "अनलाइनमा जाँच गर्नुहोस"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "अनलाइनमा जाँच गर्नुहोस (अक्षम)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -386,31 +363,10 @@ msgstr "संगीत (अक्षम)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "जोयस्टिक सेटअप"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "पज / मेनु"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "कुनै जोयस्टिक फेला परेन"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "बटन थिचनुहोस्"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "पज"
@@ -419,6 +375,52 @@ msgstr "पज"
 msgid "Quit World"
 msgstr "यहाँबाट बाहिरिनुहोस"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "अधिक मुद्रा संकलन:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "अधिक सफलता:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "चाहिएको न्यूनतम समय"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "अधिक गुप्त बस्तु प्राप्त: "
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "तपाईँ"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "उत्कृष्ट"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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 ""
+"प्रातिलिपि अधिकार (c) २००७ सुपरटक्स विकास टोली\n"
+"यो खेलले कुनै पनि वारेन्टि वहन गर्दैन।यो एक स्वतन्त्र सफ्टवेर हो ।\n"
+" तपाईंलाई स्वागत गरीन्छ,यसस को पुन:वितरण गर्नको ला ;\n"
+" विस्तृत जानकारीका  लागि कृपया COPYING  फाइल हेर्नुहोस्।\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "तपाईँले गुप्त स्थान पत्ता लगाउनुहोस्"
+
+#~ msgid "contributed by "
+#~ msgstr "योगदान दिने:"
+
 #~ msgid "Slot"
 #~ msgstr "स्लट"
 
diff --git a/data/locale/nl.po b/data/locale/nl.po
index b31422831..a6e4af3f5 100644
--- a/data/locale/nl.po
+++ b/data/locale/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-03-21 12:32+0100\n"
 "Last-Translator: Pieter De Decker <pdedecker@gmail.com>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
@@ -18,18 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Levelrecords"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Muntjes"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Geheimen"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Tijd"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -49,148 +64,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Levelrecords"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Meeste muntjes:"
-
-#: src/supertux//statistics.cpp:147
-#, fuzzy
-msgid "Max fragging:"
-msgstr "Meeste gedode monsters:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Snelste tijd:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Meeste geheimen:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "U"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Record"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr ""
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Muntjes"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr ""
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Geheimen"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr ""
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Tijd"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Terug"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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 ""
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Extra levels"
 
-#: src/supertux//levelintro.cpp:92
-#, fuzzy
-msgid "contributed by "
-msgstr "gemaakt door"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Hervatten"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "U heeft een geheime plek gevonden!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Instellingen"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Level afbreken"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Toetsenbord configureren"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Joystick configureren"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Omlaag"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Links"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Rechts"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Spring"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Actie"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pauze/Menu"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Naar links kijken"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Naar rechts kijken"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Console"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Terug"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Geen joystick aangetroffen"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Geen"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Druk op een toets"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Toetsenbord configureren"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Console"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Pijltje naar omhoog"
@@ -243,23 +252,17 @@ msgstr "ALT (links)"
 msgid "Press Key"
 msgstr "Druk op een toets"
 
-#: src/supertux/menu/main_menu.cpp:39
-msgid "Start Game"
-msgstr "Spel starten"
-
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Extra levels"
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
 msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Instellingen"
+#: src/supertux/menu/main_menu.cpp:39
+msgid "Start Game"
+msgstr "Spel starten"
 
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
@@ -269,30 +272,6 @@ msgstr "Over SuperTux"
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr ""
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Hervatten"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Level afbreken"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr ""
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr ""
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -384,31 +363,10 @@ msgstr "Muziek (uitgeschakeld)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Joystick configureren"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pauze/Menu"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Geen joystick aangetroffen"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Druk op een toets"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pauze"
@@ -417,6 +375,50 @@ msgstr "Pauze"
 msgid "Quit World"
 msgstr "Naar hoofdmenu"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Meeste muntjes:"
+
+#: src/supertux/statistics.cpp:147
+#, fuzzy
+msgid "Max fragging:"
+msgstr "Meeste gedode monsters:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Snelste tijd:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Meeste geheimen:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "U"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Record"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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 ""
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "U heeft een geheime plek gevonden!"
+
+#, fuzzy
+#~ msgid "contributed by "
+#~ msgstr "gemaakt door"
+
 #, fuzzy
 #~ msgid "Slot"
 #~ msgstr "Slot"
diff --git a/data/locale/nn.po b/data/locale/nn.po
index 5ff499ca3..affca9dd2 100644
--- a/data/locale/nn.po
+++ b/data/locale/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-05-12 08:40+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -20,18 +20,33 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Brettrekordar"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Myntar"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Hemmelegheitar"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Tid"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -51,149 +66,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Brettrekordar"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Flest myntar:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Mest knusing:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Kortast tid brukt:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Flest hemmelegheitar funnen:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Du"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Best"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Last ned"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Myntar"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Sjå etter på nettet"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Hemmelegheitar"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Sjå etter på nettet (slått av)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Tid"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Tilbake"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
-"Dette spelet kjem heilt utan nokon garantiar. Det er fri programvare, og du kan\n"
-"kopiera det til andre under visse vilkår. Sjå fila «COPYING» for meir informasjon.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Andre brett"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "Laga av "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Hald fram"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Du fann ein hemmeleg plass!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Oppsett"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr "Opp me fer ..."
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Avbryt brett"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Speltastar"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Styrespak"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Opp"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Ned"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Venstre"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Høgre"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Hopp"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Handling"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pause/meny"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Kikk til venstre"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Kikk til høgre"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr "Kikk opp"
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr "Kikk ned"
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Konsoll"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr "Hopp med opp"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Tilbake"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Fann ingen styrespakar"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr "Søk etter styrespakar"
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Ingen"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Trykk på knapp"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Speltastar"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Konsoll"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Pil opp"
@@ -246,24 +254,18 @@ msgstr "Venstre-Alt"
 msgid "Press Key"
 msgstr "Trykk på knapp"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Språk"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Start spelet"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Andre brett"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Last ned"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Oppsett"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Bidragsytarar"
@@ -272,30 +274,6 @@ msgstr "Bidragsytarar"
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Språk"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Hald fram"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Avbryt brett"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Sjå etter på nettet"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Sjå etter på nettet (slått av)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr "Vel språk"
@@ -387,31 +365,10 @@ msgstr "Musikk (av)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Styrespak"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pause/meny"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Fann ingen styrespakar"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr "Søk etter styrespakar"
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Trykk på knapp"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pause"
@@ -420,6 +377,51 @@ msgstr "Pause"
 msgid "Quit World"
 msgstr "Avslutt verda"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Flest myntar:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Mest knusing:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Kortast tid brukt:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Flest hemmelegheitar funnen:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Du"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Best"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
+"Dette spelet kjem heilt utan nokon garantiar. Det er fri programvare, og du kan\n"
+"kopiera det til andre under visse vilkår. Sjå fila «COPYING» for meir informasjon.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr "Opp me fer ..."
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Du fann ein hemmeleg plass!"
+
+#~ msgid "contributed by "
+#~ msgstr "Laga av "
+
 #~ msgid "Yes"
 #~ msgstr "Ja"
 
diff --git a/data/locale/pl.po b/data/locale/pl.po
index ee7df7893..2b69728a2 100644
--- a/data/locale/pl.po
+++ b/data/locale/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-02-19 18:27+0100\n"
 "Last-Translator: Dominik <dominik232@gmail.com>\n"
 "Language-Team: Polish <dominik232@gmail.com>\n"
@@ -18,18 +18,33 @@ msgstr ""
 "X-Generator: KBabel 1.9\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Najlepsze wyniki"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Monety"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Secrets"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Czas"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -49,148 +64,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Najlepsze wyniki"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Najwiêcej zebranych monet:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
 msgstr ""
 
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Minimalnie potrzebny czas:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr ":"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Ty"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Najlepszy"
-
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Monety"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr ""
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Secrets"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr ""
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Czas"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Wróæ"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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 ""
-"To jest gra ABSOLUTNIE NIE ZOBOWI¡UJ¡CA. Jest to darmowe oprogramowanie... Jesli chcesz \n"
-"do³aczyæ do jej twórców zajrzyj do pliku COPYING, aby uzyskaæ szczególy.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Dodatkowe plansze"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "Przyczynili siê "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Kontynuuj"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Znalaz³e¶ sekretne miejsce!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Opcje"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Anuluj grê"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Ustawienia klawiatury"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Ustaw Joystick"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "W górê"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "W dól"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "W lewo"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "W prawo"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Skok"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Akcja"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pauza/Menu"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Przesuñ w lewo"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Przesuñ w prawo"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Konsola"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Wróæ"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Nie znaleziono Joystick'a"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Brak"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Naci¶nij przycisk"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Ustawienia klawiatury"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Konsola"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Góra"
@@ -243,23 +252,17 @@ msgstr "Lewy Alt"
 msgid "Press Key"
 msgstr "Naci¶nij klawisz"
 
-#: src/supertux/menu/main_menu.cpp:39
-msgid "Start Game"
-msgstr "Start Gry"
-
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Dodatkowe plansze"
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
 msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Opcje"
+#: src/supertux/menu/main_menu.cpp:39
+msgid "Start Game"
+msgstr "Start Gry"
 
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
@@ -269,30 +272,6 @@ msgstr "Tw
 msgid "Quit"
 msgstr "Wyjd¼"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr ""
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Kontynuuj"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Anuluj grê"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr ""
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr ""
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -386,31 +365,10 @@ msgstr "Muzyka (wylaczona)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Ustaw Joystick"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pauza/Menu"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Nie znaleziono Joystick'a"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Naci¶nij przycisk"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pauza"
@@ -419,6 +377,50 @@ msgstr "Pauza"
 msgid "Quit World"
 msgstr "Wyjd¼ z tego ¶wiata"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Najwiêcej zebranych monet:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr ""
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Minimalnie potrzebny czas:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr ":"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Ty"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Najlepszy"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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 ""
+"To jest gra ABSOLUTNIE NIE ZOBOWI¡UJ¡CA. Jest to darmowe oprogramowanie... Jesli chcesz \n"
+"do³aczyæ do jej twórców zajrzyj do pliku COPYING, aby uzyskaæ szczególy.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Znalaz³e¶ sekretne miejsce!"
+
+#~ msgid "contributed by "
+#~ msgstr "Przyczynili siê "
+
 #~ msgid "Slot"
 #~ msgstr "Miejsce"
 
diff --git a/data/locale/pt.po b/data/locale/pt.po
index acefbd08a..dee1e1a64 100644
--- a/data/locale/pt.po
+++ b/data/locale/pt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-05-05 09:35+0200\n"
 "Last-Translator: Jose Jorge <jjorge@free.fr>\n"
 "Language-Team: português <pt@li.org>\n"
@@ -20,18 +20,33 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Melhores Estatísticas do Nível"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Moedas"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Segredos"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Tempo"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -51,149 +66,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Melhores Estatísticas do Nível"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Máx moedas apanhadas:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Max matança:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Min tempo necessário:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Máx segredos descobertos:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Você"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Melhor"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Suplementos"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Moedas"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Verificar pela rede"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Segredos"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Verificar pela rede (inactivo)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Tempo"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Recuar"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
-"Este jogo é fornecido sem ABSOLUTAMENTE NENHUMA GARANTIA. É um programa livre, e é convidado a\n"
-"redistribuir-lo sob certas condições ; veja o ficheiro COPYING para mais informações.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Contribuições"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "contribuído por "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Continuar"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Descobriu uma zona secreta!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Opções"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Abortar Nível"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Configurar Teclas"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Configurar Joystick"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Acima"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Direita"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Saltar"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Acção"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pausa/Menu"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Olhar para a esquerda"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Olhar para a direita"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Consola"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr "Saltar e subir"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Recuar"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Nenhum Joystick encontrado"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Nenhum"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Carregue no Butão"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Configurar Teclas"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Consola"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Cursor Acima"
@@ -246,24 +254,18 @@ msgstr "Alt esquerdo"
 msgid "Press Key"
 msgstr "Carregue na tecla"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Língua"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Começar o Jogo"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Contribuições"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Suplementos"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Opções"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Méritos"
@@ -272,30 +274,6 @@ msgstr "Méritos"
 msgid "Quit"
 msgstr "Sair"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Língua"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Continuar"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Abortar Nível"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Verificar pela rede"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Verificar pela rede (inactivo)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -387,31 +365,10 @@ msgstr "Música (desligada)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Configurar Joystick"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pausa/Menu"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Nenhum Joystick encontrado"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Carregue no Butão"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pausa"
@@ -420,6 +377,51 @@ msgstr "Pausa"
 msgid "Quit World"
 msgstr "Sair do Mundo"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Máx moedas apanhadas:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Max matança:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Min tempo necessário:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Máx segredos descobertos:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Você"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Melhor"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
+"Este jogo é fornecido sem ABSOLUTAMENTE NENHUMA GARANTIA. É um programa livre, e é convidado a\n"
+"redistribuir-lo sob certas condições ; veja o ficheiro COPYING para mais informações.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Descobriu uma zona secreta!"
+
+#~ msgid "contributed by "
+#~ msgstr "contribuído por "
+
 #~ msgid "Slot"
 #~ msgstr "Slot"
 
diff --git a/data/locale/pt_BR.po b/data/locale/pt_BR.po
index e4f893309..aabac1c7f 100644
--- a/data/locale/pt_BR.po
+++ b/data/locale/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-04-16 19:24+0100\n"
 "Last-Translator: Krishna <krishnalelis@gmail.com>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -19,18 +19,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Melhores Estatísticas dessa Fase"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Moedas"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Segredos"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Tempo"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -50,149 +65,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Melhores Estatísticas dessa Fase"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Máx moedas coletadas:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Máx abatidos:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Mín tempo necessário:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Máx segredos achados:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Você"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Melhor"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Extensões"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Moedas"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Verificar Online"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Segredos"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Verificar Online (desabilitado)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Tempo"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Voltar"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 do Time de Desenvolvimento do SuperTux\n"
-"Este jogo vem sem ABSOLUTAMENTE NENHUMA GARANTIA. Ele é um softwares livre, e você é encorajado a\n"
-"redistribuí-lo sob certas condições; veja o arquivo COPYING para detalhes.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Níveis Extras"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "contribuído por"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Continuar"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Você achou uma área secreta!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Opções"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Desistir dessa Fase"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Configurar Teclado"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Configurar Joystick"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Cima"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Baixo"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Direita"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Pular"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Ação"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pausa/Menu"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Espiar à Esquerda"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Espiar à Direita"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Console"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr "Pula com Tecla para Cima"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Voltar"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Nenhum Joystick encontrado"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Nada"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Pressione um Botão"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Configurar Teclado"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Console"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Tecla pra cima"
@@ -245,24 +253,18 @@ msgstr "Alt Esquerdo"
 msgid "Press Key"
 msgstr "Pressione uma Tecla"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Língua"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Começar Jogo"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Níveis Extras"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Extensões"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Opções"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Créditos"
@@ -271,30 +273,6 @@ msgstr "Créditos"
 msgid "Quit"
 msgstr "Sair"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Língua"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Continuar"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Desistir dessa Fase"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Verificar Online"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Verificar Online (desabilitado)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -386,31 +364,10 @@ msgstr "Música (desligada)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Configurar Joystick"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pausa/Menu"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Nenhum Joystick encontrado"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Pressione um Botão"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pausar"
@@ -419,6 +376,51 @@ msgstr "Pausar"
 msgid "Quit World"
 msgstr "Sair deste Mundo"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Máx moedas coletadas:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Máx abatidos:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Mín tempo necessário:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Máx segredos achados:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Você"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Melhor"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 do Time de Desenvolvimento do SuperTux\n"
+"Este jogo vem sem ABSOLUTAMENTE NENHUMA GARANTIA. Ele é um softwares livre, e você é encorajado a\n"
+"redistribuí-lo sob certas condições; veja o arquivo COPYING para detalhes.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Você achou uma área secreta!"
+
+#~ msgid "contributed by "
+#~ msgstr "contribuído por"
+
 #~ msgid "Yes"
 #~ msgstr "Sim"
 
diff --git a/data/locale/ro.po b/data/locale/ro.po
index 34c1ef5a0..347f8c00b 100644
--- a/data/locale/ro.po
+++ b/data/locale/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-07-19 16:32+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -18,18 +18,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Statistici Cel Mai Bun Nivel"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Monede"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Secrete"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Timp"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -49,146 +64,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Statistici Cel Mai Bun Nivel"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Max monede colectate:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Max fragging:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Min timp necesar:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Max secrete gasite:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Tu"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Cel Mai Bun"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Add-ons"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Monede"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Verifica Online"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Secrete"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Verifica Online (dezactivat)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Timp"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Inapoi"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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 ""
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Contributie Nivele"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "contribuit de catre"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Continua"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Ai gasit o zona secreta!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Optiuni"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Renunta Nivel"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Configurare Tastatura"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Configurare Joystick"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Sus"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Jos"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Stanga"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Dreapta"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Saritura"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Actiune"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Pauza/Meniu"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Privire Stanga"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Privire Dreapta"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Consola"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Inapoi"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Nu au fost gasite joystick-uri"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Niciunul"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Apasa Buton"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Configurare Tastatura"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Consola"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Cursor sus"
@@ -241,24 +252,18 @@ msgstr "Alt stanga"
 msgid "Press Key"
 msgstr "Apasa tasta"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Limba"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Porneste Joc"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Contributie Nivele"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Add-ons"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Optiuni"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Credite"
@@ -267,30 +272,6 @@ msgstr "Credite"
 msgid "Quit"
 msgstr "Iesire"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Limba"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Continua"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Renunta Nivel"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Verifica Online"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Verifica Online (dezactivat)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -382,31 +363,10 @@ msgstr "Muzica (dezactivat)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Configurare Joystick"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Pauza/Meniu"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Nu au fost gasite joystick-uri"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Apasa Buton"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Pauza"
@@ -415,6 +375,48 @@ msgstr "Pauza"
 msgid "Quit World"
 msgstr "Iesire Lume"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Max monede colectate:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Max fragging:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Min timp necesar:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Max secrete gasite:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Tu"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Cel Mai Bun"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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 ""
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Ai gasit o zona secreta!"
+
+#~ msgid "contributed by "
+#~ msgstr "contribuit de catre"
+
 #~ msgid "Slot"
 #~ msgstr "Slot"
 
diff --git a/data/locale/ru.po b/data/locale/ru.po
index fc1f2809b..cf5a06380 100644
--- a/data/locale/ru.po
+++ b/data/locale/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SuperTux 0.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2008-12-09 19:56+0400\n"
 "Last-Translator: Constantin Baranov <const@mimas.ru>\n"
 "Language-Team: \n"
@@ -15,18 +15,33 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-SearchPath-0: src\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Лучшая статистика миссии"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Монеты"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Тайники"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Время"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -46,150 +61,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Лучшая статистика миссии"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Максимум собранных монет:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Максимум убитых:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Минимум времени:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Максимум найденных тайников:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Ваше"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Лучшее"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Дополнения"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Монеты"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Посмотреть в интернете"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Тайники"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Посмотреть в интернете (отключено)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Время"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Назад"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
-"Эта игра распространяется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ.\n"
-"Это свободное программное обеспечение, и вы можете распространять его\n"
-"при соблюдении некоторых условий; детали смотрите в файле COPYING.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Дополнительные миссии"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "автор -"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Продолжить"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Вы нашли тайник!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Настройки"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr "Идём вверх..."
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Прервать миссию"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Клавиатура"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Джойстик"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Вверх"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Вниз"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Влево"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Вправо"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Прыжок"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Действие"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Пауза/Меню"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Взгляд влево"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Взгляд вправо"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr "Взгляд вверх"
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr "Взгляд вниз"
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Консоль"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr "Прыжок = Вверх"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Назад"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Джойстик не найден"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr "Найти джойстики"
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Не задано"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Нажмите кнопку"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Клавиатура"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Консоль"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Стрелка вверх"
@@ -242,24 +249,18 @@ msgstr "Левый Alt"
 msgid "Press Key"
 msgstr "Нажмите клавишу"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Язык"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Начать игру"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Дополнительные миссии"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Дополнения"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Настройки"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Титры"
@@ -268,30 +269,6 @@ msgstr "Титры"
 msgid "Quit"
 msgstr "Выйти"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Язык"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Продолжить"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Прервать миссию"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Посмотреть в интернете"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Посмотреть в интернете (отключено)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr "Язык"
@@ -383,31 +360,10 @@ msgstr "Музыка (отключено)"
 msgid "Configure key-action mappings"
 msgstr "Настроить функции клавиш"
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Джойстик"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr "Настроить функции джойстика"
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Пауза/Меню"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Джойстик не найден"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr "Найти джойстики"
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Нажмите кнопку"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Пауза"
@@ -416,6 +372,52 @@ msgstr "Пауза"
 msgid "Quit World"
 msgstr "Покинуть мир"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Максимум собранных монет:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Максимум убитых:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Минимум времени:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Максимум найденных тайников:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Ваше"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Лучшее"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
+"Эта игра распространяется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ.\n"
+"Это свободное программное обеспечение, и вы можете распространять его\n"
+"при соблюдении некоторых условий; детали смотрите в файле COPYING.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr "Идём вверх..."
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Вы нашли тайник!"
+
+#~ msgid "contributed by "
+#~ msgstr "автор -"
+
 #~ msgid "auto-detect"
 #~ msgstr "автоопределение"
 
diff --git a/data/locale/sl.po b/data/locale/sl.po
index f6491f264..1b735fcd5 100644
--- a/data/locale/sl.po
+++ b/data/locale/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2007-03-11 12:18+0100\n"
 "Last-Translator: Marko Burjek <email4marko@gmail.com>\n"
 "Language-Team:  <sl@li.org>\n"
@@ -21,18 +21,33 @@ msgstr ""
 "X-Poedit-Country: SLOVENIA\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Statistika Najboljše stopnje"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Kovancev"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Skrivnosti"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Čas"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -52,146 +67,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Statistika Najboljše stopnje"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Največ zbranih kovancev:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Največ pobitih:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Najmanjši potreben čas:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Največ najdenih skrivnosti:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Vi"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Najboljši"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr ""
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Kovancev"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr ""
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Skrivnosti"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr ""
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Čas"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Nazaj"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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 ""
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Prispevane Stopnje"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "prispeval "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Nadaljuj"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Odkrili ste skrito območje!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Nastavitve"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Prekliči stopnjo"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Nastavitve tipkovnice"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Nastavitve igralne palice"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Gor"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Dol"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Levo"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Desno"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Skok"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Akcija"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Premor/Meni"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Poškili Levo"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Poškili Desno"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Konzola"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Nazaj"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Nobena igralna palica ni bila najdena"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Nič"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Pritisnite Gumb"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Nastavitve tipkovnice"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Konzola"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Tipka navzgor"
@@ -244,23 +255,17 @@ msgstr "Levi Alt"
 msgid "Press Key"
 msgstr "Pritisnite tipko"
 
-#: src/supertux/menu/main_menu.cpp:39
-msgid "Start Game"
-msgstr "Zaženi igro"
-
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Prispevane Stopnje"
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
 msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Nastavitve"
+#: src/supertux/menu/main_menu.cpp:39
+msgid "Start Game"
+msgstr "Zaženi igro"
 
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
@@ -270,30 +275,6 @@ msgstr "Zahvala"
 msgid "Quit"
 msgstr "Končaj"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr ""
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Nadaljuj"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Prekliči stopnjo"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr ""
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr ""
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -385,31 +366,10 @@ msgstr "Glasba (onemogočena)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Nastavitve igralne palice"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Premor/Meni"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Nobena igralna palica ni bila najdena"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Pritisnite Gumb"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Premor"
@@ -418,6 +378,48 @@ msgstr "Premor"
 msgid "Quit World"
 msgstr "Zapustite svet"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Največ zbranih kovancev:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Največ pobitih:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Najmanjši potreben čas:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Največ najdenih skrivnosti:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Vi"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Najboljši"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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 ""
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Odkrili ste skrito območje!"
+
+#~ msgid "contributed by "
+#~ msgstr "prispeval "
+
 #~ msgid "Slot"
 #~ msgstr "Reža"
 
diff --git a/data/locale/sv.po b/data/locale/sv.po
index fcd3a48c0..8da9e126f 100644
--- a/data/locale/sv.po
+++ b/data/locale/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 17:10+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2010-02-28 18:03+0100\n"
 "Last-Translator: Arvid Norlander <anmaster@berlios.de>\n"
 "Language-Team: Swedish <supertux-devel@lists.lethargik.org>\n"
@@ -21,20 +21,33 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
-msgstr "Användning: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
+msgstr ""
+
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Bästa resultat för nivå"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Mynt"
+
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Hemligheter"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Tid"
 
-#: src/supertux//main.cpp:230
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
-" [OPTIONS] [LEVELFILE]\n"
 "\n"
-msgstr ""
-" [ALTERNATIV] [FIL MED NIVÅ]\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
 "\n"
-
-#: src/supertux//main.cpp:231
-msgid ""
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -54,171 +67,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
-msgstr ""
-"Alternativ:\n"
-"  -f, --fullscreen             Kör i helskärmsläge\n"
-"  -w, --window                 Kör i fönsterläge\n"
-"  -g, --geometry BREDDxHÖJD    Kör SuperTux i en given upplösning\n"
-"  -a, --aspect BREDD:HÖJD      Kör SuperTux i de givna bildformatet\n"
-"  -d, --default                Återställ videoinställningar till förvalda "
-"värden\n"
-"  --renderer RENDERER          Använd sdl, opengl, eller auto för rendering\n"
-"  --disable-sfx                Avaktivera ljudeffetker\n"
-"  --disable-music              Avaktivera musik\n"
-"  -h, --help                   Visa detta hjälpmeddelande\n"
-"  -v, --version                Visa SuperTuxs version och avsluta\n"
-"  --console                    Aktivera skriptningskonsolen\n"
-"  --noconsole                  Avaktivera skriptningskonsolen\n"
-"  --show-fps                   Visa FPS i nivåer\n"
-"  --no-show-fps                Visa inte FPS i nivåer\n"
-"  --record-demo FIL NIVÅ       Spela in en demo till FIL\n"
-"  --play-demo FIL NIVÅ         Spela upp en inspelad demo\n"
-"  -s, --debug-scripts          Aktivera skriptavlusare.\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
 "\n"
+msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Bästa resultat för nivå"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Flest samlade mynt:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Flest dödade fiender:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Kortast behövd tid:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Flest funna hemligheter:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Du"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Bästa"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Tillägg"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Mynt"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Kontrollera online"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Hemligheter"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Kontrollera online (deaktiverad)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Tid"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Tillbaka"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
-"Detta spel kommer med ABSOLUT INGEN GARANTI. Detta är fri programvara, och "
-"du är välkommen att\n"
-"återdistrubuera den under vissa villkor; se filen COPYING för detaljer.\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Bidragna nivåer"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "bidragen av"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Fortsätt"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Du har hittat en hemlig plats!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Inställningar"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr "Nu klättrar vi..."
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Avbryt nivå"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Ställ in tangenter"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Ställ in styrspak"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Upp"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Ner"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Vänster"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Höger"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Hoppa"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Handling"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Paus/Meny"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Titta åt vänster"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Titta åt höger"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr "Titta upp"
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr "Titta ner"
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Konsol"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr "Hoppa med Up"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Tillbaka"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Ingen Joystick hittades"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr "Sök efter styrspakar"
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Ingen"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Tryck ner en knapp"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Ställ in tangenter"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Konsol"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Uppåtpil"
@@ -271,24 +255,18 @@ msgstr "Vänster Alt"
 msgid "Press Key"
 msgstr "Tryck ner en tangent"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Språk"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr "<autodetektera>"
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Starta spel"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Bidragna nivåer"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Tillägg"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Inställningar"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Författare"
@@ -297,30 +275,6 @@ msgstr "Författare"
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Språk"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr "<autodetektera>"
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Fortsätt"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Avbryt nivå"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Kontrollera online"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Kontrollera online (deaktiverad)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr "Välj språk"
@@ -358,12 +312,8 @@ msgid "Resolution"
 msgstr "Upplösning"
 
 #: src/supertux/menu/options_menu.cpp:67
-msgid ""
-"Determine the resolution used in fullscreen mode (you must toggle fullscreen "
-"to complete the change)"
-msgstr ""
-"Ställer in upplösningen som ska användas i helskärmsläge (du måste växla "
-"helskärm för att slutföra ändringen)"
+msgid "Determine the resolution used in fullscreen mode (you must toggle fullscreen to complete the change)"
+msgstr "Ställer in upplösningen som ska användas i helskärmsläge (du måste växla helskärm för att slutföra ändringen)"
 
 #: src/supertux/menu/options_menu.cpp:69
 msgid "Magnification"
@@ -416,31 +366,10 @@ msgstr "Musik (deaktiverad)"
 msgid "Configure key-action mappings"
 msgstr "Ställ in funktioner för tangenterna"
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Ställ in styrspak"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr "Ställ in funktioner för styrspakskontrollerna"
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Paus/Meny"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Ingen Joystick hittades"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr "Sök efter styrspakar"
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Tryck ner en knapp"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Paus"
@@ -449,4 +378,98 @@ msgstr "Paus"
 msgid "Quit World"
 msgstr "Lämna värld"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Flest samlade mynt:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Flest dödade fiender:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Kortast behövd tid:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Flest funna hemligheter:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Du"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Bästa"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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-2010 SuperTux Devel Team\n"
+"Detta spel kommer med ABSOLUT INGEN GARANTI. Detta är fri programvara, och du är välkommen att\n"
+"återdistrubuera den under vissa villkor; se filen COPYING för detaljer.\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr "Nu klättrar vi..."
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Du har hittat en hemlig plats!"
 
+#~ msgid "Usage: "
+#~ msgstr "Användning: "
+
+#~ msgid ""
+#~ " [OPTIONS] [LEVELFILE]\n"
+#~ "\n"
+#~ msgstr ""
+#~ " [ALTERNATIV] [FIL MED NIVÅ]\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "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"
+#~ "  -a, --aspect WIDTH:HEIGHT    Run SuperTux with given aspect ratio\n"
+#~ "  -d, --default                Reset video settings to default values\n"
+#~ "  --renderer RENDERER          Use sdl, opengl, or auto to render\n"
+#~ "  --disable-sfx                Disable sound effects\n"
+#~ "  --disable-music              Disable music\n"
+#~ "  -h, --help                   Show this help message and quit\n"
+#~ "  -v, --version                Show SuperTux version and quit\n"
+#~ "  --console                    Enable ingame scripting console\n"
+#~ "  --noconsole                  Disable ingame scripting console\n"
+#~ "  --show-fps                   Display framerate in levels\n"
+#~ "  --no-show-fps                Do not display framerate in levels\n"
+#~ "  --record-demo FILE LEVEL     Record a demo to FILE\n"
+#~ "  --play-demo FILE LEVEL       Play a recorded demo\n"
+#~ "  -s, --debug-scripts          Enable script debugger.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Alternativ:\n"
+#~ "  -f, --fullscreen             Kör i helskärmsläge\n"
+#~ "  -w, --window                 Kör i fönsterläge\n"
+#~ "  -g, --geometry BREDDxHÖJD    Kör SuperTux i en given upplösning\n"
+#~ "  -a, --aspect BREDD:HÖJD      Kör SuperTux i de givna bildformatet\n"
+#~ "  -d, --default                Återställ videoinställningar till förvalda värden\n"
+#~ "  --renderer RENDERER          Använd sdl, opengl, eller auto för rendering\n"
+#~ "  --disable-sfx                Avaktivera ljudeffetker\n"
+#~ "  --disable-music              Avaktivera musik\n"
+#~ "  -h, --help                   Visa detta hjälpmeddelande\n"
+#~ "  -v, --version                Visa SuperTuxs version och avsluta\n"
+#~ "  --console                    Aktivera skriptningskonsolen\n"
+#~ "  --noconsole                  Avaktivera skriptningskonsolen\n"
+#~ "  --show-fps                   Visa FPS i nivåer\n"
+#~ "  --no-show-fps                Visa inte FPS i nivåer\n"
+#~ "  --record-demo FIL NIVÅ       Spela in en demo till FIL\n"
+#~ "  --play-demo FIL NIVÅ         Spela upp en inspelad demo\n"
+#~ "  -s, --debug-scripts          Aktivera skriptavlusare.\n"
+#~ "\n"
+
+#~ msgid "contributed by "
+#~ msgstr "bidragen av"
diff --git a/data/locale/tr.po b/data/locale/tr.po
index 0dc119173..d7d00a3e5 100644
--- a/data/locale/tr.po
+++ b/data/locale/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2009-03-26 16:30+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <tr@li.org>\n"
@@ -19,18 +19,33 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "En İyi Bölüm İstatistikleri"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Altın"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Gizli yerler"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Zaman"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -50,150 +65,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "En İyi Bölüm İstatistikleri"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Toplanan en fazla altın:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "En çok can kaybı:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "En kısa zaman:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Bulunan en fazla gizli yer:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Sen"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "En iyi"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "Eklentiler"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Altın"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "Çevrimiçi Kontrol Et"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Gizli yerler"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "Çevrimdışı Konrol Et (kapalı)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Zaman"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Geri"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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 ""
-"Telif hakkı (c) 2003-2010 SuperTux Devel Team\n"
-"Bu oyun için bir HİÇ BİR GARANTİ VERİLMEMEKTEDİR. Bu özgür yazılım.\n"
-"Ve belirtilen durumlara uygun olarak dağıtmakta serbestsin.\n"
-"Daha fazla detay için COPYING dosyasına bakabilirsin\n"
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "Ek Bölümler"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "ekleyen"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Devam et"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Gizli bir yer buldun!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Seçenekler"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Bölümü Sonlandır"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Klavyeyi Ayarla"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Joystik Ayarla"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Yukarı "
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Aşağı"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Sol"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Sağ"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Zıplama"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Eylem"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Durdur/Menü"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Sola Bak"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Sağa Bak"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "Konsol"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr "Yukarı il zıpla"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Geri"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Joystik bulunamadı"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Boş"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Düğmeye Bas"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Klavyeyi Ayarla"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "Konsol"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Yukarı ok"
@@ -246,24 +253,18 @@ msgstr "Sol Alt"
 msgid "Press Key"
 msgstr "Tuşa Bas"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "Dil"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "Oyunu Başlat"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "Ek Bölümler"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "Eklentiler"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Seçenekler"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "Emeği Geçenler"
@@ -272,30 +273,6 @@ msgstr "Emeği Geçenler"
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "Dil"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Devam et"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Bölümü Sonlandır"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "Çevrimiçi Kontrol Et"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "Çevrimdışı Konrol Et (kapalı)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -387,31 +364,10 @@ msgstr "Müzik (kapalı)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Joystik Ayarla"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Durdur/Menü"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Joystik bulunamadı"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Düğmeye Bas"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Duraklat"
@@ -420,6 +376,52 @@ msgstr "Duraklat"
 msgid "Quit World"
 msgstr "Dünyadan Çık"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Toplanan en fazla altın:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "En çok can kaybı:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "En kısa zaman:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Bulunan en fazla gizli yer:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Sen"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "En iyi"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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 ""
+"Telif hakkı (c) 2003-2010 SuperTux Devel Team\n"
+"Bu oyun için bir HİÇ BİR GARANTİ VERİLMEMEKTEDİR. Bu özgür yazılım.\n"
+"Ve belirtilen durumlara uygun olarak dağıtmakta serbestsin.\n"
+"Daha fazla detay için COPYING dosyasına bakabilirsin\n"
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Gizli bir yer buldun!"
+
+#~ msgid "contributed by "
+#~ msgstr "ekleyen"
+
 #~ msgid "Yes"
 #~ msgstr "Evet"
 
diff --git a/data/locale/uk.po b/data/locale/uk.po
index 76bbbf226..f60aa148e 100644
--- a/data/locale/uk.po
+++ b/data/locale/uk.po
@@ -8,24 +8,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "Last-Translator: Eugen Uvin <nivus.ua@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "Кращі результати рівня"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "Монети"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "Тайники"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "Час"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -45,147 +60,143 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "Кращі результати рівня"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "Рекорд із зібраних монет:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "Рекорд з вбитих ворогів:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "Найменший час:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "Рекорд з відкритих тайників:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "Ви"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "Кращий"
-
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "Монети"
-
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "Тайники"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr ""
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "Час"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr ""
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
 msgstr ""
 
-#: src/supertux//levelintro.cpp:92
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "Назад"
+
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
 #, fuzzy
-msgid "contributed by "
-msgstr "розроблений"
+msgid "Contrib Levels"
+msgstr "Додаткові рівні"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "Ви знайшли тайник!"
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "Продовжити"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr ""
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "Налагодження"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "Налагодити клавіатуру"
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "Вийти з рівня"
+
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "Налагодити джойстик"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "Угору"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "Униз"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "Уліво"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "Управо"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "Стрибок"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "Дія"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "Пауза/Меню"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "Продивитися уліво"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "Продивитися управо"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr ""
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "Назад"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "Джойстик не знайдений"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr ""
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "Нема"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "Натисніть клавішу"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "Налагодити клавіатуру"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr ""
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "Курсор угору"
@@ -238,24 +249,17 @@ msgstr "Лівий Alt"
 msgid "Press Key"
 msgstr "Натисніть клавішу"
 
-#: src/supertux/menu/main_menu.cpp:39
-msgid "Start Game"
-msgstr "Грати"
-
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-#, fuzzy
-msgid "Contrib Levels"
-msgstr "Додаткові рівні"
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
 msgstr ""
 
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "Налагодження"
+#: src/supertux/menu/main_menu.cpp:39
+msgid "Start Game"
+msgstr "Грати"
 
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
@@ -265,30 +269,6 @@ msgstr "Подяки"
 msgid "Quit"
 msgstr "Вийти"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr ""
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "Продовжити"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "Вийти з рівня"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr ""
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr ""
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr ""
@@ -380,31 +360,10 @@ msgstr "Музика (вимкнена)"
 msgid "Configure key-action mappings"
 msgstr ""
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "Налагодити джойстик"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr ""
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "Пауза/Меню"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "Джойстик не знайдений"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr ""
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "Натисніть клавішу"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "Пауза"
@@ -414,6 +373,49 @@ msgstr "Пауза"
 msgid "Quit World"
 msgstr "Вийти із Світу"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "Рекорд із зібраних монет:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "Рекорд з вбитих ворогів:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "Найменший час:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "Рекорд з відкритих тайників:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "Ви"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "Кращий"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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 ""
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr ""
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "Ви знайшли тайник!"
+
+#, fuzzy
+#~ msgid "contributed by "
+#~ msgstr "розроблений"
+
 #~ msgid ""
 #~ "Usage: %s [OPTIONS] [LEVELFILE]\n"
 #~ "\n"
diff --git a/data/locale/zh_CN.po b/data/locale/zh_CN.po
index 8a3b12b18..b9bdd4d2a 100644
--- a/data/locale/zh_CN.po
+++ b/data/locale/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Supertux 0.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:14+0100\n"
+"POT-Creation-Date: 2010-07-03 17:12-0400\n"
 "PO-Revision-Date: 2009-03-21 21:16+0800\n"
 "Last-Translator: Liu Sizhuang <chinatslsz@hotmail.com>\n"
 "Language-Team: Simplified Chinese <i18n-zh@list.google.com>\n"
@@ -18,18 +18,33 @@ msgstr ""
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-Basepath: ../../\n"
 
-#: src/supertux//main.cpp:230
-msgid "Usage: "
+#: src/supertux/levelintro.cpp:94
+#, c-format
+msgid "contributed by %s"
 msgstr ""
 
-#: src/supertux//main.cpp:230
-msgid ""
-" [OPTIONS] [LEVELFILE]\n"
-"\n"
-msgstr ""
+#: src/supertux/levelintro.cpp:109 src/supertux/statistics.cpp:132
+msgid "Best Level Statistics"
+msgstr "此关最佳成绩"
+
+#: src/supertux/levelintro.cpp:115 src/supertux/statistics.cpp:211
+msgid "Coins"
+msgstr "金币"
 
-#: src/supertux//main.cpp:231
+#: src/supertux/levelintro.cpp:122 src/supertux/statistics.cpp:219
+msgid "Secrets"
+msgstr "秘密区域"
+
+#: src/supertux/levelintro.cpp:129 src/supertux/statistics.cpp:227
+msgid "Time"
+msgstr "时间"
+
+#: src/supertux/main.cpp:223
+#, c-format
 msgid ""
+"\n"
+"Usage: %s [OPTIONS] [LEVELFILE]\n"
+"\n"
 "Options:\n"
 "  -f, --fullscreen             Run in fullscreen mode\n"
 "  -w, --window                 Run in window mode\n"
@@ -49,146 +64,142 @@ msgid ""
 "  --play-demo FILE LEVEL       Play a recorded demo\n"
 "  -s, --debug-scripts          Enable script debugger.\n"
 "\n"
+"Environment variables:\n"
+"  SUPERTUX2_USER_DIR           Directory for user data (savegames, etc.);\n"
+"                               default %s\n"
+"\n"
 msgstr ""
 
-#: src/supertux//statistics.cpp:132 src/supertux//levelintro.cpp:107
-msgid "Best Level Statistics"
-msgstr "此关最佳成绩"
-
-#: src/supertux//statistics.cpp:143
-msgid "Max coins collected:"
-msgstr "金币最多:"
-
-#: src/supertux//statistics.cpp:147
-msgid "Max fragging:"
-msgstr "杀伤最多:"
-
-#: src/supertux//statistics.cpp:151
-msgid "Min time needed:"
-msgstr "时间最短:"
-
-#: src/supertux//statistics.cpp:155
-msgid "Max secrets found:"
-msgstr "找到秘区最多:"
-
-#: src/supertux//statistics.cpp:207
-msgid "You"
-msgstr "本次"
-
-#: src/supertux//statistics.cpp:209
-msgid "Best"
-msgstr "最佳成绩"
+#: src/supertux/menu/addon_menu.cpp:55 src/supertux/menu/main_menu.cpp:41
+msgid "Add-ons"
+msgstr "扩展"
 
-#: src/supertux//statistics.cpp:211 src/supertux//levelintro.cpp:113
-msgid "Coins"
-msgstr "金币"
+#: src/supertux/menu/addon_menu.cpp:60
+msgid "Check Online"
+msgstr "在线检查"
 
-#: src/supertux//statistics.cpp:219 src/supertux//levelintro.cpp:120
-msgid "Secrets"
-msgstr "秘密区域"
+#: src/supertux/menu/addon_menu.cpp:62
+msgid "Check Online (disabled)"
+msgstr "在线检查(已禁用)"
 
-#: src/supertux//statistics.cpp:227 src/supertux//levelintro.cpp:127
-msgid "Time"
-msgstr "时间"
+#: src/supertux/menu/addon_menu.cpp:86 src/supertux/menu/contrib_menu.cpp:64
+#: src/supertux/menu/contrib_world_menu.cpp:42
+#: src/supertux/menu/joystick_menu.cpp:71
+#: src/supertux/menu/keyboard_menu.cpp:44
+#: src/supertux/menu/language_menu.cpp:49
+#: src/supertux/menu/options_menu.cpp:166
+#: src/supertux/menu/profile_menu.cpp:39
+msgid "Back"
+msgstr "返回"
 
-#: src/supertux//title_screen.cpp:147
-msgid ""
-"Copyright (c) 2003-2010 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 ""
+#: src/supertux/menu/contrib_menu.cpp:41 src/supertux/menu/main_menu.cpp:40
+msgid "Contrib Levels"
+msgstr "贡献的关卡"
 
-#: src/supertux//levelintro.cpp:92
-msgid "contributed by "
-msgstr "贡献者: "
+#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
+msgid "Continue"
+msgstr "继续"
 
-#: src/trigger//secretarea_trigger.cpp:67
-msgid "You found a secret area!"
-msgstr "你找到了一个秘密区域!"
+#: src/supertux/menu/game_menu.cpp:29 src/supertux/menu/main_menu.cpp:42
+#: src/supertux/menu/options_menu.cpp:49
+#: src/supertux/menu/worldmap_menu.cpp:28
+msgid "Options"
+msgstr "选项"
 
-#: src/trigger//climbable.cpp:78
-msgid "Up we go..."
-msgstr "出发了..."
+#: src/supertux/menu/game_menu.cpp:31
+msgid "Abort Level"
+msgstr "中止关卡"
 
-#: src/supertux/menu/keyboard_menu.cpp:27
-#: src/supertux/menu/options_menu.cpp:160
-msgid "Setup Keyboard"
-msgstr "键盘设置"
+#: src/supertux/menu/joystick_menu.cpp:41
+#: src/supertux/menu/options_menu.cpp:163
+msgid "Setup Joystick"
+msgstr "游戏杆设置"
 
-#: src/supertux/menu/keyboard_menu.cpp:29
 #: src/supertux/menu/joystick_menu.cpp:44
+#: src/supertux/menu/keyboard_menu.cpp:29
 msgid "Up"
 msgstr "上"
 
-#: src/supertux/menu/keyboard_menu.cpp:30
 #: src/supertux/menu/joystick_menu.cpp:45
+#: src/supertux/menu/keyboard_menu.cpp:30
 msgid "Down"
 msgstr "下"
 
-#: src/supertux/menu/keyboard_menu.cpp:31
 #: src/supertux/menu/joystick_menu.cpp:46
+#: src/supertux/menu/keyboard_menu.cpp:31
 msgid "Left"
 msgstr "å·¦"
 
-#: src/supertux/menu/keyboard_menu.cpp:32
 #: src/supertux/menu/joystick_menu.cpp:47
+#: src/supertux/menu/keyboard_menu.cpp:32
 msgid "Right"
 msgstr "右"
 
-#: src/supertux/menu/keyboard_menu.cpp:33
 #: src/supertux/menu/joystick_menu.cpp:48
+#: src/supertux/menu/keyboard_menu.cpp:33
 msgid "Jump"
 msgstr "跳跃"
 
-#: src/supertux/menu/keyboard_menu.cpp:34
 #: src/supertux/menu/joystick_menu.cpp:49
+#: src/supertux/menu/keyboard_menu.cpp:34
 msgid "Action"
 msgstr "动作"
 
-#: src/supertux/menu/keyboard_menu.cpp:35
+#: src/supertux/menu/joystick_menu.cpp:50
+msgid "Pause/Menu"
+msgstr "暂停/菜单"
+
 #: src/supertux/menu/joystick_menu.cpp:51
+#: src/supertux/menu/keyboard_menu.cpp:35
 msgid "Peek Left"
 msgstr "向左看"
 
-#: src/supertux/menu/keyboard_menu.cpp:36
 #: src/supertux/menu/joystick_menu.cpp:52
+#: src/supertux/menu/keyboard_menu.cpp:36
 msgid "Peek Right"
 msgstr "向右看"
 
-#: src/supertux/menu/keyboard_menu.cpp:37
 #: src/supertux/menu/joystick_menu.cpp:53
+#: src/supertux/menu/keyboard_menu.cpp:37
 msgid "Peek Up"
 msgstr "向上看"
 
-#: src/supertux/menu/keyboard_menu.cpp:38
 #: src/supertux/menu/joystick_menu.cpp:54
+#: src/supertux/menu/keyboard_menu.cpp:38
 msgid "Peek Down"
 msgstr "向下看"
 
-#: src/supertux/menu/keyboard_menu.cpp:40
-msgid "Console"
-msgstr "终端"
-
-#: src/supertux/menu/keyboard_menu.cpp:42
 #: src/supertux/menu/joystick_menu.cpp:56
+#: src/supertux/menu/keyboard_menu.cpp:42
 msgid "Jump with Up"
 msgstr "上=跳"
 
-#: src/supertux/menu/keyboard_menu.cpp:44
-#: src/supertux/menu/language_menu.cpp:49 src/supertux/menu/addon_menu.cpp:86
-#: src/supertux/menu/options_menu.cpp:166
-#: src/supertux/menu/joystick_menu.cpp:71
-#: src/supertux/menu/contrib_menu.cpp:64
-#: src/supertux/menu/contrib_world_menu.cpp:42
-#: src/supertux/menu/profile_menu.cpp:39
-msgid "Back"
-msgstr "返回"
+#: src/supertux/menu/joystick_menu.cpp:58
+msgid "No Joysticks found"
+msgstr "找不到游戏杆"
+
+#: src/supertux/menu/joystick_menu.cpp:61
+msgid "Scan for Joysticks"
+msgstr "扫描游戏杆"
 
-#: src/supertux/menu/keyboard_menu.cpp:56
 #: src/supertux/menu/joystick_menu.cpp:79
+#: src/supertux/menu/keyboard_menu.cpp:56
 msgid "None"
 msgstr "无"
 
+#: src/supertux/menu/joystick_menu.cpp:90
+msgid "Press Button"
+msgstr "请按按钮"
+
+#: src/supertux/menu/keyboard_menu.cpp:27
+#: src/supertux/menu/options_menu.cpp:160
+msgid "Setup Keyboard"
+msgstr "键盘设置"
+
+#: src/supertux/menu/keyboard_menu.cpp:40
+msgid "Console"
+msgstr "终端"
+
 #: src/supertux/menu/keyboard_menu.cpp:58
 msgid "Up cursor"
 msgstr "方向键上"
@@ -241,24 +252,18 @@ msgstr "å·¦Alt"
 msgid "Press Key"
 msgstr "请按键"
 
+#: src/supertux/menu/language_menu.cpp:36
+msgid "Language"
+msgstr "语言"
+
+#: src/supertux/menu/language_menu.cpp:38
+msgid "<auto-detect>"
+msgstr ""
+
 #: src/supertux/menu/main_menu.cpp:39
 msgid "Start Game"
 msgstr "开始游戏"
 
-#: src/supertux/menu/main_menu.cpp:40 src/supertux/menu/contrib_menu.cpp:41
-msgid "Contrib Levels"
-msgstr "贡献的关卡"
-
-#: src/supertux/menu/main_menu.cpp:41 src/supertux/menu/addon_menu.cpp:55
-msgid "Add-ons"
-msgstr "扩展"
-
-#: src/supertux/menu/main_menu.cpp:42 src/supertux/menu/game_menu.cpp:29
-#: src/supertux/menu/options_menu.cpp:49
-#: src/supertux/menu/worldmap_menu.cpp:28
-msgid "Options"
-msgstr "选项"
-
 #: src/supertux/menu/main_menu.cpp:43
 msgid "Credits"
 msgstr "作者"
@@ -267,30 +272,6 @@ msgstr "作者"
 msgid "Quit"
 msgstr "退出"
 
-#: src/supertux/menu/language_menu.cpp:36
-msgid "Language"
-msgstr "语言"
-
-#: src/supertux/menu/language_menu.cpp:38
-msgid "<auto-detect>"
-msgstr ""
-
-#: src/supertux/menu/game_menu.cpp:28 src/supertux/menu/worldmap_menu.cpp:27
-msgid "Continue"
-msgstr "继续"
-
-#: src/supertux/menu/game_menu.cpp:31
-msgid "Abort Level"
-msgstr "中止关卡"
-
-#: src/supertux/menu/addon_menu.cpp:60
-msgid "Check Online"
-msgstr "在线检查"
-
-#: src/supertux/menu/addon_menu.cpp:62
-msgid "Check Online (disabled)"
-msgstr "在线检查(已禁用)"
-
 #: src/supertux/menu/options_menu.cpp:54
 msgid "Select Language"
 msgstr "选择语言"
@@ -382,31 +363,10 @@ msgstr "音乐(已禁用)"
 msgid "Configure key-action mappings"
 msgstr "配置键盘映射"
 
-#: src/supertux/menu/options_menu.cpp:163
-#: src/supertux/menu/joystick_menu.cpp:41
-msgid "Setup Joystick"
-msgstr "游戏杆设置"
-
 #: src/supertux/menu/options_menu.cpp:164
 msgid "Configure joystick control-action mappings"
 msgstr "配置游戏杆映射"
 
-#: src/supertux/menu/joystick_menu.cpp:50
-msgid "Pause/Menu"
-msgstr "暂停/菜单"
-
-#: src/supertux/menu/joystick_menu.cpp:58
-msgid "No Joysticks found"
-msgstr "找不到游戏杆"
-
-#: src/supertux/menu/joystick_menu.cpp:61
-msgid "Scan for Joysticks"
-msgstr "扫描游戏杆"
-
-#: src/supertux/menu/joystick_menu.cpp:90
-msgid "Press Button"
-msgstr "请按按钮"
-
 #: src/supertux/menu/worldmap_menu.cpp:25
 msgid "Pause"
 msgstr "暂停"
@@ -415,6 +375,48 @@ msgstr "暂停"
 msgid "Quit World"
 msgstr "退出世界"
 
+#: src/supertux/statistics.cpp:143
+msgid "Max coins collected:"
+msgstr "金币最多:"
+
+#: src/supertux/statistics.cpp:147
+msgid "Max fragging:"
+msgstr "杀伤最多:"
+
+#: src/supertux/statistics.cpp:151
+msgid "Min time needed:"
+msgstr "时间最短:"
+
+#: src/supertux/statistics.cpp:155
+msgid "Max secrets found:"
+msgstr "找到秘区最多:"
+
+#: src/supertux/statistics.cpp:207
+msgid "You"
+msgstr "本次"
+
+#: src/supertux/statistics.cpp:209
+msgid "Best"
+msgstr "最佳成绩"
+
+#: src/supertux/title_screen.cpp:147
+msgid ""
+"Copyright (c) 2003-2010 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 ""
+
+#: src/trigger/climbable.cpp:78
+msgid "Up we go..."
+msgstr "出发了..."
+
+#: src/trigger/secretarea_trigger.cpp:67
+msgid "You found a secret area!"
+msgstr "你找到了一个秘密区域!"
+
+#~ msgid "contributed by "
+#~ msgstr "贡献者: "
+
 #~ msgid "Yes"
 #~ msgstr "是"
 
diff --git a/tools/normalize-po-files.sh b/tools/normalize-po-files.sh
index 563fb6c0d..a8309004f 100755
--- a/tools/normalize-po-files.sh
+++ b/tools/normalize-po-files.sh
@@ -1,3 +1,2 @@
 #!/bin/sh
-find -iname '*.po' | xargs -I xx msgmerge --backup=off --no-fuzzy-matching --no-wrap -U xx messages.pot
-
+find -iname '*.po' -execdir msgmerge --backup=off --no-fuzzy-matching --no-wrap -U '{}' messages.pot \;
\ No newline at end of file