diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index c798ac2b2..a588eb1e5 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: 2010-11-20 21:30-0500\n"
+"POT-Creation-Date: 2010-11-30 18:42-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"
@@ -82,7 +82,7 @@ msgid "%1 tests a tractor beam on %0"
 msgstr ""
 
 #. I18N: In the track setup screen (number of laps choice, where %i is the number)
-#: src/states_screens/dialogs/track_info_dialog.cpp:124
+#: src/states_screens/dialogs/track_info_dialog.cpp:125
 #, c-format
 msgid "%i laps"
 msgstr ""
@@ -96,7 +96,7 @@ msgid "%i. %s : survived for %s"
 msgstr ""
 
 #. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:363
+#: src/modes/linear_world.cpp:369
 #, c-format
 msgid "%s by %s"
 msgstr ""
@@ -112,7 +112,7 @@ msgstr ""
 msgid "%s is practicing with a blue, big, spheric yo-yo"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:507
+#: src/states_screens/kart_selection.cpp:508
 #, c-format
 msgid "%s is ready"
 msgstr ""
@@ -134,13 +134,13 @@ msgstr ""
 msgid "%s should play (rubber) darts instead of bowling"
 msgstr ""
 
-#: src/modes/world.cpp:675
+#: src/modes/world.cpp:682
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
 #. I18N: for empty highscores entries
-#: src/states_screens/dialogs/track_info_dialog.cpp:261
+#: src/states_screens/dialogs/track_info_dialog.cpp:262
 msgid "(Empty)"
 msgstr ""
 
@@ -179,7 +179,7 @@ msgid ""
 msgstr ""
 
 #. I18N: Game mode
-#: src/race/race_manager.hpp:150
+#: src/race/race_manager.hpp:149
 msgid "3 Strikes Battle"
 msgstr ""
 
@@ -191,7 +191,7 @@ msgid ""
 "they lose all their lives."
 msgstr ""
 
-#: src/states_screens/dialogs/track_info_dialog.cpp:186
+#: src/states_screens/dialogs/track_info_dialog.cpp:187
 msgid "= Highscores ="
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "Addons"
 msgstr ""
 
 #. I18N: ./data/karts/adiumy/kart.xml
-#: data/po/gui_strings.h:771
+#: data/po/gui_strings.h:750
 msgid "Adiumy"
 msgstr ""
 
@@ -272,7 +272,7 @@ msgid "All blows allowed, so catch weapons and make clever use of them!"
 msgstr ""
 
 #. I18N: ./data/grandprix/alltracks.grandprix
-#: data/po/gui_strings.h:741
+#: data/po/gui_strings.h:732
 msgid "All tracks"
 msgstr ""
 
@@ -300,7 +300,7 @@ msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: shown before deleting an input configuration
-#: src/states_screens/options_screen_input2.cpp:410
+#: src/states_screens/options_screen_input2.cpp:416
 msgid "Are you sure you want to permanently delete this configuration?"
 msgstr ""
 
@@ -323,7 +323,7 @@ msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/atworldsend.grandprix
-#: data/po/gui_strings.h:744
+#: data/po/gui_strings.h:735
 msgid "At World's End"
 msgstr ""
 
@@ -492,7 +492,7 @@ msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/tracks/crescentcrossing/crescentcrossing.challenge
-#: data/po/gui_strings.h:684
+#: data/po/gui_strings.h:678
 msgid "Collect Nitro in Math Class"
 msgstr ""
 
@@ -503,12 +503,12 @@ msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
 #. I18N: ./data/tracks/mines/mines.challenge
-#: data/po/gui_strings.h:714
+#: data/po/gui_strings.h:708
 msgid "Collect fuel for your rocket"
 msgstr ""
 
 #. I18N: ./data/grandprix/tothemoonandback.challenge
-#: data/po/gui_strings.h:666
+#: data/po/gui_strings.h:660
 msgid "Collect the Pharaohs Treasure"
 msgstr ""
 
@@ -522,7 +522,7 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/grandprix/alltracks.challenge
-#: data/po/gui_strings.h:651
+#: data/po/gui_strings.h:645
 msgid "Come first in the At World's End Grand Prix with 3 Expert AI karts."
 msgstr ""
 
@@ -575,6 +575,14 @@ msgstr ""
 msgid "Credits"
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+#. I18N: ./data/gui/mainaddons.stkgui
+#. I18N: Main menu button
+#: data/po/gui_strings.h:315 data/po/gui_strings.h:347
+msgid "DEBUG"
+msgstr ""
+
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: To delete a keyboard configuration
 #: data/po/gui_strings.h:441
@@ -593,7 +601,7 @@ msgstr ""
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:72
-#: src/states_screens/options_screen_input2.cpp:420
+#: src/states_screens/options_screen_input2.cpp:426
 msgid "Disable Device"
 msgstr ""
 
@@ -613,13 +621,13 @@ msgid "Down"
 msgstr ""
 
 #. I18N: ./data/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:774
+#: data/po/gui_strings.h:753
 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:421
+#: src/states_screens/options_screen_input2.cpp:427
 msgid "Enable Device"
 msgstr ""
 
@@ -655,57 +663,57 @@ msgstr ""
 msgid "Feature Unlocked"
 msgstr ""
 
-#: src/modes/linear_world.cpp:293
+#: src/modes/linear_world.cpp:294
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/tracks/hacienda/hacienda.challenge
-#: data/po/gui_strings.h:699
+#: data/po/gui_strings.h:693
 msgid "Finish 3 laps in Farm with 3 easy AI karts in under 2:30 minutes."
 msgstr ""
 
 #. I18N: ./data/tracks/tuxtollway/tollway.challenge
-#: data/po/gui_strings.h:729
+#: data/po/gui_strings.h:723
 msgid ""
 "Finish 3 laps in Lighthouse with 3 Expert AI karts in under 1:30 minutes."
 msgstr ""
 
 #. I18N: ./data/tracks/fortmagma/fortmagma.challenge
-#: data/po/gui_strings.h:693
+#: data/po/gui_strings.h:687
 msgid "Finish 3 laps in mines with 3 expert AI karts in under 3:00 minutes."
 msgstr ""
 
 #. I18N: ./data/tracks/hacienda/hacienda.challenge
-#: data/po/gui_strings.h:696
+#: data/po/gui_strings.h:690
 msgid "Finish Farm in 2:30"
 msgstr ""
 
 #. I18N: ./data/tracks/tuxtollway/tollway.challenge
-#: data/po/gui_strings.h:726
+#: data/po/gui_strings.h:720
 msgid "Finish Lighthouse in 1:30"
 msgstr ""
 
 #. I18N: ./data/tracks/fortmagma/fortmagma.challenge
-#: data/po/gui_strings.h:690
+#: data/po/gui_strings.h:684
 msgid "Finish Mines in 3:00"
 msgstr ""
 
 #. I18N: ./data/grandprix/tothemoonandback.challenge
-#: data/po/gui_strings.h:669
+#: data/po/gui_strings.h:663
 msgid ""
 "Finish with at least 12 nitro points on 3 laps of Shifting Sands in under "
 "2:20 minutes."
 msgstr ""
 
 #. I18N: ./data/tracks/mines/mines.challenge
-#: data/po/gui_strings.h:717
+#: data/po/gui_strings.h:711
 msgid ""
 "Finish with at least 16 nitro points on 2 laps of XR591 in under 2:30 "
 "minutes."
 msgstr ""
 
 #. I18N: ./data/tracks/crescentcrossing/crescentcrossing.challenge
-#: data/po/gui_strings.h:687
+#: data/po/gui_strings.h:681
 msgid ""
 "Finish with at least 6 points of nitro on three laps of Oliver's Math Class "
 "in under 52 seconds."
@@ -729,17 +737,17 @@ msgid ""
 msgstr ""
 
 #. I18N: Game mode
-#: src/race/race_manager.hpp:148
+#: src/race/race_manager.hpp:147
 msgid "Follow the Leader"
 msgstr ""
 
 #. I18N: ./data/tracks/lighthouse/lighthouse.challenge
-#: data/po/gui_strings.h:708
+#: data/po/gui_strings.h:702
 msgid "Follow the Leader around the Solar System"
 msgstr ""
 
 #. I18N: ./data/grandprix/atworldsend.challenge
-#: data/po/gui_strings.h:654
+#: data/po/gui_strings.h:648
 msgid "Follow the Leader on a Desert Island"
 msgstr ""
 
@@ -811,7 +819,7 @@ msgid "Geronimo!!!"
 msgstr ""
 
 #. I18N: ./data/karts/gnu/kart.xml
-#: data/po/gui_strings.h:777
+#: data/po/gui_strings.h:756
 msgid "Gnu"
 msgstr ""
 
@@ -820,7 +828,7 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/karts/gooey/kart.xml
-#: data/po/gui_strings.h:780
+#: data/po/gui_strings.h:759
 msgid "Gooey"
 msgstr ""
 
@@ -864,7 +872,7 @@ msgid "Help"
 msgstr ""
 
 #. I18N: ./data/karts/hexley/kart.xml
-#: data/po/gui_strings.h:783
+#: data/po/gui_strings.h:762
 msgid "Hexley"
 msgstr ""
 
@@ -887,7 +895,7 @@ msgid ""
 msgstr ""
 
 #. I18N: message shown when an input device is used but is not associated to any player
-#: src/input/input_manager.cpp:477
+#: src/input/input_manager.cpp:492
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
@@ -924,7 +932,7 @@ msgid "Keep up with the leader kart but don't overtake it!"
 msgstr ""
 
 #. I18N: ./data/karts/konqi/kart.xml
-#: data/po/gui_strings.h:786
+#: data/po/gui_strings.h:765
 msgid "Konqi"
 msgstr ""
 
@@ -933,6 +941,11 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
+#: src/modes/linear_world.cpp:311
+#, c-format
+msgid "Lap %i"
+msgstr ""
+
 #: src/modes/follow_the_leader.cpp:190
 msgid "Leader"
 msgstr ""
@@ -942,7 +955,7 @@ msgstr ""
 msgid "Left"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1057
+#: src/guiengine/engine.cpp:1061
 msgid "Loading"
 msgstr ""
 
@@ -955,8 +968,8 @@ msgstr ""
 #: src/states_screens/arenas_screen.cpp:188
 #: src/states_screens/arenas_screen.cpp:211
 #: src/states_screens/challenges.cpp:95
-#: src/states_screens/kart_selection.cpp:1644
-#: src/states_screens/kart_selection.cpp:1689
+#: src/states_screens/kart_selection.cpp:1639
+#: src/states_screens/kart_selection.cpp:1684
 #: src/states_screens/race_setup_screen.cpp:212
 #: src/states_screens/tracks_screen.cpp:261
 #: src/states_screens/tracks_screen.cpp:285
@@ -1000,7 +1013,7 @@ msgid "Mouse button %d"
 msgstr ""
 
 #. I18N: ./data/karts/mozilla/kart.xml
-#: data/po/gui_strings.h:789
+#: data/po/gui_strings.h:768
 msgid "Mozilla"
 msgstr ""
 
@@ -1043,7 +1056,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:357
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -1068,12 +1081,12 @@ msgid "Nitro"
 msgstr ""
 
 #. I18N: ./data/karts/nolok/kart.xml
-#: data/po/gui_strings.h:792
+#: data/po/gui_strings.h:771
 msgid "Nolok"
 msgstr ""
 
 #. I18N: Game mode
-#: src/race/race_manager.hpp:144
+#: src/race/race_manager.hpp:143
 msgid "Normal Race"
 msgstr ""
 
@@ -1089,9 +1102,13 @@ msgstr ""
 msgid "Number of AI karts"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:57
+msgid "OK"
+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:502
+#: src/input/input_manager.cpp:517
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
@@ -1121,18 +1138,18 @@ msgid "Penalty time!!"
 msgstr ""
 
 #. I18N: ./data/grandprix/penguinplayground.grandprix
-#: data/po/gui_strings.h:759
+#: data/po/gui_strings.h:738
 msgid "Penguin Playground"
 msgstr ""
 
 #. I18N: ./data/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:795
+#: data/po/gui_strings.h:774
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: In kart selection screen (Will read like 'Player 1 (foobartech gamepad)')
-#: src/states_screens/kart_selection.cpp:260
-#: src/states_screens/kart_selection.cpp:410
+#: src/states_screens/kart_selection.cpp:259
+#: src/states_screens/kart_selection.cpp:409
 #, c-format
 msgid "Player %i (%s)"
 msgstr ""
@@ -1154,7 +1171,7 @@ msgid "Players"
 msgstr ""
 
 #. I18N: shown when config file is too old
-#: src/input/device_manager.cpp:387
+#: src/input/device_manager.cpp:399
 msgid "Please re-configure your key bindings."
 msgstr ""
 
@@ -1191,7 +1208,7 @@ msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
 #. I18N: ./data/karts/puffy/kart.xml
-#: data/po/gui_strings.h:798
+#: data/po/gui_strings.h:777
 msgid "Puffy"
 msgstr ""
 
@@ -1229,7 +1246,7 @@ msgid "Random Arena"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:781
-#: src/states_screens/kart_selection.cpp:1703
+#: src/states_screens/kart_selection.cpp:1698
 msgid "Random Kart"
 msgstr ""
 
@@ -1333,7 +1350,7 @@ msgid "Skin"
 msgstr ""
 
 #. I18N: ./data/grandprix/snagdrive.grandprix
-#: data/po/gui_strings.h:762
+#: data/po/gui_strings.h:741
 msgid "Snag Drive"
 msgstr ""
 
@@ -1353,7 +1370,7 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#: src/states_screens/dialogs/track_info_dialog.cpp:140
+#: src/states_screens/dialogs/track_info_dialog.cpp:141
 msgid "Start Race"
 msgstr ""
 
@@ -1411,7 +1428,7 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/grandprix/test.grandprix
-#: data/po/gui_strings.h:765
+#: data/po/gui_strings.h:744
 msgid "Test"
 msgstr ""
 
@@ -1442,7 +1459,7 @@ msgid "Time"
 msgstr ""
 
 #. I18N: Game mode
-#: src/race/race_manager.hpp:146
+#: src/race/race_manager.hpp:145
 msgid "Time Trial"
 msgstr ""
 
@@ -1471,7 +1488,7 @@ msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/tothemoonandback.grandprix
-#: data/po/gui_strings.h:768
+#: data/po/gui_strings.h:747
 msgid "To the Moon and Back"
 msgstr ""
 
@@ -1496,7 +1513,7 @@ msgid "Tracks"
 msgstr ""
 
 #. I18N: ./data/karts/tux/kart.xml
-#: data/po/gui_strings.h:801
+#: data/po/gui_strings.h:780
 msgid "Tux"
 msgstr ""
 
@@ -1540,10 +1557,17 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
-#: src/modes/linear_world.cpp:815
+#: src/modes/linear_world.cpp:821
 msgid "WRONG WAY!"
 msgstr ""
 
+#: src/states_screens/options_screen_input2.cpp:335
+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 "
+"working."
+msgstr ""
+
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help2.stkgui
@@ -1570,93 +1594,93 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/karts/wilber/kart.xml
-#: data/po/gui_strings.h:804
+#: data/po/gui_strings.h:783
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/followtheleader.challenge
-#: data/po/gui_strings.h:642
+#: data/po/gui_strings.h:636
 msgid "Win Penguin Playground Grand Prix"
 msgstr ""
 
 #. I18N: ./data/followtheleader.challenge
-#: data/po/gui_strings.h:645
+#: data/po/gui_strings.h:639
 msgid "Win Penguin Playground Grand Prix with 3 Expert Level AI karts."
 msgstr ""
 
 #. I18N: ./data/grandprix/snagdrive.challenge
-#: data/po/gui_strings.h:660
+#: data/po/gui_strings.h:654
 msgid "Win To the Moon and Back Grand Prix"
 msgstr ""
 
 #. I18N: ./data/tracks/skyline/skyline.challenge
-#: data/po/gui_strings.h:723
+#: data/po/gui_strings.h:717
 msgid ""
 "Win a 1 lap Head to Head in the Secret Garden against 1 Expert level AI kart."
 msgstr ""
 
 #. I18N: ./data/tracks/xr591/xr591.challenge
-#: data/po/gui_strings.h:735
+#: data/po/gui_strings.h:729
 msgid "Win a 3 lap race on Canyon against 4 Expert level AI karts."
 msgstr ""
 
 #. I18N: ./data/karts/gnu/gnu.challenge
-#: data/po/gui_strings.h:675
+#: data/po/gui_strings.h:669
 msgid "Win a 3 lap race on Fort Magma against 3 Expert level AI karts."
 msgstr ""
 
 #. I18N: ./data/tracks/islandtrack/island.challenge
-#: data/po/gui_strings.h:705
+#: data/po/gui_strings.h:699
 msgid "Win a 3 lap race on Snow Mountain under 3:05 against 3 medium AI karts."
 msgstr ""
 
 #. I18N: ./data/tracks/canyon/canyon.challenge
-#: data/po/gui_strings.h:681
+#: data/po/gui_strings.h:675
 msgid "Win a 3 lap race on Tux Tollway against 4 Expert level AI karts."
 msgstr ""
 
 #. I18N: ./data/grandprix/atworldsend.challenge
-#: data/po/gui_strings.h:657
+#: data/po/gui_strings.h:651
 msgid "Win a Follow the Leader race with 3 AI karts on a Desert Island."
 msgstr ""
 
 #. I18N: ./data/tracks/lighthouse/lighthouse.challenge
-#: data/po/gui_strings.h:711
+#: data/po/gui_strings.h:705
 msgid "Win a Follow the Leader race with 5 AI karts on Star track"
 msgstr ""
 
 #. I18N: ./data/tracks/skyline/skyline.challenge
-#: data/po/gui_strings.h:720
+#: data/po/gui_strings.h:714
 msgid "Win a Head to Head in the Secret Garden"
 msgstr ""
 
 #. I18N: ./data/tracks/xr591/xr591.challenge
-#: data/po/gui_strings.h:732
+#: data/po/gui_strings.h:726
 msgid "Win a race on Canyon"
 msgstr ""
 
 #. I18N: ./data/karts/gnu/gnu.challenge
-#: data/po/gui_strings.h:672
+#: data/po/gui_strings.h:666
 msgid "Win a race on Fort Magma"
 msgstr ""
 
 #. I18N: ./data/tracks/islandtrack/island.challenge
-#: data/po/gui_strings.h:702
+#: data/po/gui_strings.h:696
 msgid "Win a race on Snow Mountain"
 msgstr ""
 
 #. I18N: ./data/tracks/canyon/canyon.challenge
-#: data/po/gui_strings.h:678
+#: data/po/gui_strings.h:672
 msgid "Win a race on Tux Tollway"
 msgstr ""
 
 #. I18N: ./data/grandprix/alltracks.challenge
-#: data/po/gui_strings.h:648
+#: data/po/gui_strings.h:642
 msgid "Win the At World's End Grand Prix"
 msgstr ""
 
 #. I18N: ./data/grandprix/snagdrive.challenge
-#: data/po/gui_strings.h:663
+#: data/po/gui_strings.h:657
 msgid "Win the To the Moon and Back Grand Prix with 3 Expert Level AI karts."
 msgstr ""
 
@@ -1670,11 +1694,11 @@ msgstr ""
 msgid "You completed the Grand Prix!"
 msgstr ""
 
-#: src/karts/kart.cpp:531 src/karts/kart.cpp:550
+#: src/karts/kart.cpp:523 src/karts/kart.cpp:542
 msgid "You finished the race!"
 msgstr ""
 
-#: src/modes/world.cpp:671
+#: src/modes/world.cpp:678
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -1683,23 +1707,23 @@ msgstr ""
 msgid "You unlocked a new feature!"
 msgstr ""
 
-#: src/karts/kart.cpp:531 src/karts/kart.cpp:550
+#: src/karts/kart.cpp:523 src/karts/kart.cpp:542
 msgid "You won the race!"
 msgstr ""
 
-#: src/config/user_config.cpp:423
+#: src/config/user_config.cpp:424
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
 msgstr ""
 
-#: src/config/user_config.cpp:433
+#: src/config/user_config.cpp:434
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
 msgstr ""
 
-#: src/input/device_manager.cpp:389
+#: src/input/device_manager.cpp:401
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""