diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index 2895911e2..3d52579ed 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-26 18:03-0500\n"
+"POT-Creation-Date: 2011-03-05 18:01-0500\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"
@@ -96,12 +96,12 @@ msgid "%i. %s : survived for %s"
 msgstr ""
 
 #. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:367
+#: src/modes/linear_world.cpp:374
 #, c-format
 msgid "%s by %s"
 msgstr ""
 
-#: src/items/powerup.cpp:48
+#: src/items/powerup.cpp:49
 #, c-format
 msgid "%s is a mighty pirate!"
 msgstr ""
@@ -112,7 +112,7 @@ msgstr ""
 msgid "%s is practicing with a blue, big, spheric yo-yo"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:508
+#: src/states_screens/kart_selection.cpp:507
 #, c-format
 msgid "%s is ready"
 msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
 msgid "%s is the world master of the boomerang ball"
 msgstr ""
 
-#: src/items/powerup.cpp:47
+#: src/items/powerup.cpp:48
 #, c-format
 msgid "%s pays the next round of grog!"
 msgstr ""
@@ -134,7 +134,7 @@ msgstr ""
 msgid "%s should play (rubber) darts instead of bowling"
 msgstr ""
 
-#: src/modes/world.cpp:742
+#: src/modes/world.cpp:756
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
@@ -145,19 +145,19 @@ msgid "(Empty)"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:444
+#: data/po/gui_strings.h:447
 msgid "(network play is not yet available)"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:321
+#: data/po/gui_strings.h:324
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:415
+#: data/po/gui_strings.h:418
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -166,7 +166,7 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:604
+#: data/po/gui_strings.h:607
 msgid ""
 "* Which config to use will be inferred from which 'fire' key is pressed to "
 "join the game."
@@ -179,7 +179,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:411
+#: data/po/gui_strings.h:414
 msgid ""
 "3 Strikes Battle: only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -189,7 +189,7 @@ msgstr ""
 msgid "= Highscores ="
 msgstr ""
 
-#: src/items/powerup.cpp:81
+#: src/items/powerup.cpp:82
 msgid "A wizard did it!"
 msgstr ""
 
@@ -200,12 +200,12 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:488
+#: data/po/gui_strings.h:491
 msgid "About"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:156
+#: src/states_screens/options_screen_input2.cpp:173
 msgid "Accelerate"
 msgstr ""
 
@@ -216,30 +216,30 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In players configuration menu
-#: data/po/gui_strings.h:635
+#: data/po/gui_strings.h:638
 msgid "Add Player"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:601
+#: data/po/gui_strings.h:604
 msgid "Add a device"
 msgstr ""
 
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:223
+#: data/po/gui_strings.h:226
 msgid "Add-Ons"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:476
+#: data/po/gui_strings.h:479
 msgid "Addons"
 msgstr ""
 
 #. I18N: ./data/karts/adiumy/kart.xml
-#: data/po/gui_strings.h:877
+#: data/po/gui_strings.h:880
 msgid "Adiumy"
 msgstr ""
 
@@ -248,72 +248,72 @@ msgstr ""
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/kart_selection.cpp:889
-#: src/states_screens/tracks_screen.cpp:85 data/po/gui_strings.h:227
+#: src/states_screens/kart_selection.cpp:888
+#: src/states_screens/tracks_screen.cpp:85 data/po/gui_strings.h:230
 msgid "All"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
-#: data/po/gui_strings.h:750
+#: data/po/gui_strings.h:753
 msgid "All Tracks"
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:192
+#: src/states_screens/race_setup_screen.cpp:193
 msgid "All blows allowed, so catch weapons and make clever use of them!"
 msgstr ""
 
 #. I18N: ./data/grandprix/alltracks.grandprix
-#: data/po/gui_strings.h:161 data/po/gui_strings.h:859
+#: data/po/gui_strings.h:164 data/po/gui_strings.h:862
 msgid "All tracks"
 msgstr ""
 
 #. I18N: ./data/tracks/jungle/track.xml
-#: data/po/gui_strings.h:23
+#: data/po/gui_strings.h:26
 msgid "Amazonian Journey"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:366
+#: data/po/gui_strings.h:369
 msgid "Anchor - slows down greatly the kart in the first position"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings menu
-#: data/po/gui_strings.h:678
+#: data/po/gui_strings.h:681
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: shown before deleting an input configuration
-#: src/states_screens/options_screen_input2.cpp:416
+#: src/states_screens/options_screen_input2.cpp:433
 msgid "Are you sure you want to permanently delete this configuration?"
 msgstr ""
 
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: Section in arena tracks selection screen
-#: data/po/gui_strings.h:215
+#: data/po/gui_strings.h:218
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ./data/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:26
+#: data/po/gui_strings.h:29
 msgid "Around the Lighthouse"
 msgstr ""
 
 #. I18N: shown when anchor applied. %s is the victim.
-#: src/items/powerup.cpp:46
+#: src/items/powerup.cpp:47
 #, c-format
 msgid "Arrr, the %s dropped anchor, Captain!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:689
+#: data/po/gui_strings.h:692
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/atworldsend.grandprix
-#: data/po/gui_strings.h:164 data/po/gui_strings.h:862
+#: data/po/gui_strings.h:167 data/po/gui_strings.h:865
 msgid "At World's End"
 msgstr ""
 
@@ -327,15 +327,15 @@ msgstr ""
 #. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:554
-#: data/po/gui_strings.h:585 data/po/gui_strings.h:619
-#: data/po/gui_strings.h:650
+#: data/po/gui_strings.h:510 data/po/gui_strings.h:557
+#: data/po/gui_strings.h:588 data/po/gui_strings.h:622
+#: data/po/gui_strings.h:653
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:305
+#: data/po/gui_strings.h:308
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -368,32 +368,32 @@ msgstr ""
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the options menu, to go back to the main menu or game
 #: src/states_screens/dialogs/addons_loading.cpp:119
-#: src/states_screens/dialogs/addons_loading.cpp:124 data/po/gui_strings.h:191
-#: data/po/gui_strings.h:208 data/po/gui_strings.h:325
-#: data/po/gui_strings.h:373 data/po/gui_strings.h:419
-#: data/po/gui_strings.h:456 data/po/gui_strings.h:543
-#: data/po/gui_strings.h:574 data/po/gui_strings.h:608
-#: data/po/gui_strings.h:639 data/po/gui_strings.h:682
+#: src/states_screens/dialogs/addons_loading.cpp:124 data/po/gui_strings.h:194
+#: data/po/gui_strings.h:211 data/po/gui_strings.h:328
+#: data/po/gui_strings.h:376 data/po/gui_strings.h:422
+#: data/po/gui_strings.h:459 data/po/gui_strings.h:546
+#: data/po/gui_strings.h:577 data/po/gui_strings.h:611
+#: data/po/gui_strings.h:642 data/po/gui_strings.h:685
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:700
+#: data/po/gui_strings.h:703
 msgid "Back to Race"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:570
+#: data/po/gui_strings.h:573
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:234 data/po/gui_strings.h:257
-#: data/po/gui_strings.h:757
+#: data/po/gui_strings.h:237 data/po/gui_strings.h:260
+#: data/po/gui_strings.h:760
 msgid "Back to main menu"
 msgstr ""
 
@@ -405,12 +405,12 @@ msgstr ""
 msgid "Back to the menu"
 msgstr ""
 
-#: src/items/powerup.cpp:82
+#: src/items/powerup.cpp:83
 msgid "Banana? Box? Banana? Box? Banana? Box?"
 msgstr ""
 
 #. I18N: ./data/karts/beagle/kart.xml
-#: data/po/gui_strings.h:880
+#: data/po/gui_strings.h:883
 msgid "Beagle"
 msgstr ""
 
@@ -419,25 +419,30 @@ msgstr ""
 msgid "Better luck next time!"
 msgstr ""
 
+#. I18N: ./data/tracks/farm/track.xml
+#: data/po/gui_strings.h:14
+msgid "Bovine Barnyard"
+msgstr ""
+
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:360
+#: data/po/gui_strings.h:363
 msgid ""
 "Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
 "backwards."
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:159
+#: src/states_screens/options_screen_input2.cpp:176
 msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:351
+#: data/po/gui_strings.h:354
 msgid "BubbleGum - leave a sticky pink puddle behind you"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:354
+#: data/po/gui_strings.h:357
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights"
 msgstr ""
@@ -449,7 +454,7 @@ msgstr ""
 #: src/states_screens/dialogs/add_device_dialog.cpp:76
 #: src/states_screens/dialogs/addons_loading.cpp:96
 #: src/states_screens/dialogs/player_info_dialog.cpp:89
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:250
+#: data/po/gui_strings.h:245 data/po/gui_strings.h:253
 msgid "Cancel"
 msgstr ""
 
@@ -459,7 +464,7 @@ msgid "Cancel Remove"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:195
+#: src/states_screens/options_screen_input2.cpp:212
 msgid "Cancel/Back"
 msgstr ""
 
@@ -468,11 +473,6 @@ msgstr ""
 msgid "Cannot add a player with this name."
 msgstr ""
 
-#. I18N: ./data/tracks/canyon/track.xml
-#: data/po/gui_strings.h:2
-msgid "Canyon"
-msgstr ""
-
 #. I18N: ./data/tracks/cave/track.xml
 #: data/po/gui_strings.h:5
 msgid "Cave X"
@@ -480,46 +480,51 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:472
+#: data/po/gui_strings.h:475
 msgid "Challenges"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:231
+#: data/po/gui_strings.h:234
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:460
+#: data/po/gui_strings.h:463
 msgid "Choose a Kart"
 msgstr ""
 
+#. I18N: ./data/tracks/city/track.xml
+#: data/po/gui_strings.h:8
+msgid "City"
+msgstr ""
+
 #. I18N: ./data/challenges/crescentcrossing.challenge
-#: data/po/gui_strings.h:83 data/po/gui_strings.h:781
+#: data/po/gui_strings.h:86 data/po/gui_strings.h:784
 msgid "Collect Nitro in Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:301
+#: data/po/gui_strings.h:304
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
 #. I18N: ./data/challenges/mines.challenge
-#: data/po/gui_strings.h:125 data/po/gui_strings.h:823
+#: data/po/gui_strings.h:128 data/po/gui_strings.h:826
 msgid "Collect fuel for your rocket"
 msgstr ""
 
 #. I18N: ./data/challenges/tothemoonandback.challenge
-#: data/po/gui_strings.h:149 data/po/gui_strings.h:847
+#: data/po/gui_strings.h:152 data/po/gui_strings.h:850
 msgid "Collect the Pharaohs Treasure"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:309
+#: data/po/gui_strings.h:312
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
 "pressing the appropriate key. You can see your current level of nitro in the "
@@ -527,7 +532,7 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/challenges/alltracks.challenge
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:766
+#: data/po/gui_strings.h:71 data/po/gui_strings.h:769
 msgid "Come first in the At World's End Grand Prix with 3 Expert AI karts."
 msgstr ""
 
@@ -542,15 +547,15 @@ msgstr ""
 msgid "Confirm resolution within %i seconds"
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:199
+#: src/states_screens/race_setup_screen.cpp:200
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #. I18N: ./data/gui/feature_unlocked.stkgui
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:92 data/po/gui_strings.h:268
-#: data/po/gui_strings.h:271 data/po/gui_strings.h:274
+#: src/states_screens/race_result_gui.cpp:92 data/po/gui_strings.h:271
+#: data/po/gui_strings.h:274 data/po/gui_strings.h:277
 msgid "Continue"
 msgstr ""
 
@@ -568,31 +573,36 @@ msgstr ""
 #. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: data/po/gui_strings.h:515 data/po/gui_strings.h:562
-#: data/po/gui_strings.h:593 data/po/gui_strings.h:627
-#: data/po/gui_strings.h:658
+#: data/po/gui_strings.h:518 data/po/gui_strings.h:565
+#: data/po/gui_strings.h:596 data/po/gui_strings.h:630
+#: data/po/gui_strings.h:661
 msgid "Controls"
 msgstr ""
 
+#. I18N: ./data/tracks/canyon/track.xml
+#: data/po/gui_strings.h:2
+msgid "Coyote Canyon"
+msgstr ""
+
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:254
+#: data/po/gui_strings.h:257
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/tracks/crescentcrossing/track.xml
-#: data/po/gui_strings.h:8
+#: data/po/gui_strings.h:11
 msgid "Crescent Crossing"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: To delete a keyboard configuration
-#: data/po/gui_strings.h:566
+#: src/states_screens/options_screen_input2.cpp:86 data/po/gui_strings.h:569
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/addons_view_dialog.stkgui
-#: data/po/gui_strings.h:197
+#: data/po/gui_strings.h:200
 msgid "Description:"
 msgstr ""
 
@@ -602,8 +612,8 @@ msgid "Description: %i"
 msgstr ""
 
 #. I18N: button to disable a gamepad configuration
-#: src/states_screens/options_screen_input2.cpp:72
-#: src/states_screens/options_screen_input2.cpp:426
+#: src/states_screens/options_screen_input2.cpp:73
+#: src/states_screens/options_screen_input2.cpp:443
 msgid "Disable Device"
 msgstr ""
 
@@ -613,12 +623,12 @@ msgstr ""
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
 
-#: src/items/powerup.cpp:65
+#: src/items/powerup.cpp:66
 msgid "Do you want to fly kites?"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:183
+#: src/states_screens/options_screen_input2.cpp:200
 msgid "Down"
 msgstr ""
 
@@ -627,23 +637,23 @@ msgid "Download failed.\n"
 msgstr ""
 
 #. I18N: ./data/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:883
+#: data/po/gui_strings.h:886
 msgid "Elephpant"
 msgstr ""
 
 #. I18N: button to enable a gamepad configuration
-#: src/states_screens/options_screen_input2.cpp:74
-#: src/states_screens/options_screen_input2.cpp:427
+#: src/states_screens/options_screen_input2.cpp:75
+#: src/states_screens/options_screen_input2.cpp:444
 msgid "Enable Device"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Next to checkbox in settings menu
-#: data/po/gui_strings.h:523 data/po/gui_strings.h:535
+#: data/po/gui_strings.h:526 data/po/gui_strings.h:538
 msgid "Enabled"
 msgstr ""
 
-#: src/states_screens/dialogs/race_over_dialog.cpp:689
+#: src/states_screens/dialogs/race_over_dialog.cpp:691
 msgid "Energy"
 msgstr ""
 
@@ -654,11 +664,11 @@ msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:261
+#: data/po/gui_strings.h:264
 msgid "Enter the new player's name"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:1092
+#: src/states_screens/kart_selection.cpp:1091
 msgid ""
 "Everyone:\n"
 "Press 'Fire' now to join the game!"
@@ -666,21 +676,16 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:720
+#: data/po/gui_strings.h:723
 msgid "Exit Race"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:739
+#: data/po/gui_strings.h:742
 msgid "Expert"
 msgstr ""
 
-#. I18N: ./data/tracks/farm/track.xml
-#: data/po/gui_strings.h:11
-msgid "Farm"
-msgstr ""
-
 #: src/states_screens/feature_unlocked.cpp:461
 msgid "Feature Unlocked"
 msgstr ""
@@ -690,65 +695,65 @@ msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/challenges/hacienda.challenge
-#: data/po/gui_strings.h:110 data/po/gui_strings.h:808
+#: data/po/gui_strings.h:113 data/po/gui_strings.h:811
 msgid "Finish 3 laps in Farm with 3 easy AI karts in under 2:30 minutes."
 msgstr ""
 
 #. I18N: ./data/challenges/tollway.challenge
-#: data/po/gui_strings.h:146 data/po/gui_strings.h:844
+#: data/po/gui_strings.h:149 data/po/gui_strings.h:847
 msgid ""
 "Finish 3 laps in Lighthouse with 3 Expert AI karts in under 1:30 minutes."
 msgstr ""
 
 #. I18N: ./data/challenges/fortmagma.challenge
-#: data/po/gui_strings.h:98 data/po/gui_strings.h:796
+#: data/po/gui_strings.h:101 data/po/gui_strings.h:799
 msgid "Finish 3 laps in mines with 3 expert AI karts in under 3:00 minutes."
 msgstr ""
 
 #. I18N: ./data/challenges/hacienda.challenge
-#: data/po/gui_strings.h:107 data/po/gui_strings.h:805
+#: data/po/gui_strings.h:110 data/po/gui_strings.h:808
 msgid "Finish Farm in 2:30"
 msgstr ""
 
 #. I18N: ./data/challenges/tollway.challenge
-#: data/po/gui_strings.h:143 data/po/gui_strings.h:841
+#: data/po/gui_strings.h:146 data/po/gui_strings.h:844
 msgid "Finish Lighthouse in 1:30"
 msgstr ""
 
 #. I18N: ./data/challenges/fortmagma.challenge
-#: data/po/gui_strings.h:95 data/po/gui_strings.h:793
+#: data/po/gui_strings.h:98 data/po/gui_strings.h:796
 msgid "Finish Mines in 3:00"
 msgstr ""
 
 #. I18N: ./data/challenges/crescentcrossing.challenge
-#: data/po/gui_strings.h:86 data/po/gui_strings.h:784
+#: data/po/gui_strings.h:89 data/po/gui_strings.h:787
 msgid ""
 "Finish with at least 10 points of nitro on three laps of Oliver's Math Class "
 "in under 55 seconds."
 msgstr ""
 
 #. I18N: ./data/challenges/tothemoonandback.challenge
-#: data/po/gui_strings.h:152 data/po/gui_strings.h:850
+#: data/po/gui_strings.h:155 data/po/gui_strings.h:853
 msgid ""
 "Finish with at least 12 nitro points on 3 laps of Shifting Sands in under "
 "2:20 minutes."
 msgstr ""
 
 #. I18N: ./data/challenges/mines.challenge
-#: data/po/gui_strings.h:128 data/po/gui_strings.h:826
+#: data/po/gui_strings.h:131 data/po/gui_strings.h:829
 msgid ""
 "Finish with at least 16 nitro points on 2 laps of XR591 in under 2:30 "
 "minutes."
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:162
+#: src/states_screens/options_screen_input2.cpp:179
 msgid "Fire"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:448
+#: data/po/gui_strings.h:451
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
@@ -764,18 +769,18 @@ msgid "Follow the Leader"
 msgstr ""
 
 #. I18N: ./data/challenges/lighthouse.challenge
-#: data/po/gui_strings.h:119 data/po/gui_strings.h:817
+#: data/po/gui_strings.h:122 data/po/gui_strings.h:820
 msgid "Follow the Leader around the Solar System"
 msgstr ""
 
 #. I18N: ./data/challenges/atworldsend.challenge
-#: data/po/gui_strings.h:71 data/po/gui_strings.h:769
+#: data/po/gui_strings.h:74 data/po/gui_strings.h:772
 msgid "Follow the Leader on a Desert Island"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:407
+#: data/po/gui_strings.h:410
 msgid ""
 "Follow the leader: run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -783,13 +788,13 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:14
+#: data/po/gui_strings.h:17
 msgid "Fort Magma"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:674
+#: data/po/gui_strings.h:677
 msgid "Fullscreen"
 msgstr ""
 
@@ -799,7 +804,7 @@ msgid "GP scores :"
 msgstr ""
 
 #. I18N: Key binding section
-#: src/states_screens/options_screen_input2.cpp:100
+#: src/states_screens/options_screen_input2.cpp:117
 msgid "Game Keys"
 msgstr ""
 
@@ -811,8 +816,8 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:289 data/po/gui_strings.h:340
-#: data/po/gui_strings.h:388 data/po/gui_strings.h:434
+#: data/po/gui_strings.h:292 data/po/gui_strings.h:343
+#: data/po/gui_strings.h:391 data/po/gui_strings.h:437
 msgid "Game Modes"
 msgstr ""
 
@@ -836,38 +841,39 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:332
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:426
+#: data/po/gui_strings.h:284 data/po/gui_strings.h:335
+#: data/po/gui_strings.h:383 data/po/gui_strings.h:429
 msgid "General"
 msgstr ""
 
-#: src/items/powerup.cpp:63
+#: src/items/powerup.cpp:64
 msgid "Geronimo!!!"
 msgstr ""
 
 #. I18N: ./data/karts/gnu/kart.xml
-#: data/po/gui_strings.h:886
+#: data/po/gui_strings.h:889
 msgid "Gnu"
 msgstr ""
 
+#: src/states_screens/minimal_race_gui.cpp:102
 #: src/states_screens/race_gui.cpp:104
 msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/karts/gooey/kart.xml
-#: data/po/gui_strings.h:889
+#: data/po/gui_strings.h:892
 msgid "Gooey"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
-#: data/po/gui_strings.h:746
+#: data/po/gui_strings.h:749
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the graphics settings
-#: data/po/gui_strings.h:666
+#: data/po/gui_strings.h:669
 msgid "Graphical Effects Settings"
 msgstr ""
 
@@ -881,9 +887,9 @@ msgstr ""
 #. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:550
-#: data/po/gui_strings.h:581 data/po/gui_strings.h:615
-#: data/po/gui_strings.h:646
+#: data/po/gui_strings.h:506 data/po/gui_strings.h:553
+#: data/po/gui_strings.h:584 data/po/gui_strings.h:618
+#: data/po/gui_strings.h:649
 msgid "Graphics"
 msgstr ""
 
@@ -892,7 +898,7 @@ msgid "Guest"
 msgstr ""
 
 #. I18N: ./data/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:17
+#: data/po/gui_strings.h:20
 msgid "Hacienda"
 msgstr ""
 
@@ -900,12 +906,12 @@ msgstr ""
 #. I18N: Main menu button
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:484 data/po/gui_strings.h:716
+#: data/po/gui_strings.h:487 data/po/gui_strings.h:719
 msgid "Help"
 msgstr ""
 
 #. I18N: ./data/karts/hexley/kart.xml
-#: data/po/gui_strings.h:892
+#: data/po/gui_strings.h:895
 msgid "Hexley"
 msgstr ""
 
@@ -913,7 +919,7 @@ msgstr ""
 msgid "Highscores"
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:221
+#: src/states_screens/race_setup_screen.cpp:222
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
@@ -921,58 +927,59 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:313
+#: data/po/gui_strings.h:316
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
 #. I18N: message shown when an input device is used but is not associated to any player
-#: src/input/input_manager.cpp:519
+#: src/input/input_manager.cpp:524
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
 #. I18N: ./data/gui/addons_view_dialog.stkgui
 #. I18N: Addons
-#: data/po/gui_strings.h:204
+#: data/po/gui_strings.h:207
 msgid "Install"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:735
+#: data/po/gui_strings.h:738
 msgid "Intermediate"
 msgstr ""
 
 #. I18N: ./data/gui/addons.stkgui
 #. I18N: Section in the addons menu
-#: data/po/gui_strings.h:183
+#: data/po/gui_strings.h:186
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
 #. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:246
+#: data/po/gui_strings.h:249
 msgid "Keep this resolution"
 msgstr ""
 
 #. I18N: short definition for follow-the-leader game mode
-#: src/states_screens/race_setup_screen.cpp:212
+#: src/states_screens/race_setup_screen.cpp:213
 msgid "Keep up with the leader kart but don't overtake it!"
 msgstr ""
 
 #. I18N: ./data/karts/konqi/kart.xml
-#: data/po/gui_strings.h:895
+#: data/po/gui_strings.h:898
 msgid "Konqi"
 msgstr ""
 
 #. I18N: Shown at the end of a race
+#: src/states_screens/minimal_race_gui.cpp:94
 #: src/states_screens/race_gui.cpp:96
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:309
+#: src/modes/linear_world.cpp:317
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -982,7 +989,7 @@ msgid "Leader"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:186
+#: src/states_screens/options_screen_input2.cpp:203
 msgid "Left"
 msgstr ""
 
@@ -992,43 +999,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:496
+#: data/po/gui_strings.h:499
 msgid "Loading news from stkaddons..."
 msgstr ""
 
 #: src/states_screens/arenas_screen.cpp:188
 #: src/states_screens/arenas_screen.cpp:211
 #: src/states_screens/challenges.cpp:96
-#: src/states_screens/kart_selection.cpp:797
-#: src/states_screens/kart_selection.cpp:1711
-#: src/states_screens/kart_selection.cpp:1737
-#: src/states_screens/race_setup_screen.cpp:204
-#: src/states_screens/tracks_screen.cpp:263
-#: src/states_screens/tracks_screen.cpp:287
+#: src/states_screens/kart_selection.cpp:796
+#: src/states_screens/kart_selection.cpp:1713
+#: src/states_screens/kart_selection.cpp:1739
+#: src/states_screens/race_setup_screen.cpp:205
+#: src/states_screens/tracks_screen.cpp:279
+#: src/states_screens/tracks_screen.cpp:303
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:218
+#: src/states_screens/tracks_screen.cpp:229
 msgid "Locked!"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:171
+#: src/states_screens/options_screen_input2.cpp:188
 msgid "Look Back"
 msgstr ""
 
-#: src/items/powerup.cpp:80
+#: src/items/powerup.cpp:81
 msgid "Magic, son. Nothing else in the world smells like that."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:297
+#: data/po/gui_strings.h:300
 msgid "Make your rivals bite dust!"
 msgstr ""
 
 #. I18N: Key binding section
-#: src/states_screens/options_screen_input2.cpp:113
+#: src/states_screens/options_screen_input2.cpp:130
 msgid "Menu Keys"
 msgstr ""
 
@@ -1045,7 +1052,7 @@ msgid "Mouse button %d"
 msgstr ""
 
 #. I18N: ./data/karts/mozilla/kart.xml
-#: data/po/gui_strings.h:898
+#: data/po/gui_strings.h:901
 msgid "Mozilla"
 msgstr ""
 
@@ -1057,25 +1064,25 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:293 data/po/gui_strings.h:344
-#: data/po/gui_strings.h:392 data/po/gui_strings.h:438
+#: data/po/gui_strings.h:296 data/po/gui_strings.h:347
+#: data/po/gui_strings.h:395 data/po/gui_strings.h:441
 msgid "Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:468
+#: data/po/gui_strings.h:471
 msgid "Multiplayer Race"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the audio/video settings submenu
-#: data/po/gui_strings.h:519
+#: data/po/gui_strings.h:522
 msgid "Music"
 msgstr ""
 
 #. I18N: ./data/gui/addons_view_dialog.stkgui
-#: data/po/gui_strings.h:194
+#: data/po/gui_strings.h:197
 msgid "Name:"
 msgstr ""
 
@@ -1094,7 +1101,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:368
 msgid "New fastest lap"
 msgstr ""
 
@@ -1103,7 +1110,7 @@ msgstr ""
 msgid "New game mode '%s' now available"
 msgstr ""
 
-#: src/challenges/challenge.cpp:73
+#: src/challenges/challenge.cpp:74
 #, c-format
 msgid "New kart '%s' now available"
 msgstr ""
@@ -1114,12 +1121,12 @@ msgid "New track '%s' now available"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:165
+#: src/states_screens/options_screen_input2.cpp:182
 msgid "Nitro"
 msgstr ""
 
 #. I18N: ./data/karts/nolok/kart.xml
-#: data/po/gui_strings.h:901
+#: data/po/gui_strings.h:904
 msgid "Nolok"
 msgstr ""
 
@@ -1128,15 +1135,20 @@ msgstr ""
 msgid "Normal Race"
 msgstr ""
 
+#. I18N: ./data/tracks/snowmountain/track.xml
+#: data/po/gui_strings.h:50
+msgid "Northern Resort"
+msgstr ""
+
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:731
+#: data/po/gui_strings.h:734
 msgid "Novice"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: In race setup menu
-#: data/po/gui_strings.h:727
+#: data/po/gui_strings.h:730
 msgid "Number of AI karts"
 msgstr ""
 
@@ -1145,18 +1157,18 @@ msgid "OK"
 msgstr ""
 
 #. I18N: ./data/tracks/mines/track.xml
-#: data/po/gui_strings.h:29
+#: data/po/gui_strings.h:32
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ./data/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:32
+#: data/po/gui_strings.h:35
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: message shown when a player that isn't game master tries to modify options that
 #. I18N: only the game master is allowed to
-#: src/input/input_manager.cpp:544
+#: src/input/input_manager.cpp:549
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
@@ -1164,17 +1176,17 @@ msgstr ""
 #. I18N: Main menu button
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:480 data/po/gui_strings.h:712
+#: data/po/gui_strings.h:483 data/po/gui_strings.h:715
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:363
+#: data/po/gui_strings.h:366
 msgid "Parachute - slows down all karts in a better position!"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:696
+#: data/po/gui_strings.h:699
 msgid "Paused"
 msgstr ""
 
@@ -1183,17 +1195,17 @@ msgid "Penalty time!!"
 msgstr ""
 
 #. I18N: ./data/grandprix/penguinplayground.grandprix
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:865
+#: data/po/gui_strings.h:170 data/po/gui_strings.h:868
 msgid "Penguin Playground"
 msgstr ""
 
 #. I18N: ./data/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:904
+#: data/po/gui_strings.h:907
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:760
+#: data/po/gui_strings.h:763
 msgid "Play all"
 msgstr ""
 
@@ -1207,9 +1219,9 @@ msgstr ""
 #. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: data/po/gui_strings.h:511 data/po/gui_strings.h:558
-#: data/po/gui_strings.h:589 data/po/gui_strings.h:623
-#: data/po/gui_strings.h:654
+#: data/po/gui_strings.h:514 data/po/gui_strings.h:561
+#: data/po/gui_strings.h:592 data/po/gui_strings.h:626
+#: data/po/gui_strings.h:657
 msgid "Players"
 msgstr ""
 
@@ -1219,7 +1231,7 @@ msgid "Please re-configure your key bindings."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:357
+#: data/po/gui_strings.h:360
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight!"
@@ -1229,24 +1241,24 @@ msgstr ""
 #. I18N: When configuring input
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:265 data/po/gui_strings.h:693
+#: data/po/gui_strings.h:268 data/po/gui_strings.h:696
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:685
+#: data/po/gui_strings.h:688
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In key bindings configuration menu
-#: data/po/gui_strings.h:597
+#: data/po/gui_strings.h:600
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In players configuration menu
-#: data/po/gui_strings.h:631
+#: data/po/gui_strings.h:634
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -1261,19 +1273,19 @@ msgid "Problems removing the addon '%s'."
 msgstr ""
 
 #. I18N: ./data/karts/puffy/kart.xml
-#: data/po/gui_strings.h:907
+#: data/po/gui_strings.h:910
 msgid "Puffy"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:492
+#: data/po/gui_strings.h:495
 msgid "Quit"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:464
+#: data/po/gui_strings.h:467
 msgid "Race"
 msgstr ""
 
@@ -1282,7 +1294,7 @@ msgid "Race Results"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:723
+#: data/po/gui_strings.h:726
 msgid "Race Setup"
 msgstr ""
 
@@ -1294,27 +1306,29 @@ msgstr ""
 msgid "Random Arena"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:788
-#: src/states_screens/kart_selection.cpp:1754
+#: src/states_screens/kart_selection.cpp:787
+#: src/states_screens/kart_selection.cpp:1756
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:300
+#: src/states_screens/tracks_screen.cpp:316
 msgid "Random Track"
 msgstr ""
 
+#: src/states_screens/minimal_race_gui.cpp:95
 #: src/states_screens/race_gui.cpp:97
 msgid "Rank"
 msgstr ""
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/minimal_race_gui.cpp:100
 #: src/states_screens/race_gui.cpp:102
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:399
+#: data/po/gui_strings.h:402
 msgid ""
 "Regular Race: all blows allowed, so catch weapons and make clever use of "
 "them!"
@@ -1331,13 +1345,13 @@ msgid "Rename"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:174
+#: src/states_screens/options_screen_input2.cpp:191
 msgid "Rescue"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the graphics settings
-#: data/po/gui_strings.h:670
+#: data/po/gui_strings.h:673
 msgid "Resolution"
 msgstr ""
 
@@ -1347,22 +1361,22 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:708
+#: data/po/gui_strings.h:711
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:189
+#: src/states_screens/options_screen_input2.cpp:206
 msgid "Right"
 msgstr ""
 
 #. I18N: ./data/tracks/scotland/track.xml
-#: data/po/gui_strings.h:38
+#: data/po/gui_strings.h:41
 msgid "Scotland"
 msgstr ""
 
 #. I18N: ./data/tracks/secretgarden/track.xml
-#: data/po/gui_strings.h:41
+#: data/po/gui_strings.h:44
 msgid "Secret Garden"
 msgstr ""
 
@@ -1376,15 +1390,16 @@ msgid "See unlocked features"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:192
+#: src/states_screens/options_screen_input2.cpp:209
 msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:742
+#: data/po/gui_strings.h:745
 msgid "Select a game mode"
 msgstr ""
 
+#: src/states_screens/minimal_race_gui.cpp:101
 #: src/states_screens/race_gui.cpp:103
 msgid "Set!"
 msgstr ""
@@ -1392,60 +1407,55 @@ msgstr ""
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
 #: src/states_screens/dialogs/race_over_dialog.cpp:366
-#: src/states_screens/race_result_gui.cpp:102 data/po/gui_strings.h:704
+#: src/states_screens/race_result_gui.cpp:102 data/po/gui_strings.h:707
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:168
+#: src/states_screens/options_screen_input2.cpp:185
 msgid "Sharp Turn"
 msgstr ""
 
 #. I18N: ./data/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:35
+#: data/po/gui_strings.h:38
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the graphics settings
-#: data/po/gui_strings.h:662
+#: data/po/gui_strings.h:665
 msgid "Skin"
 msgstr ""
 
 #. I18N: ./data/tracks/skyline/track.xml
-#: data/po/gui_strings.h:44
+#: data/po/gui_strings.h:47
 msgid "Skyline"
 msgstr ""
 
 #. I18N: ./data/grandprix/snagdrive.grandprix
-#: data/po/gui_strings.h:170 data/po/gui_strings.h:868
+#: data/po/gui_strings.h:173 data/po/gui_strings.h:871
 msgid "Snag Drive"
 msgstr ""
 
-#. I18N: ./data/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:47
-msgid "Snow Mountain"
-msgstr ""
-
 #. I18N: ./data/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:50
+#: data/po/gui_strings.h:53
 msgid "Snow Peak"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in audio/video settings submenu
-#: data/po/gui_strings.h:531
+#: data/po/gui_strings.h:534
 msgid "Sound Effects"
 msgstr ""
 
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:219
+#: data/po/gui_strings.h:222
 msgid "Standard"
 msgstr ""
 
 #. I18N: ./data/tracks/startrack/track.xml
-#: data/po/gui_strings.h:56
+#: data/po/gui_strings.h:59
 msgid "Star Track"
 msgstr ""
 
@@ -1458,22 +1468,22 @@ msgid "Start Race"
 msgstr ""
 
 #. I18N: ./data/gui/addons_view_dialog.stkgui
-#: data/po/gui_strings.h:211
+#: data/po/gui_strings.h:214
 msgid "Status"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:150
+#: src/states_screens/options_screen_input2.cpp:167
 msgid "Steer Left"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:153
+#: src/states_screens/options_screen_input2.cpp:170
 msgid "Steer Right"
 msgstr ""
 
 #. I18N: ./data/gui/addons.stkgui
-#: data/po/gui_strings.h:179
+#: data/po/gui_strings.h:182
 msgid "SuperTuxKart Addons"
 msgstr ""
 
@@ -1481,8 +1491,8 @@ msgstr ""
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:277 data/po/gui_strings.h:328
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:422
+#: data/po/gui_strings.h:280 data/po/gui_strings.h:331
+#: data/po/gui_strings.h:379 data/po/gui_strings.h:425
 msgid "SuperTuxKart Help"
 msgstr ""
 
@@ -1491,24 +1501,24 @@ msgstr ""
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:546
-#: data/po/gui_strings.h:577 data/po/gui_strings.h:611
-#: data/po/gui_strings.h:642
+#: data/po/gui_strings.h:502 data/po/gui_strings.h:549
+#: data/po/gui_strings.h:580 data/po/gui_strings.h:614
+#: data/po/gui_strings.h:645
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:441
+#: data/po/gui_strings.h:444
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:395
+#: data/po/gui_strings.h:398
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:369
+#: data/po/gui_strings.h:372
 msgid ""
 "Swapper - gift boxes are transformed into bananas and vice versa for a short "
 "time"
@@ -1520,29 +1530,29 @@ msgid "System Language"
 msgstr ""
 
 #. I18N: ./data/grandprix/test.grandprix
-#: data/po/gui_strings.h:173 data/po/gui_strings.h:871
+#: data/po/gui_strings.h:176 data/po/gui_strings.h:874
 msgid "Test"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:317
+#: data/po/gui_strings.h:320
 msgid ""
 "The 'sharp turn' key allows you to do sharp turns and have better control in "
 "tight curves"
 msgstr ""
 
 #. I18N: ./data/tracks/islandtrack/track.xml
-#: data/po/gui_strings.h:20
+#: data/po/gui_strings.h:23
 msgid "The Island"
 msgstr ""
 
-#: src/items/powerup.cpp:64
+#: src/items/powerup.cpp:65
 msgid "The Space Shuttle has landed!"
 msgstr ""
 
 #. I18N: ./data/tracks/stadium/track.xml
-#: data/po/gui_strings.h:53
+#: data/po/gui_strings.h:56
 msgid "The Stadium"
 msgstr ""
 
@@ -1556,7 +1566,7 @@ msgstr ""
 msgid "This Grand Prix is broken!"
 msgstr ""
 
-#: src/states_screens/dialogs/race_over_dialog.cpp:684
+#: src/states_screens/dialogs/race_over_dialog.cpp:686
 msgid "Time"
 msgstr ""
 
@@ -1567,7 +1577,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:403
+#: data/po/gui_strings.h:406
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
@@ -1585,16 +1595,17 @@ msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:348
+#: data/po/gui_strings.h:351
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/tothemoonandback.grandprix
-#: data/po/gui_strings.h:176 data/po/gui_strings.h:874
+#: data/po/gui_strings.h:179 data/po/gui_strings.h:877
 msgid "To the Moon and Back"
 msgstr ""
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
+#: src/states_screens/minimal_race_gui.cpp:98
 #: src/states_screens/race_gui.cpp:100
 #, c-format
 msgid "Top %i"
@@ -1608,7 +1619,7 @@ msgstr ""
 
 #. I18N: ./data/gui/addons.stkgui
 #. I18N: Section in the addons menu
-#: data/po/gui_strings.h:187
+#: data/po/gui_strings.h:190
 msgid "Tracks"
 msgstr ""
 
@@ -1618,17 +1629,17 @@ msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:754
+#: data/po/gui_strings.h:757
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ./data/karts/tux/kart.xml
-#: data/po/gui_strings.h:910
+#: data/po/gui_strings.h:913
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/tracks/tuxtollway/track.xml
-#: data/po/gui_strings.h:59
+#: data/po/gui_strings.h:62
 msgid "Tux Tollway"
 msgstr ""
 
@@ -1637,7 +1648,7 @@ msgid "Uninstall"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:180
+#: src/states_screens/options_screen_input2.cpp:197
 msgid "Up"
 msgstr ""
 
@@ -1650,7 +1661,7 @@ msgid "Updating the list..."
 msgstr ""
 
 #. I18N: ./data/gui/addons_view_dialog.stkgui
-#: data/po/gui_strings.h:200
+#: data/po/gui_strings.h:203
 msgid "Version:"
 msgstr ""
 
@@ -1663,15 +1674,15 @@ msgstr ""
 #. I18N: Music volume in options
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Sound volume in options
-#: data/po/gui_strings.h:527 data/po/gui_strings.h:539
+#: data/po/gui_strings.h:530 data/po/gui_strings.h:542
 msgid "Volume"
 msgstr ""
 
-#: src/modes/linear_world.cpp:819
+#: src/modes/linear_world.cpp:821
 msgid "WRONG WAY!"
 msgstr ""
 
-#: src/states_screens/options_screen_input2.cpp:335
+#: src/states_screens/options_screen_input2.cpp:352
 msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
@@ -1686,14 +1697,14 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:285 data/po/gui_strings.h:336
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:430
+#: data/po/gui_strings.h:288 data/po/gui_strings.h:339
+#: data/po/gui_strings.h:387 data/po/gui_strings.h:433
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:452
+#: data/po/gui_strings.h:455
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
@@ -1704,104 +1715,104 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/karts/wilber/kart.xml
-#: data/po/gui_strings.h:913
+#: data/po/gui_strings.h:916
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/challenges/followtheleader.challenge
-#: data/po/gui_strings.h:89 data/po/gui_strings.h:787
+#: data/po/gui_strings.h:92 data/po/gui_strings.h:790
 msgid "Win Penguin Playground Grand Prix"
 msgstr ""
 
 #. I18N: ./data/challenges/followtheleader.challenge
-#: data/po/gui_strings.h:92 data/po/gui_strings.h:790
+#: data/po/gui_strings.h:95 data/po/gui_strings.h:793
 msgid "Win Penguin Playground Grand Prix with 3 Expert Level AI karts."
 msgstr ""
 
 #. I18N: ./data/challenges/snagdrive.challenge
-#: data/po/gui_strings.h:137 data/po/gui_strings.h:835
+#: data/po/gui_strings.h:140 data/po/gui_strings.h:838
 msgid "Win To the Moon and Back Grand Prix"
 msgstr ""
 
 #. I18N: ./data/challenges/skyline.challenge
-#: data/po/gui_strings.h:134 data/po/gui_strings.h:832
+#: data/po/gui_strings.h:137 data/po/gui_strings.h:835
 msgid ""
 "Win a 1 lap Head to Head in the Secret Garden against 1 Expert level AI kart."
 msgstr ""
 
 #. I18N: ./data/challenges/xr591.challenge
-#: data/po/gui_strings.h:158 data/po/gui_strings.h:856
+#: data/po/gui_strings.h:161 data/po/gui_strings.h:859
 msgid "Win a 3 lap race on Canyon against 4 Expert level AI karts."
 msgstr ""
 
 #. I18N: ./data/challenges/gnu.challenge
-#: data/po/gui_strings.h:104 data/po/gui_strings.h:802
+#: data/po/gui_strings.h:107 data/po/gui_strings.h:805
 msgid "Win a 3 lap race on Fort Magma against 3 Expert level AI karts."
 msgstr ""
 
 #. I18N: ./data/challenges/island.challenge
-#: data/po/gui_strings.h:116 data/po/gui_strings.h:814
+#: data/po/gui_strings.h:119 data/po/gui_strings.h:817
 msgid "Win a 3 lap race on Snow Mountain under 3:05 against 3 medium AI karts."
 msgstr ""
 
 #. I18N: ./data/challenges/canyon.challenge
-#: data/po/gui_strings.h:80 data/po/gui_strings.h:778
+#: data/po/gui_strings.h:83 data/po/gui_strings.h:781
 msgid "Win a 3 lap race on Tux Tollway against 4 Expert level AI karts."
 msgstr ""
 
 #. I18N: ./data/challenges/atworldsend.challenge
-#: data/po/gui_strings.h:74 data/po/gui_strings.h:772
+#: data/po/gui_strings.h:77 data/po/gui_strings.h:775
 msgid "Win a Follow the Leader race with 3 AI karts on a Desert Island."
 msgstr ""
 
 #. I18N: ./data/challenges/lighthouse.challenge
-#: data/po/gui_strings.h:122 data/po/gui_strings.h:820
+#: data/po/gui_strings.h:125 data/po/gui_strings.h:823
 msgid "Win a Follow the Leader race with 5 AI karts on Star track"
 msgstr ""
 
 #. I18N: ./data/challenges/skyline.challenge
-#: data/po/gui_strings.h:131 data/po/gui_strings.h:829
+#: data/po/gui_strings.h:134 data/po/gui_strings.h:832
 msgid "Win a Head to Head in the Secret Garden"
 msgstr ""
 
 #. I18N: ./data/challenges/xr591.challenge
-#: data/po/gui_strings.h:155 data/po/gui_strings.h:853
+#: data/po/gui_strings.h:158 data/po/gui_strings.h:856
 msgid "Win a race on Canyon"
 msgstr ""
 
 #. I18N: ./data/challenges/gnu.challenge
-#: data/po/gui_strings.h:101 data/po/gui_strings.h:799
+#: data/po/gui_strings.h:104 data/po/gui_strings.h:802
 msgid "Win a race on Fort Magma"
 msgstr ""
 
 #. I18N: ./data/challenges/island.challenge
-#: data/po/gui_strings.h:113 data/po/gui_strings.h:811
+#: data/po/gui_strings.h:116 data/po/gui_strings.h:814
 msgid "Win a race on Snow Mountain"
 msgstr ""
 
 #. I18N: ./data/challenges/canyon.challenge
-#: data/po/gui_strings.h:77 data/po/gui_strings.h:775
+#: data/po/gui_strings.h:80 data/po/gui_strings.h:778
 msgid "Win a race on Tux Tollway"
 msgstr ""
 
 #. I18N: ./data/challenges/alltracks.challenge
-#: data/po/gui_strings.h:65 data/po/gui_strings.h:763
+#: data/po/gui_strings.h:68 data/po/gui_strings.h:766
 msgid "Win the At World's End Grand Prix"
 msgstr ""
 
 #. I18N: ./data/challenges/snagdrive.challenge
-#: data/po/gui_strings.h:140 data/po/gui_strings.h:838
+#: data/po/gui_strings.h:143 data/po/gui_strings.h:841
 msgid "Win the To the Moon and Back Grand Prix with 3 Expert Level AI karts."
 msgstr ""
 
 #. I18N: ./data/tracks/xr591/track.xml
-#: data/po/gui_strings.h:62
+#: data/po/gui_strings.h:65
 msgid "XR591"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: data/po/gui_strings.h:238
+#: data/po/gui_strings.h:241
 msgid "Yes"
 msgstr ""
 
@@ -1809,11 +1820,11 @@ msgstr ""
 msgid "You completed the Grand Prix!"
 msgstr ""
 
-#: src/karts/kart.cpp:542 src/karts/kart.cpp:561
+#: src/karts/kart.cpp:568 src/karts/kart.cpp:587
 msgid "You finished the race!"
 msgstr ""
 
-#: src/modes/world.cpp:738
+#: src/modes/world.cpp:752
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -1822,17 +1833,17 @@ msgstr ""
 msgid "You unlocked a new feature!"
 msgstr ""
 
-#: src/karts/kart.cpp:542 src/karts/kart.cpp:561
+#: src/karts/kart.cpp:568 src/karts/kart.cpp:587
 msgid "You won the race!"
 msgstr ""
 
-#: src/config/user_config.cpp:461
+#: src/config/user_config.cpp:465
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
 msgstr ""
 
-#: src/config/user_config.cpp:471
+#: src/config/user_config.cpp:475
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
@@ -1848,6 +1859,7 @@ msgid "[none]"
 msgstr ""
 
 #. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#: src/states_screens/minimal_race_gui.cpp:740
 #: src/states_screens/race_gui.cpp:1133
 msgid "by"
 msgstr ""