diff --git a/data/po/de.po b/data/po/de.po
index 2d7e28163..17f92914f 100644
--- a/data/po/de.po
+++ b/data/po/de.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Supertuxkart 0.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-29 22:36+0300\n"
-"PO-Revision-Date: 2008-07-31 14:40+0100\n"
-"Last-Translator: Stefan Hoffmann <stefhoff@go4more.de>\n"
+"POT-Creation-Date: 2008-09-01 20:31-0400\n"
+"PO-Revision-Date: 2008-09-22 21:10+0100\n"
+"Last-Translator: Dominique Leuenberger <dominique@leuenberger.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +20,12 @@ msgstr ""
 "X-Poedit-Basepath: .\n"
 "X-Poedit-SearchPath-0: /home/dominique/Documents/src/svn/supertuxkart\n"
 
-#: src/gui/config_display.cpp:385
+#: src/gui/config_display.cpp:386
 #, c-format
 msgid "%dx%d Blacklisted"
 msgstr "%dx%d zur schwarzen Liste hinzugefügt"
 
-#: src/world.cpp:612
+#: src/world.cpp:650
 #, c-format
 msgid ""
 "'%s' has\n"
@@ -34,7 +34,8 @@ msgstr ""
 "'%s' ist\n"
 "ausgeschieden."
 
-#: src/gui/player_controls.cpp:64
+#. I18N: name of controls
+#: src/gui/player_controls.cpp:72
 msgid "Accelerate"
 msgstr "Beschleunigen"
 
@@ -42,11 +43,11 @@ msgstr "Beschleunigen"
 msgid "Active Challenges"
 msgstr "Aktuelle Herausforderungen"
 
-#: data/all.cup:4
+#: data/grandprix/alltracks.grandprix:4
 msgid "All tracks"
 msgstr "Alle Strecken"
 
-#: data/all.cup:5
+#: data/grandprix/alltracks.grandprix:5
 msgid "All tracks included in SuperTuxKart"
 msgstr "Alle in SuperTuxKart enthaltene Strecken"
 
@@ -58,11 +59,11 @@ msgstr "Reise durch den Amazonas"
 msgid "Anvil - slows down greatly the kart in the first position"
 msgstr "Amboss - Bremst das Kart an erster Position sehr stark"
 
-#: src/gui/config_display.cpp:92
+#: src/gui/config_display.cpp:93
 msgid "Apply "
 msgstr "Anwenden"
 
-#: src/gui/config_display.cpp:351
+#: src/gui/config_display.cpp:352
 #, c-format
 msgid "Apply %dx%d"
 msgstr "%dx%d bestätigen"
@@ -81,8 +82,7 @@ msgstr ""
 "du stecken bleibst, oder über die Fahrbahn hinausschiesst, benutze einfach\n"
 "den Rettungsknopf um wieder auf die Fahrbahn zu kommen."
 
-#: src/challenges/worlds_end_gp.cpp:54
-#: data/gp4.cup:4
+#: data/grandprix/atworldsend.grandprix:4
 msgid "At world's end"
 msgstr "Am Ende der Welt"
 
@@ -90,9 +90,8 @@ msgstr "Am Ende der Welt"
 msgid "Avoid bananas"
 msgstr "Halte dich von Bananen fern"
 
-#: src/gui/grand_prix_ending.cpp:148
-#: src/gui/leader_result.cpp:152
-#: src/gui/race_results_gui.cpp:144
+#: src/gui/grand_prix_ending.cpp:151
+#: src/gui/race_results_gui.cpp:70
 msgid "Back to the main menu"
 msgstr "Zurück zum Hauptmenü"
 
@@ -100,7 +99,16 @@ msgstr "Zurück zum Hauptmenü"
 msgid "Back to the menu"
 msgstr "Zurück zum Menü"
 
-#: src/gui/player_controls.cpp:65
+#: src/gui/help_page_two.cpp:84
+msgid ""
+"Bowling Ball - bounces off walls. If you are looking back,\n"
+"it will be thrown backwards."
+msgstr ""
+"Bowling Ball - prallt von Wänden ab. Wird nach hinten geworfen,\n"
+"wenn nach hinten geschaut wird."
+
+#. I18N: name of controls
+#: src/gui/player_controls.cpp:74
 msgid "Brake"
 msgstr "Bremsen"
 
@@ -112,7 +120,7 @@ msgstr "Canyon"
 msgid "Challenges"
 msgstr "Herausforderungen"
 
-#: src/gui/player_controls.cpp:74
+#: src/gui/player_controls.cpp:90
 #, c-format
 msgid "Choose your controls, %s"
 msgstr "Wähle die Steuerungsart, %s"
@@ -121,15 +129,15 @@ msgstr "Wähle die Steuerungsart, %s"
 msgid "City"
 msgstr "Stadt"
 
-#: src/gui/config_display.cpp:97
+#: src/gui/config_display.cpp:98
 msgid "Clear from Blacklist"
 msgstr "Aus der schwarzen Liste löschen"
 
-#: src/challenges/energy_math_class.cpp:26
+#: data/tracks/crescentcrossing/crescentcrossing.challenge:5
 msgid "Collect Coins in Math Class"
 msgstr "Sammle Münzen im Klassenzimmer"
 
-#: src/challenges/energy_math_class.cpp:28
+#: data/tracks/crescentcrossing/crescentcrossing.challenge:6
 msgid ""
 "Collect at least 6 points\n"
 "worth of coins\n"
@@ -142,7 +150,7 @@ msgstr ""
 "Oliver's Mathe-Klasse\n"
 "in weniger als 1 Minute."
 
-#: src/challenges/energy_shifting_sands.cpp:27
+#: data/grandprix/tothemoonandback.challenge:6
 msgid ""
 "Collect at least 9 coins\n"
 "on 3 laps of Shifting Sands\n"
@@ -152,7 +160,7 @@ msgstr ""
 "in 3 Runden im Treibsand\n"
 "in weniger als 2:20 Minuten."
 
-#: src/challenges/energy_shifting_sands.cpp:25
+#: data/grandprix/tothemoonandback.challenge:5
 msgid "Collect the Pharaohs Treasure"
 msgstr "Sammle den Schatz des Pharao's"
 
@@ -168,7 +176,7 @@ msgstr ""
 "2 Gegenstände. Nach 10 Münzen, 3 und so weiter.\n"
 "Jede Gold-Münze hat den Wert von 3 Silber-Münzen, halte also die Augen auf!"
 
-#: src/challenges/worlds_end_gp.cpp:27
+#: data/grandprix/alltracks.challenge:6
 msgid ""
 "Come first in the At World's End\n"
 "Grand Prix with 3 'Racer'\n"
@@ -191,14 +199,13 @@ msgstr "Auflösung innerhalb %d Sekunden bestätigen"
 msgid "Confirm Resolution Within 5 Seconds"
 msgstr "Auflösung innerhalb 5 Sekunden bestätigen"
 
-#: src/gui/grand_prix_ending.cpp:144
-#: src/gui/leader_result.cpp:148
 #: src/gui/feature_unlocked.cpp:47
-#: src/gui/race_results_gui.cpp:135
+#: src/gui/grand_prix_ending.cpp:147
+#: src/gui/race_results_gui.cpp:59
 msgid "Continue"
 msgstr "Weiter"
 
-#: src/gui/race_results_gui.cpp:140
+#: src/gui/race_results_gui.cpp:66
 msgid "Continue Grand Prix"
 msgstr "Grand Prix fortsetzen"
 
@@ -229,16 +236,17 @@ msgstr "Mitwirkende"
 msgid "Crescent Crossing"
 msgstr "Kreuzende Halbmonde"
 
-#: src/gui/config_display.cpp:83
+#. I18N: displays current resolution
+#: src/gui/config_display.cpp:84
 #, c-format
 msgid "Current: %dx%d"
 msgstr "Aktuell: %dx%d"
 
-#: src/gui/config_display.cpp:89
+#: src/gui/config_display.cpp:90
 msgid "Decrease Resolution"
 msgstr "Auflösung verringern"
 
-#: src/gui/race_options.cpp:67
+#: src/gui/race_options.cpp:76
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
@@ -250,7 +258,7 @@ msgstr "Anzeigeoptionen"
 msgid "Display Settings"
 msgstr "Grafikeinstellungen"
 
-#: src/gui/race_options.cpp:279
+#: src/gui/race_options.cpp:286
 msgid "Driver"
 msgstr "Fahrer"
 
@@ -262,7 +270,7 @@ msgstr "Steuerung für welchen Spieler einstellen?"
 msgid "Exit Race"
 msgstr "Rennen beenden"
 
-#: src/challenges/race_track_time.cpp:28
+#: data/tracks/jungle/jungle.challenge:6
 msgid ""
 "Finish 3 laps in the Race track\n"
 "with 3 AI karts\n"
@@ -272,7 +280,7 @@ msgstr ""
 "mit 3 KI Karts\n"
 "in weniger als 1:15 Minuten"
 
-#: src/challenges/city_time.cpp:27
+#: data/tracks/snowtuxpeak/snowtuxpeak.challenge:6
 msgid ""
 "Finish 3 laps on the City track\n"
 "with 3 AI karts\n"
@@ -282,7 +290,7 @@ msgstr ""
 "mit 3 Computer-Gegnern\n"
 "in weniger als 5:20 Minuten"
 
-#: src/challenges/tollway_time.cpp:27
+#: data/tracks/canyon/canyon.challenge:6
 msgid ""
 "Finish 3 laps on the Tux Tollway\n"
 "track with 3 AI karts\n"
@@ -292,41 +300,43 @@ msgstr ""
 "mit 3 KI Karts\n"
 "in weniger als 3 Minuten"
 
-#: src/challenges/race_track_time.cpp:26
+#: data/tracks/jungle/jungle.challenge:5
 msgid "Finish Race track in 1:15"
 msgstr "Absolviere die Rennstrecke in 1:15"
 
-#: src/challenges/tollway_time.cpp:25
+#: data/tracks/canyon/canyon.challenge:5
 msgid "Finish Tux Tollway track in 3:00"
 msgstr "Beende Tux' Zollstrasse in 3:00"
 
-#: src/challenges/city_time.cpp:25
+#: data/tracks/snowtuxpeak/snowtuxpeak.challenge:5
 msgid "Finish the City track in 5:20"
 msgstr "Beende die Stadt-Strecke in weniger als 5:20"
 
-#: src/gui/race_gui.cpp:800
+#: src/gui/race_gui.cpp:798
 #, c-format
 msgid "Finished"
 msgstr "Beendet"
 
-#: src/gui/player_controls.cpp:66
+#. I18N: name of controls, like in "fire missile"
+#: src/gui/player_controls.cpp:80
 msgid "Fire"
 msgstr "Schiessen"
 
-#: data/gp1.cup:5
+#: data/grandprix/penguinplayground.grandprix:5
 msgid "First grand prix, easy to get started"
 msgstr "Erster Grand Prix, einfacher Einstieg"
 
-#: src/gui/game_mode.cpp:68
-#: src/challenges/penguin_playground_gp.cpp:28
+#: src/gui/game_mode.cpp:69
+#: src/gui/game_mode.cpp:93
+#: data/followtheleader.challenge:7
 msgid "Follow the Leader"
 msgstr "Folge dem Leader"
 
-#: src/challenges/jungle_follow.cpp:25
+#: data/tracks/city/city.challenge:5
 msgid "Follow the Leader in the Jungle"
 msgstr "Folge dem Leader in den Jungel"
 
-#: src/challenges/island_follow.cpp:25
+#: data/grandprix/atworldsend.challenge:5
 msgid ""
 "Follow the Leader on a\n"
 "Desert Island"
@@ -356,22 +366,13 @@ msgstr "Fort Magma"
 msgid "Four Players"
 msgstr "Vier Spieler"
 
-#: src/gui/game_mode.cpp:80
-#: src/gui/track_sel.cpp:71
-msgid "Fulfil challenge to unlock"
-msgstr "Zum Freischalten, erfülle Herausforderung"
-
 #: src/gui/config_display.cpp:76
-#: src/gui/config_display.cpp:128
-#: src/gui/config_display.cpp:183
+#: src/gui/config_display.cpp:129
+#: src/gui/config_display.cpp:184
 msgid "Fullscreen mode"
 msgstr "Vollbildmodus"
 
-#: src/gui/help_page_two.cpp:84
-msgid "Fuzzy blob/Spark - very slow, but bounces from walls"
-msgstr "Haariger Blubber/Blitz - sehr langsam, aber prallt von Wänden ab"
-
-#: src/gui/game_mode.cpp:85
+#: src/gui/game_mode.cpp:128
 msgid "Game mode help"
 msgstr "Hilfe zu den Spiel-Modi"
 
@@ -379,17 +380,18 @@ msgstr "Hilfe zu den Spiel-Modi"
 msgid "Game modes"
 msgstr "Spiel-Modi"
 
-#: src/gui/credits_menu.cpp:76
-#: src/gui/challenges_menu.cpp:51
+#: src/gui/challenges_menu.cpp:52
+#: src/gui/credits_menu.cpp:75
 msgid "Go back to the main menu"
 msgstr "Zurück zum Hauptmenü"
 
-#: src/gui/help_page_three.cpp:87
 #: src/gui/help_page_one.cpp:151
+#: src/gui/help_page_three.cpp:87
 msgid "Go back to the menu"
 msgstr "Zurück zum Menü"
 
-#: src/gui/race_gui.cpp:948
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/gui/race_gui.cpp:949
 msgid "Go!"
 msgstr "Los!"
 
@@ -397,7 +399,7 @@ msgstr "Los!"
 msgid "Grab blue boxes and coins"
 msgstr "Sammle blaue Kisten und Münzen"
 
-#: src/gui/game_mode.cpp:46
+#: src/gui/game_mode.cpp:77
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
@@ -416,7 +418,7 @@ msgstr ""
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/gui/race_results_gui.cpp:55
+#: src/gui/race_results_gui.cpp:167
 msgid "Highscores"
 msgstr "Rangliste"
 
@@ -432,36 +434,38 @@ msgstr ""
 "Wenn du einen Knopf mit einem Schloss wie dem rechts siehst,\n"
 "musst du eie Herausforderung erfüllen, um es zu öffnen."
 
-#: src/gui/config_display.cpp:87
+#: src/gui/config_display.cpp:88
 msgid "Increase Resolution"
 msgstr "Auflösung erhöhen"
 
-#: src/user_config.cpp:861
+#: src/user_config.cpp:872
 #, c-format
 msgid "Invalid"
 msgstr "Ungültig"
 
-#: src/kart.cpp:650
+#: src/kart.cpp:661
 msgid "Invalid short-cut!!"
 msgstr "Ungültige Abkürzung"
 
-#: src/gui/player_controls.cpp:65
+#. I18N: name of controls
+#: src/gui/player_controls.cpp:76
 msgid "Jump"
 msgstr "Sprung"
 
-#: src/gui/race_gui.cpp:805
+#: src/gui/race_gui.cpp:803
 msgid "Lap"
 msgstr "Runde"
 
-#: data/gp4.cup:5
+#: data/grandprix/atworldsend.grandprix:5
 msgid "Last grand prix, longer and harder"
 msgstr "Letzter Grand Prix, länger und schwieriger"
 
-#: src/gui/race_gui.cpp:409
+#: src/gui/race_gui.cpp:407
 msgid "Leader"
 msgstr "Leader"
 
-#: src/gui/player_controls.cpp:64
+#. I18N: name of controls
+#: src/gui/player_controls.cpp:68
 msgid "Left"
 msgstr "Links"
 
@@ -469,7 +473,7 @@ msgstr "Links"
 msgid "Loading race..."
 msgstr "Lade Rennen..."
 
-#: src/gui/player_controls.cpp:66
+#: src/gui/player_controls.cpp:81
 msgid "Look back"
 msgstr "Zurückschauen"
 
@@ -485,14 +489,14 @@ msgstr "Mehrspieler"
 msgid "New Feature Unlocked"
 msgstr "Neue Funktion freigeschaltet"
 
-#: src/challenges/challenge.cpp:121
+#: src/challenges/challenge.cpp:132
 #, c-format
 msgid ""
 "New Grand Prix '%s'\n"
 "now available"
 msgstr "Neuer Grand Prix '%s' verfügbar"
 
-#: src/challenges/challenge.cpp:124
+#: src/challenges/challenge.cpp:135
 #, c-format
 msgid ""
 "New difficulty\n"
@@ -500,11 +504,11 @@ msgid ""
 "now available"
 msgstr "Neue Schwierigkeitsstufe '%s' verfügbar"
 
-#: src/kart.cpp:407
+#: src/kart.cpp:424
 msgid "New fastest lap"
 msgstr "Neue schnellste Runde"
 
-#: src/challenges/challenge.cpp:118
+#: src/challenges/challenge.cpp:129
 #, c-format
 msgid ""
 "New game mode\n"
@@ -512,41 +516,48 @@ msgid ""
 "now available"
 msgstr "Neuer Spielmodus '%s' verfügbar"
 
-#: src/challenges/challenge.cpp:114
+#: src/challenges/challenge.cpp:139
+#, c-format
+msgid ""
+"New kart\n"
+"'%s'\n"
+"now available"
+msgstr ""
+"Neues Kart\n"
+" '%s' \n"
+"verfügbar"
+
+#: src/challenges/challenge.cpp:125
 #, c-format
 msgid ""
 "New track '%s'\n"
 "now available"
 msgstr "Neue Strecke '%s' verfügbar"
 
-#: src/gui/help_page_two.cpp:118
 #: src/gui/help_page_one.cpp:147
+#: src/gui/help_page_two.cpp:118
 msgid "Next help screen"
 msgstr "Nächster Hilfe-Bildschirm"
 
-#: src/gui/grand_prix_select.cpp:71
-#: src/gui/grand_prix_select.cpp:77
+#: src/gui/grand_prix_select.cpp:63
+#: src/gui/grand_prix_select.cpp:69
 msgid "No Grand Prix selected"
 msgstr "Kein Grand Prix gewählt"
 
-#: src/gui/track_sel.cpp:88
-msgid "No track selected"
-msgstr "Keine Strecke gewählt"
-
-#: src/gui/race_options.cpp:278
-#: src/gui/race_options.cpp:282
+#: src/gui/race_options.cpp:285
+#: src/gui/race_options.cpp:289
 msgid "Novice"
 msgstr "Fahranfänger"
 
-#: src/gui/race_options.cpp:83
+#: src/gui/race_options.cpp:92
 msgid "Number of karts"
 msgstr "Anzahl der Karts"
 
-#: src/gui/race_options.cpp:104
+#: src/gui/race_options.cpp:113
 msgid "Number of laps"
 msgstr "Anzahl der Runden"
 
-#: src/user_config.cpp:488
+#: src/user_config.cpp:495
 msgid "Old config file found, check your key bindings!"
 msgstr "Alte Einstellungsdatei gefunden, prüfe die Tastenbelegungen"
 
@@ -558,8 +569,8 @@ msgstr "Oliver's Mathestunde"
 msgid "On the Beach"
 msgstr "Am Strand"
 
-#: src/gui/options.cpp:40
 #: src/gui/main_menu.cpp:56
+#: src/gui/options.cpp:40
 #: src/gui/race_menu.cpp:50
 msgid "Options"
 msgstr "Einstellungen"
@@ -572,21 +583,21 @@ msgstr "Fallschirm - Bremst alle vorrausfahrenden Karts ab!"
 msgid "Paused"
 msgstr "Pause"
 
-#: src/gui/race_gui.cpp:977
+#: src/gui/race_gui.cpp:978
 msgid "Penalty time!!"
 msgstr "Strafzeit!!"
 
-#: src/challenges/penguin_playground_gp.cpp:46
-#: data/gp1.cup:4
+#: data/grandprix/penguinplayground.grandprix:4
 msgid "Penguin Playground"
 msgstr "Pinguin Spielplatz"
 
-#: src/gui/player_controls.cpp:251
+#. I18N: as in 'Player 2'
+#: src/gui/player_controls.cpp:268
 msgid "Player "
 msgstr "Spieler"
 
 # I'd suggest to address the player to perform an action at the beginning of the sentence here.
-#: src/gui/char_sel.cpp:68
+#: src/gui/char_sel.cpp:73
 #, c-format
 msgid "Player %d, choose a driver"
 msgstr "Spieler %d, wähle einen Fahrer"
@@ -611,7 +622,7 @@ msgstr "Spieler 4"
 msgid "Player Config"
 msgstr "Spieler Konfiguration"
 
-#: src/gui/player_controls.cpp:80
+#: src/gui/player_controls.cpp:96
 msgid "Player name"
 msgstr "Spieler-Name"
 
@@ -619,19 +630,19 @@ msgstr "Spieler-Name"
 msgid "Press <ESC> to Cancel"
 msgstr "Drücke die Taste <ESC> zum Abbrechen"
 
-#: src/gui/options.cpp:57
-#: src/gui/player_controls.cpp:112
-#: src/gui/race_options.cpp:131
-#: src/gui/config_display.cpp:101
-#: src/gui/game_mode.cpp:90
-#: src/gui/config_sound.cpp:63
 #: src/gui/config_controls.cpp:52
-#: src/gui/grand_prix_select.cpp:88
+#: src/gui/config_display.cpp:102
+#: src/gui/config_sound.cpp:63
+#: src/gui/game_mode.cpp:133
+#: src/gui/grand_prix_select.cpp:80
 #: src/gui/num_players.cpp:45
+#: src/gui/options.cpp:57
+#: src/gui/player_controls.cpp:128
+#: src/gui/race_options.cpp:140
 msgid "Press <ESC> to go back"
 msgstr "Drücke die Taste <ESC> um zurückzukehren"
 
-#: src/gui/player_controls.cpp:156
+#: src/gui/player_controls.cpp:172
 msgid "Press key"
 msgstr "Taste drücken"
 
@@ -644,6 +655,7 @@ msgid "Previous screen"
 msgstr "Voriger Bildschirm"
 
 #: src/gui/game_mode.cpp:59
+#: src/gui/game_mode.cpp:83
 msgid "Quick Race"
 msgstr "Schnelle Runde"
 
@@ -655,7 +667,7 @@ msgstr "Schnelles Rennen: Wähle eine Strecke, kürzeste Zeit gewinnt."
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/race_gui.cpp:746
+#: src/gui/race_gui.cpp:744
 msgid "REV"
 msgstr "Rückwärts"
 
@@ -663,23 +675,26 @@ msgstr "Rückwärts"
 msgid "Race Track"
 msgstr "Rennstrecke"
 
-#: src/gui/race_results_gui.cpp:148
+#: src/gui/race_results_gui.cpp:74
 msgid "Race in this track again"
 msgstr "Diese Runde nochmal fahren"
 
-#: src/gui/race_results_gui.cpp:54
+#: src/gui/race_results_gui.cpp:126
+#: src/gui/race_results_gui.cpp:142
 msgid "Race results"
 msgstr "Rennergebnisse"
 
-#: src/gui/race_options.cpp:280
+#: src/gui/race_options.cpp:287
 msgid "Racer"
 msgstr "Rennfahrer"
 
-#: src/gui/race_gui.cpp:930
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/gui/race_gui.cpp:929
 msgid "Ready!"
 msgstr "Achtung!"
 
-#: src/gui/player_controls.cpp:66
+#. I18N: name of controls
+#: src/gui/player_controls.cpp:78
 msgid "Rescue"
 msgstr "Retten"
 
@@ -687,28 +702,26 @@ msgstr "Retten"
 msgid "Restart Race"
 msgstr "Rennen neu starten"
 
-#: src/gui/race_results_gui.cpp:48
-msgid "Result"
-msgstr "Ergebnis"
-
 #: src/gui/race_menu.cpp:49
 msgid "Return To Race"
 msgstr "Zurück zum Rennen"
 
-#: src/gui/player_controls.cpp:64
+#. I18N: name of controls (here, 'right' is the opposite of 'left' not the opposite of 'wrong')
+#: src/gui/player_controls.cpp:70
 msgid "Right"
 msgstr "Rechts"
 
-#: data/gp2.cup:5
+#: data/grandprix/tothemoonandback.grandprix:5
 msgid "Second grand prix"
 msgstr "Zweiter Grand Prix"
 
+#. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/gui/race_gui.cpp:939
 msgid "Set!"
 msgstr "Fertig?"
 
 #: src/gui/race_menu.cpp:57
-#: src/gui/race_results_gui.cpp:153
+#: src/gui/race_results_gui.cpp:79
 msgid "Setup New Race"
 msgstr "Neues Rennen konfigurieren"
 
@@ -720,11 +733,16 @@ msgstr "Treibsand"
 msgid "Single Player"
 msgstr "Einzelspieler"
 
-#: src/gui/race_options.cpp:281
+#: src/gui/game_mode.cpp:53
+msgid "Single Race"
+msgstr "Einzerennen"
+
+#: src/gui/race_options.cpp:288
+#: data/grandprix/alltracks.challenge:8
 msgid "Skidding Preview"
 msgstr "Schleuder-Vorschau"
 
-#: data/gp3.cup:4
+#: data/grandprix/snagdrive.grandprix:4
 msgid "Snag Drive"
 msgstr "Snag Drive"
 
@@ -744,7 +762,7 @@ msgstr "Musikeinstellungen"
 msgid "Star Track"
 msgstr "Stern-Piste"
 
-#: src/gui/race_options.cpp:124
+#: src/gui/race_options.cpp:133
 msgid "Start race"
 msgstr "Rennen starten"
 
@@ -764,13 +782,12 @@ msgstr ""
 "Die aktuellen Tastenzuweisungen können im Menu\n"
 "Optionen->Spieler Konfiguration eingesehen/geändert werden."
 
-#: src/gui/grand_prix_ending.cpp:107
-#: src/gui/leader_result.cpp:109
+#: src/gui/grand_prix_ending.cpp:109
 #, c-format
 msgid "The winner is %s!"
 msgstr "Gewonnen hat %s!"
 
-#: data/gp3.cup:5
+#: data/grandprix/snagdrive.grandprix:5
 msgid "Third grand prix"
 msgstr "Dritter Grand Prix"
 
@@ -778,7 +795,8 @@ msgstr "Dritter Grand Prix"
 msgid "Three Players"
 msgstr "Drei Spieler"
 
-#: src/gui/game_mode.cpp:63
+#: src/gui/game_mode.cpp:64
+#: src/gui/game_mode.cpp:88
 msgid "Time Trial"
 msgstr "Gegen die Zeit"
 
@@ -790,8 +808,7 @@ msgstr "Gegen die Uhr: ein schnelles Rennen, aber ohne Gegenstände."
 msgid "To help you win, there are certain collectables you can grab:"
 msgstr "Um dich beim Gewinnen ein wenig zu unterstützen, gibt es kleine Hilfen zum Aufsammeln:"
 
-#: src/challenges/moon_and_back_gp.cpp:49
-#: data/gp2.cup:4
+#: data/grandprix/tothemoonandback.grandprix:4
 msgid "To the Moon and Back"
 msgstr "Zum Mond und zurück"
 
@@ -827,15 +844,15 @@ msgstr "Zwei Spieler"
 msgid "Volcano"
 msgstr "Vulkan"
 
-#: src/player_kart.cpp:276
+#: src/player_kart.cpp:283
 msgid "WRONG WAY!"
 msgstr "Falsche Richtung!"
 
-#: src/gui/player_controls.cpp:65
+#: src/gui/player_controls.cpp:74
 msgid "Wheelie"
 msgstr "Kickstart"
 
-#: src/challenges/penguin_playground_gp.cpp:25
+#: data/followtheleader.challenge:5
 msgid ""
 "Win Penguin Playground Grand\n"
 "Prix"
@@ -843,7 +860,7 @@ msgstr ""
 "Gewinne den 'Pinguin Spielplatz'\n"
 "Grand Prix"
 
-#: src/challenges/penguin_playground_gp.cpp:27
+#: data/followtheleader.challenge:6
 msgid ""
 "Win Penguin Playground Grand\n"
 "Prix with 3 'Racer' Level AI karts."
@@ -851,7 +868,7 @@ msgstr ""
 "Gewinne den 'Pinguin Spielplatz' Grand Prix\n"
 "mit 3 KI Karts der Stufe 'Rennfahrer'"
 
-#: src/challenges/moon_and_back_gp.cpp:25
+#: data/grandprix/snagdrive.challenge:5
 msgid ""
 "Win To the Moon and Back\n"
 "Grand Prix"
@@ -859,7 +876,7 @@ msgstr ""
 "Gewinne den Grand Prix\n"
 "'Zum Mond und zurück'"
 
-#: src/challenges/tollway_head2head.cpp:27
+#: data/tracks/fortmagma/fortmagma.challenge:6
 msgid ""
 "Win a 1 lap Head to Head\n"
 "on Tux Tollway against 1 'Racer'\n"
@@ -869,7 +886,7 @@ msgstr ""
 "auf Tux' Zollstrasse gegen einen KI Kart\n"
 "der Stufe 'Rennfahrer'"
 
-#: src/challenges/jungle_follow.cpp:27
+#: data/tracks/city/city.challenge:6
 msgid ""
 "Win a Follow the Leader race\n"
 "with 3 AI karts\n"
@@ -879,7 +896,7 @@ msgstr ""
 "mit 3 KI Karts\n"
 "im Jungel des Amazonas"
 
-#: src/challenges/island_follow.cpp:27
+#: data/grandprix/atworldsend.challenge:6
 msgid ""
 "Win a Follow the Leader race\n"
 "with 3 AI karts\n"
@@ -889,7 +906,7 @@ msgstr ""
 "mit 3 Computer-Gegnern\n"
 "auf einer Wüsten-Insel"
 
-#: src/challenges/tollway_head2head.cpp:25
+#: data/tracks/fortmagma/fortmagma.challenge:5
 msgid ""
 "Win a Head to Head on\n"
 "Tux Tollway"
@@ -897,7 +914,7 @@ msgstr ""
 "Gewinn ein Kopf-an-Kopf\n"
 "auf Tux's Zollstrasse"
 
-#: src/challenges/worlds_end_gp.cpp:25
+#: data/grandprix/alltracks.challenge:5
 msgid ""
 "Win the At World's End\n"
 "Grand Prix"
@@ -905,7 +922,7 @@ msgstr ""
 "Gewinne den Grand Prix\n"
 "Am Ende der Welt"
 
-#: src/challenges/moon_and_back_gp.cpp:27
+#: data/grandprix/snagdrive.challenge:6
 msgid ""
 "Win the To the Moon and Back\n"
 "Grand Prix with 3 'Racer'\n"
@@ -919,11 +936,11 @@ msgstr ""
 msgid "Window mode"
 msgstr "Fenstermodus"
 
-#: src/player_kart.cpp:231
-msgid "You finished"
-msgstr "Beendet"
+#: src/player_kart.cpp:239
+msgid "You finished the race!"
+msgstr "Du hast das Rennen beendet!"
 
-#: src/world.cpp:607
+#: src/world.cpp:645
 msgid ""
 "You have been\n"
 "eliminated!"
@@ -931,49 +948,55 @@ msgstr ""
 "Du bist\n"
 "ausgeschieden!"
 
-#: src/player_kart.cpp:231
-msgid "You won"
-msgstr "Du gewinnst"
+#: src/player_kart.cpp:239
+msgid "You won the race!"
+msgstr "Du hast das Rennen gewonnen!"
 
 #: src/gui/help_page_two.cpp:92
 msgid "Zipper - speed boost"
 msgstr "Zipper - Geschwindigkeitssteigerung"
 
-#: src/user_config.cpp:844
+#: src/user_config.cpp:855
 #, c-format
 msgid "joy %d axis %d  %c"
 msgstr "Joystick %d Achse %d  %c"
 
-#: src/user_config.cpp:848
+#: src/user_config.cpp:859
 #, c-format
 msgid "joy %d btn %d"
 msgstr "Joystick %d Knopf %d"
 
-#: src/user_config.cpp:851
+#: src/user_config.cpp:862
 #, c-format
 msgid "joy %d hat %d"
 msgstr "Joystick %d Richtungstasten %d"
 
-#: src/user_config.cpp:857
+#: src/user_config.cpp:868
 #, c-format
 msgid "mouse axis %d %c"
 msgstr "Maus Achse %d %c"
 
-#: src/user_config.cpp:854
+#: src/user_config.cpp:865
 #, c-format
 msgid "mouse btn %d"
 msgstr "Maus Taste %d"
 
-#: src/user_config.cpp:838
-#: src/user_config.cpp:883
+#: src/user_config.cpp:849
+#: src/user_config.cpp:894
 #, c-format
 msgid "not set"
 msgstr "nicht definiert"
 
-#: src/player_kart.cpp:233
-msgid "the race!"
-msgstr "das Rennen!"
-
+#~ msgid "Fulfil challenge to unlock"
+#~ msgstr "Zum Freischalten, erfülle Herausforderung"
+#~ msgid "You won"
+#~ msgstr "Du gewinnst"
+#~ msgid "Fuzzy blob/Spark - very slow, but bounces from walls"
+#~ msgstr "Haariger Blubber/Blitz - sehr langsam, aber prallt von Wänden ab"
+#~ msgid "No track selected"
+#~ msgstr "Keine Strecke gewählt"
+#~ msgid "Result"
+#~ msgstr "Ergebnis"
 #~ msgid "Check the current key bindings for the first player"
 #~ msgstr "Überprüfe die Tastenbelegung für den ersten Spieler:"
 #~ msgid ""