diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index 9fdd49bb7..caac45aa9 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-27 10:30+1100\n"
+"POT-Creation-Date: 2008-04-21 09:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,649 +16,539 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: herring_manager.cpp:245
+#: src/gui/config_display.cpp:501
+#, c-format
+msgid "%dx%d Blacklisted"
+msgstr ""
+
+#: src/world.cpp:620
 #, c-format
 msgid ""
-"The herring style '%s' in your configuration file does not exist.\n"
-"It is ignored.\n"
+"'%s' has\n"
+"been eliminated."
 msgstr ""
 
-#: herring_manager.cpp:256
+#: src/gui/player_controls.cpp:61
+msgid "Accelerate"
+msgstr ""
+
+#: src/gui/challenges_menu.cpp:44
+msgid "Active Challenges"
+msgstr ""
+
+#: src/gui/help_page_two.cpp:136
+msgid "Anvil - slows down greatly the kart in the first position"
+msgstr ""
+
+#: src/gui/config_display.cpp:145
+msgid "Apply "
+msgstr ""
+
+#: src/gui/config_display.cpp:449
 #, c-format
-msgid ""
-"The herring style '%s' specified on the command line does not exist.\n"
-"It is ignored.\n"
+msgid "Apply %dx%d"
 msgstr ""
 
-#: herring_manager.cpp:342
-#, c-format
-msgid "Couldn't load map '%s': no herring node."
-msgstr ""
-
-#: kart_properties_manager.cpp:92
-#, c-format
-msgid "KartPropertiesManager: Couldn't find kart: '%s'"
-msgstr ""
-
-#: loader.cpp:70
-#, c-format
-msgid "Data files will be fetched from: '%s'\n"
-msgstr ""
-
-#: loader.cpp:178
-#, c-format
-msgid "Couldn't find file '%s'."
-msgstr ""
-
-#: main.cpp:63
-#, c-format
-msgid ""
-"Usage: %s [OPTIONS]\n"
-"\n"
-"Run SuperTuxKart, a racing game with go-kart that features the Tux and "
-"friends.\n"
-"\n"
-"Options:\n"
-"  -N,  --no-start-screen  Quick race\n"
-"  -l,  --list-tracks      Show available tracks\n"
-"  -k,  --numkarts NUM     Number of karts on the racetrack\n"
-"       --kart NAME        Use kart number NAME\n"
-"       --list-karts       Show available karts\n"
-"       --laps N           Define number of laps to N\n"
-"       --herring STYLE    Use STYLE as your herring style\n"
-"  -f,  --fullscreen       Fullscreen display\n"
-"  -w,  --windowed         Windowed display (default)\n"
-"  -s,  --screensize WxH   Set the screen size (e.g. 320x200)\n"
-"  -v,  --version          Show version\n"
-"  -h,  --help             Show this help\n"
-"\n"
-"You can visit SuperTuxKart's homepage at http://supertuxkart.berlios.de\n"
-"\n"
-msgstr ""
-
-#: main.cpp:105
-msgid "--help"
-msgstr ""
-
-#: main.cpp:106
-msgid "-help"
-msgstr ""
-
-#: main.cpp:120
-#, c-format
-msgid "You choose to start in track: %s.\n"
-msgstr ""
-
-#: main.cpp:126
-#, c-format
-msgid "You choose to have %s karts.\n"
-msgstr ""
-
-#: main.cpp:131
-#, c-format
-msgid "  Available tracks:\n"
-msgstr ""
-
-#: main.cpp:137
-#, c-format
-msgid ""
-"Use --track N to choose track.\n"
-"\n"
-msgstr ""
-
-#: main.cpp:147
-#, c-format
-msgid "  Available karts:\n"
-msgstr ""
-
-#: main.cpp:168
-#, c-format
-msgid "Enabling mirror mode.\n"
-msgstr ""
-
-#: main.cpp:177
-#, c-format
-msgid "You choose to have %d laps.\n"
-msgstr ""
-
-#: main.cpp:207
-#, c-format
-msgid "You choose to be in %dx%d.\n"
-msgstr ""
-
-#: main.cpp:211
-#, c-format
-msgid "Error: --screensize argument must be given as WIDTHxHEIGHT\n"
-msgstr ""
-
-#: main.cpp:240
-#, c-format
-msgid ""
-"Invalid parameter: %s.\n"
-"\n"
-msgstr ""
-
-#: main.cpp:372
-#, c-format
-msgid ""
-"\n"
-"Aborting SuperTuxKart\n"
-msgstr ""
-
-#: moving_texture.cpp:77
-#, c-format
-msgid "Unrecognised @autodcs string: '%s'\n"
-msgstr ""
-
-#: sound_manager.cpp:50
-#, c-format
-msgid "WARNING: Could not initialize the PLIB based sound.\n"
-msgstr ""
-
-#: sound_manager.cpp:62
-#, c-format
-msgid "WARNING: Could not initialize the ALUT based sound.\n"
-msgstr ""
-
-#: user_config.cpp:127 gui/config_controls.cpp:36
-#, c-format
-msgid "Player %d"
-msgstr ""
-
-#: user_config.cpp:209
-#, c-format
-msgid "Couldn't create '%s', config files will not be saved.\n"
-msgstr ""
-
-#: user_config.cpp:215
-#, c-format
-msgid "Config directory '%s' successfully created.\n"
-msgstr ""
-
-#: user_config.cpp:240
-#, c-format
-msgid "Config file '%s' does not exist, it will be created.\n"
-msgstr ""
-
-#: user_config.cpp:252
-#, c-format
-msgid "No tuxkart-config node"
-msgstr ""
-
-#: user_config.cpp:261
-#, c-format
-msgid ""
-"\n"
-"Config file version '%d' is too old.\n"
-"The following changes have been applied in the current SuperTuxKart "
-"version:\n"
-msgstr ""
-
-#: user_config.cpp:267
-#, c-format
-msgid ""
-"- Single window menu, old status display,new keyboard style settings were "
-"removed\n"
-msgstr ""
-
-#: user_config.cpp:269
-#, c-format
-msgid ""
-"- Key bindings were changed, please check the settings. All existing values "
-"were discarded.\n"
-msgstr ""
-
-#: user_config.cpp:272
-#, c-format
-msgid ""
-"Config file version '%d' is too old. Discarding your configuration. Sorry. :"
-"(\n"
-msgstr ""
-
-#: user_config.cpp:280
-#, c-format
-msgid "This warning can be ignored.\n"
-msgstr ""
-
-#: user_config.cpp:313
-#, c-format
-msgid "No '%s' node"
-msgstr ""
-
-#: user_config.cpp:338
-#, c-format
-msgid "Error while parsing config '%s':\n"
-msgstr ""
-
-#: user_config.cpp:490
-#, c-format
-msgid "Couldn't write config: "
-msgstr ""
-
-#: user_config.cpp:549
-#, c-format
-msgid "%s"
-msgstr ""
-
-#: user_config.cpp:552
-#, c-format
-msgid "joy %d axis %d  %c"
-msgstr ""
-
-#: user_config.cpp:556
-#, c-format
-msgid "joy %d btn %d"
-msgstr ""
-
-#: user_config.cpp:559
-#, c-format
-msgid "joy %d hat %d"
-msgstr ""
-
-#: user_config.cpp:562
-#, c-format
-msgid "mouse btn %d"
-msgstr ""
-
-#: user_config.cpp:565
-#, c-format
-msgid "mouse axis %d %c"
-msgstr ""
-
-#: user_config.cpp:569
-#, c-format
-msgid "Invalid"
-msgstr ""
-
-#: gui/char_sel.cpp:52
-#, c-format
-msgid "Player %d, choose a driver"
-msgstr ""
-
-#: gui/char_sel.cpp:76
-msgid "No driver choosed"
-msgstr ""
-
-#: gui/config_controls.cpp:28
-msgid "Edit controls for which player?"
-msgstr ""
-
-#: gui/config_controls.cpp:41 gui/config_display.cpp:49
-#: gui/config_sound.cpp:56 gui/difficulty.cpp:46 gui/game_mode.cpp:48
-#: gui/grand_prix_select.cpp:58 gui/num_laps.cpp:43 gui/num_players.cpp:41
-#: gui/options.cpp:50 gui/player_controls.cpp:54 gui/scrolled_text.cpp:74
-msgid "Press <ESC> to go back"
-msgstr ""
-
-#: gui/config_display.cpp:40
-msgid "Display Settings"
-msgstr ""
-
-#: gui/config_display.cpp:43 gui/config_display.cpp:88
-msgid "Fullscreen mode"
-msgstr ""
-
-#: gui/config_display.cpp:47 gui/config_display.cpp:86
-msgid "Window mode"
-msgstr ""
-
-#: gui/config_sound.cpp:35
-msgid "Sound Settings"
-msgstr ""
-
-#: gui/config_sound.cpp:42
-msgid "  Turn off music  "
-msgstr ""
-
-#: gui/config_sound.cpp:45
-msgid "  Turn on music  "
-msgstr ""
-
-#: gui/config_sound.cpp:49
-msgid "  Turn off sound effects  "
-msgstr ""
-
-#: gui/config_sound.cpp:52
-msgid "  Turn on sound effects  "
-msgstr ""
-
-#: gui/config_sound.cpp:88
-msgid "Turn on music"
-msgstr ""
-
-#: gui/config_sound.cpp:93
-msgid "Turn off music"
-msgstr ""
-
-#: gui/config_sound.cpp:101
-msgid "Turn on sound effects"
-msgstr ""
-
-#: gui/config_sound.cpp:106
-msgid "Turn off sound effects"
-msgstr ""
-
-#: gui/credits_menu.cpp:44
-#, c-format
-msgid "Couldn't load '%s'\n"
-msgstr ""
-
-#: gui/credits_menu.cpp:45
-msgid "CREDIT file was not installed properly!!"
-msgstr ""
-
-#: gui/credits_menu.cpp:46
-msgid "Please check 'data/CREDIT'!!"
-msgstr ""
-
-#: gui/difficulty.cpp:37
-msgid "Choose your skill level"
-msgstr ""
-
-#: gui/difficulty.cpp:42
-msgid "Racer"
-msgstr ""
-
-#: gui/difficulty.cpp:43
-msgid "Driver"
-msgstr ""
-
-#: gui/difficulty.cpp:44
-msgid "Novice"
-msgstr ""
-
-#: gui/game_mode.cpp:37
-msgid "Choose a Race Mode"
-msgstr ""
-
-#: gui/game_mode.cpp:41
-msgid "Grand Prix"
-msgstr ""
-
-#: gui/game_mode.cpp:42
-msgid "Quick Race"
-msgstr ""
-
-#: gui/game_mode.cpp:45
-msgid "Time Trial"
-msgstr ""
-
-#: gui/grand_prix_ending.cpp:61
-#, c-format
-msgid "The winner is %s!"
-msgstr ""
-
-#: gui/grand_prix_ending.cpp:65 gui/race_results_gui.cpp:87
-msgid "Back to the main menu"
-msgstr ""
-
-#: gui/grand_prix_select.cpp:34
-msgid "Choose a Grand Prix"
-msgstr ""
-
-#: gui/help_menu.cpp:132
-msgid "Force your rivals bite *your* dust!"
-msgstr ""
-
-#: gui/help_menu.cpp:136
-msgid "Avoid bananas"
-msgstr ""
-
-#: gui/help_menu.cpp:137
-msgid "Grab blue boxes and coins"
-msgstr ""
-
-#: gui/help_menu.cpp:177
+#: src/gui/help_page_one.cpp:118
 msgid ""
 "At high speeds wheelies drive you faster, but you can't steer. If you\n"
 "get stuck or fall too far, use the rescue button to get back on track."
 msgstr ""
 
-#: gui/help_menu.cpp:184
-msgid "Check the current keys bindings for the first player:"
+#: src/gui/help_page_one.cpp:81
+msgid "Avoid bananas"
 msgstr ""
 
-#: gui/help_menu.cpp:205
-msgid "Next screen"
+#: src/gui/grand_prix_ending.cpp:148 src/gui/leader_result.cpp:152
+#: src/gui/race_results_gui.cpp:168
+msgid "Back to the main menu"
 msgstr ""
 
-#: gui/help_menu.cpp:206 gui/help_menu.cpp:263
-msgid "Go back to the main menu"
-msgstr ""
-
-#: gui/help_menu.cpp:223
-msgid "To help you win, there are certain collectables you can grab:"
-msgstr ""
-
-#: gui/help_menu.cpp:234 gui/help_menu.cpp:259
-msgid "Missile - fast stopper in a straight line"
-msgstr ""
-
-#: gui/help_menu.cpp:238
-msgid "Homing missile - follows rivals, but is slower than the missile"
-msgstr ""
-
-#: gui/help_menu.cpp:242
-msgid "Fuzzy blob/Spark - very slow, but bounces from walls"
-msgstr ""
-
-#: gui/help_menu.cpp:246
-msgid "Zipper - speed boost"
-msgstr ""
-
-#: gui/help_menu.cpp:250
-msgid "Parachute - slows down all karts in a better position!"
-msgstr ""
-
-#: gui/help_menu.cpp:254
-msgid "Anvil - slows down greatly the kart in the first position"
-msgstr ""
-
-#: gui/help_menu.cpp:262
-msgid "Previous screen"
-msgstr ""
-
-#: gui/main_menu.cpp:43
-msgid "Single Player"
-msgstr ""
-
-#: gui/main_menu.cpp:44
-msgid "Multiplayer"
-msgstr ""
-
-#: gui/main_menu.cpp:45 gui/options.cpp:38 gui/race_menu.cpp:47
-msgid "Options"
-msgstr ""
-
-#: gui/main_menu.cpp:46
-msgid "Quit"
-msgstr ""
-
-#: gui/main_menu.cpp:48 gui/race_menu.cpp:48
-msgid "Help"
-msgstr ""
-
-#: gui/main_menu.cpp:49
-msgid "Credits"
-msgstr ""
-
-#: gui/num_laps.cpp:34
-msgid "Choose number of laps"
-msgstr ""
-
-#: gui/num_laps.cpp:36
-msgid "One"
-msgstr ""
-
-#: gui/num_laps.cpp:37
-msgid "Two"
-msgstr ""
-
-#: gui/num_laps.cpp:38
-msgid "Four"
-msgstr ""
-
-#: gui/num_laps.cpp:39
-msgid "Five"
-msgstr ""
-
-#: gui/num_laps.cpp:40
-msgid "Six"
-msgstr ""
-
-#: gui/num_laps.cpp:41
-msgid "Eight"
-msgstr ""
-
-#: gui/num_players.cpp:37
-msgid "Two Players"
-msgstr ""
-
-#: gui/num_players.cpp:38
-msgid "Three Players"
-msgstr ""
-
-#: gui/num_players.cpp:39
-msgid "Four Players"
-msgstr ""
-
-#: gui/options.cpp:39
-msgid "Controls"
-msgstr ""
-
-#: gui/options.cpp:46
-msgid "Display"
-msgstr ""
-
-#: gui/options.cpp:48
-msgid "Sound"
-msgstr ""
-
-#: gui/player_controls.cpp:30
-msgid "Left"
-msgstr ""
-
-#: gui/player_controls.cpp:30
-msgid "Right"
-msgstr ""
-
-#: gui/player_controls.cpp:30
-msgid "Accelerate"
-msgstr ""
-
-#: gui/player_controls.cpp:31
+#: src/gui/player_controls.cpp:62
 msgid "Brake"
 msgstr ""
 
-#: gui/player_controls.cpp:31
-msgid "Wheelie"
+#: src/gui/main_menu.cpp:63
+msgid "Challenges"
 msgstr ""
 
-#: gui/player_controls.cpp:31
-msgid "Jump"
+#: src/gui/help_page_one.cpp:124
+msgid "Check the current key bindings for the first player"
 msgstr ""
 
-#: gui/player_controls.cpp:32
-msgid "Rescue"
+#: src/gui/grand_prix_select.cpp:55
+msgid "Choose a Grand Prix"
 msgstr ""
 
-#: gui/player_controls.cpp:32
-msgid "Fire"
+#: src/gui/game_mode.cpp:49
+msgid "Choose a Race Mode"
 msgstr ""
 
-#: gui/player_controls.cpp:39
+#: src/gui/track_sel.cpp:50
+msgid "Choose a track"
+msgstr ""
+
+#: src/gui/num_karts.cpp:46
+msgid "Choose number of karts"
+msgstr ""
+
+#: src/gui/num_laps.cpp:46
+msgid "Choose number of laps"
+msgstr ""
+
+#: src/gui/player_controls.cpp:77
 #, c-format
 msgid "Choose your controls, %s"
 msgstr ""
 
-#: gui/player_controls.cpp:79
-msgid "Press key"
+#: src/gui/difficulty.cpp:50
+msgid "Choose your skill level"
 msgstr ""
 
-#: gui/race_gui.cpp:335
+#: src/gui/config_display.cpp:153
+msgid "Clear from Blacklist"
+msgstr ""
+
+#: src/gui/display_res_confirm.cpp:70
+msgid "Confirm Resolution"
+msgstr ""
+
+#: src/gui/display_res_confirm.cpp:129
 #, c-format
-msgid "YOU FINISHED %s"
+msgid "Confirm Resolution Within %d Seconds"
 msgstr ""
 
-#: gui/race_gui.cpp:340
-msgid "CONGRATULATIONS"
+#: src/gui/display_res_confirm.cpp:60
+msgid "Confirm Resolution Within 5 Seconds"
 msgstr ""
 
-#: gui/race_gui.cpp:341
-msgid "YOU WON THE RACE!"
+#: src/gui/feature_unlocked.cpp:61 src/gui/grand_prix_ending.cpp:144
+#: src/gui/leader_result.cpp:148 src/gui/num_karts.cpp:92
+#: src/gui/race_results_gui.cpp:159
+msgid "Continue"
 msgstr ""
 
-#: gui/race_gui.cpp:489 gui/race_gui.cpp:503
-msgid "WRONG WAY!"
+#: src/gui/race_results_gui.cpp:164
+msgid "Continue Grand Prix"
 msgstr ""
 
-#: gui/race_gui.cpp:770
-msgid "REV"
+#: src/gui/main_menu.cpp:82
+msgid "Credits"
 msgstr ""
 
-#: gui/race_gui.cpp:817
+#: src/gui/config_display.cpp:130 src/gui/config_display.cpp:177
+#, c-format
+msgid "Current: %dx%d"
+msgstr ""
+
+#: src/gui/config_display.cpp:137
+msgid "Decrease Resolution"
+msgstr ""
+
+#: src/gui/options.cpp:60
+msgid "Display"
+msgstr ""
+
+#: src/gui/config_display.cpp:93
+msgid "Display Settings"
+msgstr ""
+
+#: src/gui/difficulty.cpp:57
+msgid "Driver"
+msgstr ""
+
+#: src/gui/config_controls.cpp:52
+msgid "Edit controls for which player?"
+msgstr ""
+
+#: src/gui/race_menu.cpp:80
+msgid "Exit Race"
+msgstr ""
+
+#: src/gui/race_gui.cpp:766
 #, c-format
 msgid "Finished"
 msgstr ""
 
-#: gui/race_gui.cpp:822
-msgid "Lap"
+#: src/gui/player_controls.cpp:63
+msgid "Fire"
 msgstr ""
 
-#: gui/race_gui.cpp:856
-msgid "Ready!"
+#: src/gui/game_mode.cpp:80
+msgid "Follow the Leader"
 msgstr ""
 
-#: gui/race_gui.cpp:859
-msgid "Set!"
+#: src/gui/help_page_one.cpp:74
+msgid "Force your rivals bite *your* dust!"
 msgstr ""
 
-#: gui/race_gui.cpp:862
+#: src/gui/num_players.cpp:54
+msgid "Four Players"
+msgstr ""
+
+#: src/gui/config_display.cpp:119 src/gui/config_display.cpp:206
+#: src/gui/config_display.cpp:262
+msgid "Fullscreen mode"
+msgstr ""
+
+#: src/gui/help_page_two.cpp:97
+msgid "Fuzzy blob/Spark - very slow, but bounces from walls"
+msgstr ""
+
+#: src/gui/challenges_menu.cpp:67 src/gui/credits_menu.cpp:84
+#: src/gui/help_page_one.cpp:158 src/gui/help_page_two.cpp:148
+msgid "Go back to the main menu"
+msgstr ""
+
+#: src/gui/race_gui.cpp:903
 msgid "Go!"
 msgstr ""
 
-#: gui/race_gui.cpp:879
-msgid "Penalty time!!"
+#: src/gui/help_page_one.cpp:78
+msgid "Grab blue boxes and coins"
 msgstr ""
 
-#: gui/race_menu.cpp:43
+#: src/gui/game_mode.cpp:61
+msgid "Grand Prix"
+msgstr ""
+
+#: src/gui/main_menu.cpp:77 src/gui/race_menu.cpp:65
+msgid "Help"
+msgstr ""
+
+#: src/gui/race_results_gui.cpp:69
+msgid "Highscores"
+msgstr ""
+
+#: src/gui/help_page_two.cpp:84
+msgid "Homing missile - follows rivals, but is slower than the missile"
+msgstr ""
+
+#: src/gui/config_display.cpp:134
+msgid "Increase Resolution"
+msgstr ""
+
+#: src/user_config.cpp:852
+#, c-format
+msgid "Invalid"
+msgstr ""
+
+#: src/kart.cpp:644
+msgid "Invalid short-cut!!"
+msgstr ""
+
+#: src/gui/player_controls.cpp:62
+msgid "Jump"
+msgstr ""
+
+#: src/gui/num_karts.cpp:61
+#, c-format
+msgid "Karts: %d"
+msgstr ""
+
+#: src/gui/race_gui.cpp:771
+msgid "Lap"
+msgstr ""
+
+#: src/gui/num_laps.cpp:55
+msgid "Laps: 3"
+msgstr ""
+
+#: src/gui/race_gui.cpp:406
+msgid "Leader"
+msgstr ""
+
+#: src/gui/player_controls.cpp:61
+msgid "Left"
+msgstr ""
+
+#: src/gui/num_karts.cpp:71 src/gui/num_laps.cpp:64
+msgid "Less"
+msgstr ""
+
+#: src/gui/player_controls.cpp:63
+msgid "Look back"
+msgstr ""
+
+#: src/gui/help_page_two.cpp:71
+msgid "Missile - fast stopper in a straight line"
+msgstr ""
+
+#: src/gui/num_karts.cpp:78 src/gui/num_laps.cpp:71
+msgid "More"
+msgstr ""
+
+#: src/gui/main_menu.cpp:57
+msgid "Multiplayer"
+msgstr ""
+
+#: src/gui/feature_unlocked.cpp:43
+msgid "New Feature Unlocked"
+msgstr ""
+
+#: src/kart.cpp:415
+msgid "New fastest lap"
+msgstr ""
+
+#: src/gui/help_page_one.cpp:153
+msgid "Next screen"
+msgstr ""
+
+#: src/gui/grand_prix_select.cpp:83
+msgid "No Grand Prix selected"
+msgstr ""
+
+#: src/gui/track_sel.cpp:105
+msgid "No track selected"
+msgstr ""
+
+#: src/gui/difficulty.cpp:60
+msgid "Novice"
+msgstr ""
+
+#: src/user_config.cpp:483
+msgid "Old config file found, check your key bindings!"
+msgstr ""
+
+#: src/gui/main_menu.cpp:66 src/gui/options.cpp:39 src/gui/race_menu.cpp:61
+msgid "Options"
+msgstr ""
+
+#: src/gui/help_page_two.cpp:123
+msgid "Parachute - slows down all karts in a better position!"
+msgstr ""
+
+#: src/gui/race_menu.cpp:52
 msgid "Paused"
 msgstr ""
 
-#: gui/race_menu.cpp:46
-msgid "Return To Race"
+#: src/gui/race_gui.cpp:924
+msgid "Penalty time!!"
 msgstr ""
 
-#: gui/race_menu.cpp:49
-msgid "Restart Race"
+#: src/gui/player_controls.cpp:247
+msgid "Player "
 msgstr ""
 
-#: gui/race_menu.cpp:53 gui/race_results_gui.cpp:91
-msgid "Setup New Race"
+#: src/gui/char_sel.cpp:71
+#, c-format
+msgid "Player %d, choose a driver"
 msgstr ""
 
-#: gui/race_menu.cpp:56
-msgid "Exit Race"
+#: src/gui/config_controls.cpp:56
+msgid "Player 1"
 msgstr ""
 
-#: gui/race_results_gui.cpp:41
-msgid "Race results"
+#: src/gui/config_controls.cpp:59
+msgid "Player 2"
 msgstr ""
 
-#: gui/race_results_gui.cpp:88
+#: src/gui/config_controls.cpp:62
+msgid "Player 3"
+msgstr ""
+
+#: src/gui/config_controls.cpp:65
+msgid "Player 4"
+msgstr ""
+
+#: src/gui/options.cpp:46
+msgid "Player Config"
+msgstr ""
+
+#: src/gui/player_controls.cpp:83
+msgid "Player name"
+msgstr ""
+
+#: src/gui/display_res_confirm.cpp:78
+msgid "Press <ESC> to Cancel"
+msgstr ""
+
+#: src/gui/config_controls.cpp:73 src/gui/config_display.cpp:165
+#: src/gui/config_sound.cpp:78 src/gui/difficulty.cpp:63
+#: src/gui/game_mode.cpp:88 src/gui/grand_prix_select.cpp:91
+#: src/gui/num_karts.cpp:100 src/gui/num_laps.cpp:88
+#: src/gui/num_players.cpp:65 src/gui/options.cpp:80
+#: src/gui/player_controls.cpp:107
+msgid "Press <ESC> to go back"
+msgstr ""
+
+#: src/gui/player_controls.cpp:152
+msgid "Press key"
+msgstr ""
+
+#: src/gui/help_page_two.cpp:142
+msgid "Previous screen"
+msgstr ""
+
+#: src/gui/game_mode.cpp:65
+msgid "Quick Race"
+msgstr ""
+
+#: src/gui/main_menu.cpp:69
+msgid "Quit"
+msgstr ""
+
+#: src/gui/race_gui.cpp:712
+msgid "REV"
+msgstr ""
+
+#: src/gui/race_results_gui.cpp:173
 msgid "Race in this track again"
 msgstr ""
 
-#: gui/track_sel.cpp:42
-msgid "Choose a Track"
+#: src/gui/race_results_gui.cpp:66
+msgid "Race results"
 msgstr ""
 
-#: lisp/parser.cpp:52
-#, c-format
-msgid "Couldn't open file '%s'."
+#: src/gui/difficulty.cpp:54
+msgid "Racer"
 msgstr ""
 
-#: lisp/writer.cpp:40
-#, c-format
-msgid "LispWriter Error: Couldn't open file '%s'."
+#: src/gui/race_gui.cpp:893
+msgid "Ready!"
+msgstr ""
+
+#: src/gui/player_controls.cpp:63
+msgid "Rescue"
+msgstr ""
+
+#: src/gui/race_menu.cpp:69
+msgid "Restart Race"
+msgstr ""
+
+#: src/gui/race_results_gui.cpp:57
+msgid "Result"
+msgstr ""
+
+#: src/gui/race_menu.cpp:57
+msgid "Return To Race"
+msgstr ""
+
+#: src/gui/player_controls.cpp:61
+msgid "Right"
+msgstr ""
+
+#: src/gui/race_gui.cpp:898
+msgid "Set!"
+msgstr ""
+
+#: src/gui/race_menu.cpp:75 src/gui/race_results_gui.cpp:179
+msgid "Setup New Race"
+msgstr ""
+
+#: src/gui/main_menu.cpp:54
+msgid "Single Player"
+msgstr ""
+
+#: src/gui/options.cpp:69
+msgid "Sound"
+msgstr ""
+
+#: src/gui/config_sound.cpp:49
+msgid "Sound Settings"
+msgstr ""
+
+#: src/gui/num_karts.cpp:90 src/gui/num_laps.cpp:81
+msgid "Start race"
+msgstr ""
+
+#: src/gui/grand_prix_ending.cpp:107 src/gui/leader_result.cpp:109
+#, c-format
+msgid "The winner is %s!"
+msgstr ""
+
+#: src/gui/num_players.cpp:46
+msgid "Three Players"
+msgstr ""
+
+#: src/gui/game_mode.cpp:70
+msgid "Time Trial"
+msgstr ""
+
+#: src/gui/help_page_two.cpp:57
+msgid "To help you win, there are certain collectables you can grab:"
+msgstr ""
+
+#: src/gui/config_sound.cpp:55 src/gui/config_sound.cpp:105
+msgid "Turn off music"
+msgstr ""
+
+#: src/gui/config_sound.cpp:65 src/gui/config_sound.cpp:118
+msgid "Turn off sound effects"
+msgstr ""
+
+#: src/gui/config_sound.cpp:59 src/gui/config_sound.cpp:99
+msgid "Turn on music"
+msgstr ""
+
+#: src/gui/config_sound.cpp:69 src/gui/config_sound.cpp:113
+msgid "Turn on sound effects"
+msgstr ""
+
+#: src/gui/num_players.cpp:38
+msgid "Two Players"
+msgstr ""
+
+#: src/player_kart.cpp:252
+msgid "WRONG WAY!"
+msgstr ""
+
+#: src/gui/player_controls.cpp:62
+msgid "Wheelie"
+msgstr ""
+
+#: src/gui/config_display.cpp:115
+msgid "Window mode"
+msgstr ""
+
+#: src/world.cpp:537
+msgid "You finished"
+msgstr ""
+
+#: src/world.cpp:615
+msgid ""
+"You have been\n"
+"eliminated!"
+msgstr ""
+
+#: src/world.cpp:536
+msgid "You won"
+msgstr ""
+
+#: src/gui/help_page_two.cpp:110
+msgid "Zipper - speed boost"
+msgstr ""
+
+#: src/user_config.cpp:835
+#, c-format
+msgid "joy %d axis %d  %c"
+msgstr ""
+
+#: src/user_config.cpp:839
+#, c-format
+msgid "joy %d btn %d"
+msgstr ""
+
+#: src/user_config.cpp:842
+#, c-format
+msgid "joy %d hat %d"
+msgstr ""
+
+#: src/user_config.cpp:848
+#, c-format
+msgid "mouse axis %d %c"
+msgstr ""
+
+#: src/user_config.cpp:845
+#, c-format
+msgid "mouse btn %d"
+msgstr ""
+
+#: src/user_config.cpp:829 src/user_config.cpp:874
+#, c-format
+msgid "not set"
+msgstr ""
+
+#: src/world.cpp:539
+msgid "the race!"
 msgstr ""