diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index 6cfb77147..9c8e4218e 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-08-20 17:17-0400\n"
+"POT-Creation-Date: 2011-09-02 19:31-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"
@@ -29,32 +29,34 @@ msgid "%0 bites %1's bait"
 msgstr ""
 
 #. I18N: shown when hit by cake. %1 is the attacker, %0 is the victim.
-#: src/items/flyable.cpp:56
+#: src/items/cake.cpp:149
 msgid "%0 eats too much of %1's cake"
 msgstr ""
 
 #. I18N: shown when a player receives a plunger in his face
-#: src/items/plunger.cpp:47
+#: src/items/plunger.cpp:129
 msgid "%0 gets a fancy mask from %1"
 msgstr ""
 
-#. I18N: shown when hit by bowling ball. %1 is the attacker, %0 is the victim.
-#: src/items/flyable.cpp:80
+#. I18N: shown when hit by bowling ball. %1 is the attacker, %0 is
+#. the victim.
+#: src/items/bowling.cpp:115
 msgid "%0 is bowled over by %1"
 msgstr ""
 
 #. I18N: shown when hit by cake. %1 is the attacker, %0 is the victim.
-#: src/items/flyable.cpp:58
+#: src/items/cake.cpp:151
 msgid "%0 is dubious of %1's cooking skills"
 msgstr ""
 
 #. I18N: shown when hit by cake. %1 is the attacker, %0 is the victim.
-#: src/items/flyable.cpp:60
+#: src/items/cake.cpp:153
 msgid "%0 should not play with %1's lunch"
 msgstr ""
 
-#. I18N: shown when hit by bowling ball. %1 is the attacker, %0 is the victim.
-#: src/items/flyable.cpp:76
+#. I18N: shown when hit by bowling ball. %1 is the attacker, %0 is
+#. the victim.
+#: src/items/bowling.cpp:109
 msgid "%0 will not go bowling with %1 again"
 msgstr ""
 
@@ -64,12 +66,13 @@ msgid "%1 latches onto %0 for a free ride"
 msgstr ""
 
 #. I18N: shown when a player receives a plunger in his face
-#: src/items/plunger.cpp:49
+#: src/items/plunger.cpp:131
 msgid "%1 merges %0's face with a plunger"
 msgstr ""
 
-#. I18N: shown when hit by bowling ball. %1 is the attacker, %0 is the victim.
-#: src/items/flyable.cpp:78
+#. I18N: shown when hit by bowling ball. %1 is the attacker, %0 is
+#. the victim.
+#: src/items/bowling.cpp:112
 msgid "%1 strikes %0"
 msgstr ""
 
@@ -92,6 +95,14 @@ msgstr ""
 msgid "%i. %s : survived for %s"
 msgstr ""
 
+#. I18N: as in: The Old Island by Johannes Sjolund
+#: src/states_screens/addons_screen.cpp:191
+#, c-format
+msgid ""
+"%s\n"
+"by %s"
+msgstr ""
+
 #: src/states_screens/dialogs/addons_loading.cpp:153
 #: src/states_screens/dialogs/addons_loading.cpp:157
 #, c-format
@@ -105,7 +116,7 @@ msgstr ""
 
 #. I18N: as in "fastest lap: 60 seconds by Wilber"
 #. I18N: as in: The Old Island by Johannes Sjolund
-#: src/modes/linear_world.cpp:309 src/states_screens/addons_screen.cpp:175
+#: src/modes/linear_world.cpp:309 src/states_screens/addons_screen.cpp:182
 #, c-format
 msgid "%s by %s"
 msgstr ""
@@ -115,8 +126,15 @@ msgstr ""
 msgid "%s is a mighty pirate!"
 msgstr ""
 
+#. I18N: shown when a player is hit by a rubber ball. %1 is the
+#. attacker, %0 is the victim.
+#: src/items/rubber_ball.cpp:231
+#, c-format
+msgid "%s is being bounced around."
+msgstr ""
+
 #. I18N: shown when hit by own bowling ball. %s is the kart.
-#: src/items/flyable.cpp:96
+#: src/items/bowling.cpp:125
 #, c-format
 msgid "%s is practicing with a blue, big, spheric yo-yo"
 msgstr ""
@@ -127,7 +145,7 @@ msgid "%s is ready"
 msgstr ""
 
 #. I18N: shown when hit by own bowling ball. %s is the kart.
-#: src/items/flyable.cpp:98
+#: src/items/bowling.cpp:127
 #, c-format
 msgid "%s is the world master of the boomerang ball"
 msgstr ""
@@ -138,7 +156,7 @@ msgid "%s pays the next round of grog!"
 msgstr ""
 
 #. I18N: shown when hit by own bowling ball. %s is the kart.
-#: src/items/flyable.cpp:100
+#: src/items/bowling.cpp:129
 #, c-format
 msgid "%s should play (rubber) darts instead of bowling"
 msgstr ""
@@ -154,19 +172,23 @@ msgid "(Empty)"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:421
+#: data/po/gui_strings.h:430
 msgid "(network play is not yet available)"
 msgstr ""
 
+#: src/states_screens/options_screen_input2.cpp:304
+msgid "* A blue item means a conflict with another configuration"
+msgstr ""
+
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:310
+#: data/po/gui_strings.h:313
 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:396
+#: data/po/gui_strings.h:405
 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 "
@@ -175,7 +197,7 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:529
+#: data/po/gui_strings.h:538
 msgid ""
 "* Which config to use will be inferred from which 'fire' key is pressed to "
 "join the game."
@@ -188,7 +210,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:392
+#: data/po/gui_strings.h:401
 msgid ""
 "3 Strikes Battle: only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -203,13 +225,13 @@ msgid "A wizard did it!"
 msgstr ""
 
 #: src/states_screens/dialogs/race_over_dialog.cpp:424
-#: src/states_screens/race_result_gui.cpp:101
+#: src/states_screens/race_result_gui.cpp:102
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:461
+#: data/po/gui_strings.h:470
 msgid "About"
 msgstr ""
 
@@ -225,13 +247,13 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In players configuration menu
-#: data/po/gui_strings.h:544
+#: data/po/gui_strings.h:553
 msgid "Add Player"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:526
+#: data/po/gui_strings.h:535
 msgid "Add a device"
 msgstr ""
 
@@ -242,7 +264,7 @@ msgstr ""
 #. I18N: track group
 #: src/states_screens/arenas_screen.cpp:72
 #: src/states_screens/kart_selection.cpp:916
-#: src/states_screens/tracks_screen.cpp:195 data/po/gui_strings.h:218
+#: src/states_screens/tracks_screen.cpp:195 data/po/gui_strings.h:221
 msgid "Add-Ons"
 msgstr ""
 
@@ -252,12 +274,12 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:449
+#: data/po/gui_strings.h:458
 msgid "Addons"
 msgstr ""
 
 #. I18N: ./data/karts/adiumy/kart.xml
-#: data/po/gui_strings.h:787
+#: data/po/gui_strings.h:796
 msgid "Adiumy"
 msgstr ""
 
@@ -270,7 +292,7 @@ msgstr ""
 #: src/states_screens/arenas_screen.cpp:64
 #: src/states_screens/kart_selection.cpp:908
 #: src/states_screens/options_screen_video.cpp:293
-#: src/states_screens/tracks_screen.cpp:187 data/po/gui_strings.h:222
+#: src/states_screens/tracks_screen.cpp:187 data/po/gui_strings.h:225
 msgid "All"
 msgstr ""
 
@@ -278,8 +300,8 @@ msgstr ""
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
 #. I18N: ./data/grandprix/alltracks.grandprix
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:666
-#: data/po/gui_strings.h:772
+#: data/po/gui_strings.h:170 data/po/gui_strings.h:675
+#: data/po/gui_strings.h:781
 msgid "All Tracks"
 msgstr ""
 
@@ -289,18 +311,18 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:563
+#: data/po/gui_strings.h:572
 msgid "Allow STK to connect to the Internet"
 msgstr ""
 
 #. I18N: ./data/tracks/jungle/track.xml
-#: data/po/gui_strings.h:26
+#: data/po/gui_strings.h:29
 msgid "Amazonian Journey"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:351
-msgid "Anchor - slows down greatly the kart in the first position"
+#: data/po/gui_strings.h:354
+msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: in graphical options
@@ -323,12 +345,12 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings menu
-#: data/po/gui_strings.h:598
+#: data/po/gui_strings.h:607
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: shown before deleting an input configuration
-#: src/states_screens/options_screen_input2.cpp:445
+#: src/states_screens/options_screen_input2.cpp:466
 msgid "Are you sure you want to permanently delete this configuration?"
 msgstr ""
 
@@ -336,12 +358,12 @@ msgstr ""
 #. I18N: Section in the addons menu
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: Section in arena tracks selection screen
-#: data/po/gui_strings.h:206 data/po/gui_strings.h:210
+#: data/po/gui_strings.h:209 data/po/gui_strings.h:213
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ./data/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:29
+#: data/po/gui_strings.h:32
 msgid "Around the Lighthouse"
 msgstr ""
 
@@ -353,12 +375,12 @@ msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:605
+#: data/po/gui_strings.h:614
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/atworldsend.grandprix
-#: data/po/gui_strings.h:170 data/po/gui_strings.h:775
+#: data/po/gui_strings.h:173 data/po/gui_strings.h:784
 msgid "At World's End"
 msgstr ""
 
@@ -368,13 +390,13 @@ msgstr ""
 #: src/states_screens/options_screen_input2.cpp:71
 #: src/states_screens/options_screen_players.cpp:68
 #: src/states_screens/options_screen_ui.cpp:113
-#: src/states_screens/options_screen_video.cpp:81 data/po/gui_strings.h:472
+#: src/states_screens/options_screen_video.cpp:81 data/po/gui_strings.h:481
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:294
+#: data/po/gui_strings.h:297
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -386,19 +408,19 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Addons
-#: src/states_screens/dialogs/addons_loading.cpp:226 data/po/gui_strings.h:187
+#: src/states_screens/dialogs/addons_loading.cpp:226 data/po/gui_strings.h:190
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:616
+#: data/po/gui_strings.h:625
 msgid "Back to Race"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:511
+#: data/po/gui_strings.h:520
 msgid "Back to device list"
 msgstr ""
 
@@ -406,7 +428,7 @@ msgstr ""
 msgid "Back to the main menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:114
+#: src/states_screens/race_result_gui.cpp:117
 msgid "Back to the menu"
 msgstr ""
 
@@ -414,13 +436,18 @@ msgstr ""
 msgid "Banana? Box? Banana? Box? Banana? Box?"
 msgstr ""
 
+#. I18N: ./data/tracks/battleisland/track.xml
+#: data/po/gui_strings.h:2
+msgid "Battle Island"
+msgstr ""
+
 #. I18N: ./data/karts/beagle/kart.xml
-#: data/po/gui_strings.h:790
+#: data/po/gui_strings.h:799
 msgid "Beagle"
 msgstr ""
 
 #. I18N: ./data/karts/beastie/kart.xml
-#: data/po/gui_strings.h:793
+#: data/po/gui_strings.h:802
 msgid "Beastie"
 msgstr ""
 
@@ -430,12 +457,12 @@ msgid "Better luck next time!"
 msgstr ""
 
 #. I18N: ./data/tracks/farm/track.xml
-#: data/po/gui_strings.h:14
+#: data/po/gui_strings.h:17
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:345
+#: data/po/gui_strings.h:348
 msgid ""
 "Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
 "backwards."
@@ -447,17 +474,17 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:336
-msgid "BubbleGum - leave a sticky pink puddle behind you"
+#: data/po/gui_strings.h:339
+msgid "BubbleGum - leave a sticky pink puddle behind you."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:339
+#: data/po/gui_strings.h:342
 msgid ""
-"Cake - thrown at the closest rival, best on short ranges and long straights"
+"Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/network_http.cpp:419 src/addons/news_manager.cpp:142
+#: src/addons/network_http.cpp:421 src/addons/news_manager.cpp:142
 msgid "Can't access stkaddons server..."
 msgstr ""
 
@@ -476,7 +503,7 @@ msgstr ""
 #: src/states_screens/dialogs/add_device_dialog.cpp:81
 #: src/states_screens/dialogs/addons_loading.cpp:197
 #: src/states_screens/dialogs/player_info_dialog.cpp:100
-#: data/po/gui_strings.h:234 data/po/gui_strings.h:242
+#: data/po/gui_strings.h:237 data/po/gui_strings.h:245
 msgid "Cancel"
 msgstr ""
 
@@ -496,52 +523,52 @@ msgid "Cannot add a player with this name."
 msgstr ""
 
 #. I18N: ./data/tracks/cave/track.xml
-#: data/po/gui_strings.h:5
+#: data/po/gui_strings.h:8
 msgid "Cave X"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:445
+#: data/po/gui_strings.h:454
 msgid "Challenges"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:226
+#: data/po/gui_strings.h:229
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:433
+#: data/po/gui_strings.h:442
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/challenges/crescentcrossing.challenge
-#: data/po/gui_strings.h:89 data/po/gui_strings.h:694
+#: data/po/gui_strings.h:92 data/po/gui_strings.h:703
 msgid "Collect Nitro in Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:290
+#: data/po/gui_strings.h:293
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
 #. I18N: ./data/challenges/mines.challenge
-#: data/po/gui_strings.h:131 data/po/gui_strings.h:736
+#: data/po/gui_strings.h:134 data/po/gui_strings.h:745
 msgid "Collect fuel for your rocket"
 msgstr ""
 
 #. I18N: ./data/challenges/tothemoonandback.challenge
-#: data/po/gui_strings.h:155 data/po/gui_strings.h:760
+#: data/po/gui_strings.h:158 data/po/gui_strings.h:769
 msgid "Collect the Pharaohs Treasure"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:298
+#: data/po/gui_strings.h:301
 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 "
@@ -549,7 +576,7 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/challenges/alltracks.challenge
-#: data/po/gui_strings.h:74 data/po/gui_strings.h:679
+#: data/po/gui_strings.h:77 data/po/gui_strings.h:688
 msgid "Come first in the At World's End Grand Prix with 3 Expert AI karts."
 msgstr ""
 
@@ -571,8 +598,8 @@ 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:98 data/po/gui_strings.h:257
-#: data/po/gui_strings.h:260 data/po/gui_strings.h:263
+#: src/states_screens/race_result_gui.cpp:99 data/po/gui_strings.h:260
+#: data/po/gui_strings.h:263 data/po/gui_strings.h:266
 msgid "Continue"
 msgstr ""
 
@@ -587,36 +614,36 @@ msgstr ""
 #: src/states_screens/options_screen_audio.cpp:66
 #: src/states_screens/options_screen_players.cpp:70
 #: src/states_screens/options_screen_ui.cpp:115
-#: src/states_screens/options_screen_video.cpp:84 data/po/gui_strings.h:503
-#: data/po/gui_strings.h:518
+#: src/states_screens/options_screen_video.cpp:84 data/po/gui_strings.h:512
+#: data/po/gui_strings.h:527
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/tracks/canyon/track.xml
-#: data/po/gui_strings.h:2
+#: data/po/gui_strings.h:5
 msgid "Coyote Canyon"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:246
+#: data/po/gui_strings.h:249
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/tracks/crescentcrossing/track.xml
-#: data/po/gui_strings.h:11
+#: data/po/gui_strings.h:14
 msgid "Crescent Crossing"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: To delete a keyboard configuration
-#: src/states_screens/options_screen_input2.cpp:93 data/po/gui_strings.h:507
+#: src/states_screens/options_screen_input2.cpp:93 data/po/gui_strings.h:516
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:80
-#: src/states_screens/options_screen_input2.cpp:456
+#: src/states_screens/options_screen_input2.cpp:477
 msgid "Disable Device"
 msgstr ""
 
@@ -627,7 +654,7 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:559
+#: data/po/gui_strings.h:568
 msgid "Display FPS"
 msgstr ""
 
@@ -655,26 +682,26 @@ msgid "Download failed."
 msgstr ""
 
 #. I18N: ./data/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:796
+#: data/po/gui_strings.h:805
 msgid "Elephpant"
 msgstr ""
 
 #. I18N: ./data/karts/emule/kart.xml
-#: data/po/gui_strings.h:799
+#: data/po/gui_strings.h:808
 msgid "Emule"
 msgstr ""
 
 #. I18N: button to enable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:82
-#: src/states_screens/options_screen_input2.cpp:457
+#: src/states_screens/options_screen_input2.cpp:478
 msgid "Enable Device"
 msgstr ""
 
 #. I18N: in the graphical options tooltip; indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Next to checkbox in settings menu
-#: src/states_screens/options_screen_video.cpp:289 data/po/gui_strings.h:480
-#: data/po/gui_strings.h:492
+#: src/states_screens/options_screen_video.cpp:289 data/po/gui_strings.h:489
+#: data/po/gui_strings.h:501
 msgid "Enabled"
 msgstr ""
 
@@ -684,7 +711,7 @@ msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:250
+#: data/po/gui_strings.h:253
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -696,13 +723,13 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:636
+#: data/po/gui_strings.h:645
 msgid "Exit Race"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:655
+#: data/po/gui_strings.h:664
 msgid "Expert"
 msgstr ""
 
@@ -715,52 +742,52 @@ msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/challenges/hacienda.challenge
-#: data/po/gui_strings.h:116 data/po/gui_strings.h:721
+#: data/po/gui_strings.h:119 data/po/gui_strings.h:730
 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:152 data/po/gui_strings.h:757
+#: data/po/gui_strings.h:155 data/po/gui_strings.h:766
 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:104 data/po/gui_strings.h:709
+#: data/po/gui_strings.h:107 data/po/gui_strings.h:718
 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:113 data/po/gui_strings.h:718
+#: data/po/gui_strings.h:116 data/po/gui_strings.h:727
 msgid "Finish Farm in 2:30"
 msgstr ""
 
 #. I18N: ./data/challenges/tollway.challenge
-#: data/po/gui_strings.h:149 data/po/gui_strings.h:754
+#: data/po/gui_strings.h:152 data/po/gui_strings.h:763
 msgid "Finish Lighthouse in 1:30"
 msgstr ""
 
 #. I18N: ./data/challenges/fortmagma.challenge
-#: data/po/gui_strings.h:101 data/po/gui_strings.h:706
+#: data/po/gui_strings.h:104 data/po/gui_strings.h:715
 msgid "Finish Mines in 3:00"
 msgstr ""
 
 #. I18N: ./data/challenges/crescentcrossing.challenge
-#: data/po/gui_strings.h:92 data/po/gui_strings.h:697
+#: data/po/gui_strings.h:95 data/po/gui_strings.h:706
 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:158 data/po/gui_strings.h:763
+#: data/po/gui_strings.h:161 data/po/gui_strings.h:772
 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:134 data/po/gui_strings.h:739
+#: data/po/gui_strings.h:137 data/po/gui_strings.h:748
 msgid ""
 "Finish with at least 16 nitro points on 2 laps of XR591 in under 2:30 "
 "minutes."
@@ -773,7 +800,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:425
+#: data/po/gui_strings.h:434
 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 "
@@ -789,18 +816,18 @@ msgid "Follow the Leader"
 msgstr ""
 
 #. I18N: ./data/challenges/lighthouse.challenge
-#: data/po/gui_strings.h:125 data/po/gui_strings.h:730
+#: data/po/gui_strings.h:128 data/po/gui_strings.h:739
 msgid "Follow the Leader around the Solar System"
 msgstr ""
 
 #. I18N: ./data/challenges/atworldsend.challenge
-#: data/po/gui_strings.h:77 data/po/gui_strings.h:682
+#: data/po/gui_strings.h:80 data/po/gui_strings.h:691
 msgid "Follow the Leader on a Desert Island"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
+#: data/po/gui_strings.h:397
 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 "
@@ -808,13 +835,13 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:17
+#: data/po/gui_strings.h:20
 msgid "Fort Magma"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:594
+#: data/po/gui_strings.h:603
 msgid "Fullscreen"
 msgstr ""
 
@@ -836,8 +863,8 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:278 data/po/gui_strings.h:325
-#: data/po/gui_strings.h:369 data/po/gui_strings.h:411
+#: data/po/gui_strings.h:281 data/po/gui_strings.h:328
+#: data/po/gui_strings.h:378 data/po/gui_strings.h:420
 msgid "Game Modes"
 msgstr ""
 
@@ -861,8 +888,8 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:270 data/po/gui_strings.h:317
-#: data/po/gui_strings.h:361 data/po/gui_strings.h:403
+#: data/po/gui_strings.h:273 data/po/gui_strings.h:320
+#: data/po/gui_strings.h:370 data/po/gui_strings.h:412
 msgid "General"
 msgstr ""
 
@@ -871,7 +898,7 @@ msgid "Geronimo!!!"
 msgstr ""
 
 #. I18N: ./data/karts/gnu/kart.xml
-#: data/po/gui_strings.h:802
+#: data/po/gui_strings.h:811
 msgid "Gnu"
 msgstr ""
 
@@ -879,20 +906,15 @@ msgstr ""
 msgid "Go!"
 msgstr ""
 
-#. I18N: ./data/karts/gooey/kart.xml
-#: data/po/gui_strings.h:805
-msgid "Gooey"
-msgstr ""
-
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
-#: data/po/gui_strings.h:662
+#: data/po/gui_strings.h:671
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the graphics settings
-#: data/po/gui_strings.h:578
+#: data/po/gui_strings.h:587
 msgid "Graphical Effects Level"
 msgstr ""
 
@@ -902,7 +924,7 @@ msgstr ""
 #: src/states_screens/options_screen_input.cpp:129
 #: src/states_screens/options_screen_input2.cpp:70
 #: src/states_screens/options_screen_players.cpp:67
-#: src/states_screens/options_screen_ui.cpp:112 data/po/gui_strings.h:574
+#: src/states_screens/options_screen_ui.cpp:112 data/po/gui_strings.h:583
 msgid "Graphics"
 msgstr ""
 
@@ -911,7 +933,7 @@ msgid "Guest"
 msgstr ""
 
 #. I18N: ./data/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:20
+#: data/po/gui_strings.h:23
 msgid "Hacienda"
 msgstr ""
 
@@ -919,12 +941,12 @@ msgstr ""
 #. I18N: Main menu button
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:457 data/po/gui_strings.h:632
+#: data/po/gui_strings.h:466 data/po/gui_strings.h:641
 msgid "Help"
 msgstr ""
 
 #. I18N: ./data/karts/hexley/kart.xml
-#: data/po/gui_strings.h:808
+#: data/po/gui_strings.h:814
 msgid "Hexley"
 msgstr ""
 
@@ -940,7 +962,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:302
+#: data/po/gui_strings.h:305
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
@@ -953,25 +975,25 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Addons
-#: data/po/gui_strings.h:183
+#: data/po/gui_strings.h:186
 msgid "Install"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:651
+#: data/po/gui_strings.h:660
 msgid "Intermediate"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: Section in the addons menu
-#: data/po/gui_strings.h:198
+#: data/po/gui_strings.h:201
 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:238
+#: data/po/gui_strings.h:241
 msgid "Keep this resolution"
 msgstr ""
 
@@ -986,7 +1008,7 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ./data/karts/konqi/kart.xml
-#: data/po/gui_strings.h:811
+#: data/po/gui_strings.h:817
 msgid "Konqi"
 msgstr ""
 
@@ -1022,8 +1044,8 @@ msgstr ""
 #: src/states_screens/arenas_screen.cpp:222
 #: src/states_screens/challenges.cpp:116
 #: src/states_screens/kart_selection.cpp:825
-#: src/states_screens/kart_selection.cpp:1791
-#: src/states_screens/kart_selection.cpp:1817
+#: src/states_screens/kart_selection.cpp:1797
+#: src/states_screens/kart_selection.cpp:1823
 #: src/states_screens/race_setup_screen.cpp:210
 #: src/states_screens/tracks_screen.cpp:309
 #: src/states_screens/tracks_screen.cpp:334
@@ -1045,7 +1067,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:286
+#: data/po/gui_strings.h:289
 msgid "Make your rivals bite dust!"
 msgstr ""
 
@@ -1061,7 +1083,7 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:567
+#: data/po/gui_strings.h:576
 msgid "Minimal Race GUI"
 msgstr ""
 
@@ -1078,14 +1100,14 @@ msgid "Mouse button %d"
 msgstr ""
 
 #. I18N: ./data/karts/mozilla/kart.xml
-#: data/po/gui_strings.h:814
+#: data/po/gui_strings.h:820
 msgid "Mozilla"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:441
-msgid "Multiplayer Race"
+#: data/po/gui_strings.h:450
+msgid "Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
@@ -1096,14 +1118,14 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:282 data/po/gui_strings.h:329
-#: data/po/gui_strings.h:373 data/po/gui_strings.h:415
+#: data/po/gui_strings.h:285 data/po/gui_strings.h:332
+#: data/po/gui_strings.h:382 data/po/gui_strings.h:424
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the audio/video settings submenu
-#: data/po/gui_strings.h:476
+#: data/po/gui_strings.h:485
 msgid "Music"
 msgstr ""
 
@@ -1126,7 +1148,7 @@ msgstr ""
 msgid "New game mode '%s' now available"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:700
+#: src/states_screens/race_result_gui.cpp:698
 msgid "New highscore!"
 msgstr ""
 
@@ -1146,7 +1168,7 @@ msgid "Nitro"
 msgstr ""
 
 #. I18N: ./data/karts/nolok/kart.xml
-#: data/po/gui_strings.h:817
+#: data/po/gui_strings.h:823
 msgid "Nolok"
 msgstr ""
 
@@ -1161,33 +1183,33 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ./data/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:50
+#: data/po/gui_strings.h:53
 msgid "Northern Resort"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:647
+#: data/po/gui_strings.h:656
 msgid "Novice"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: In race setup menu
-#: data/po/gui_strings.h:643
+#: data/po/gui_strings.h:652
 msgid "Number of AI karts"
 msgstr ""
 
-#: src/states_screens/dialogs/message_dialog.cpp:48
+#: src/states_screens/dialogs/message_dialog.cpp:63
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/tracks/mines/track.xml
-#: data/po/gui_strings.h:32
+#: data/po/gui_strings.h:35
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ./data/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:35
+#: data/po/gui_strings.h:38
 msgid "Oliver's Math Class"
 msgstr ""
 
@@ -1199,13 +1221,13 @@ msgstr ""
 #. I18N: Main menu button
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:453 data/po/gui_strings.h:628
+#: data/po/gui_strings.h:462 data/po/gui_strings.h:637
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:348
-msgid "Parachute - slows down all karts in a better position!"
+#: data/po/gui_strings.h:351
+msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
 #. I18N: Key binding name
@@ -1214,7 +1236,7 @@ msgid "Pause Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:612
+#: data/po/gui_strings.h:621
 msgid "Paused"
 msgstr ""
 
@@ -1223,17 +1245,17 @@ msgid "Penalty time!!"
 msgstr ""
 
 #. I18N: ./data/grandprix/penguinplayground.grandprix
-#: data/po/gui_strings.h:173 data/po/gui_strings.h:778
+#: data/po/gui_strings.h:176 data/po/gui_strings.h:787
 msgid "Penguin Playground"
 msgstr ""
 
 #. I18N: ./data/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:820
+#: data/po/gui_strings.h:826
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:673
+#: data/po/gui_strings.h:682
 msgid "Play all"
 msgstr ""
 
@@ -1243,7 +1265,7 @@ msgstr ""
 #: src/states_screens/options_screen_input.cpp:132
 #: src/states_screens/options_screen_input2.cpp:73
 #: src/states_screens/options_screen_ui.cpp:114
-#: src/states_screens/options_screen_video.cpp:83 data/po/gui_strings.h:536
+#: src/states_screens/options_screen_video.cpp:83 data/po/gui_strings.h:545
 msgid "Players"
 msgstr ""
 
@@ -1257,10 +1279,10 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:342
+#: data/po/gui_strings.h:345
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
-"back to make one lose sight!"
+"back to make one lose sight."
 msgstr ""
 
 #. I18N: in graphical options
@@ -1273,24 +1295,24 @@ msgstr ""
 #. I18N: When configuring input
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:609
+#: data/po/gui_strings.h:257 data/po/gui_strings.h:618
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:601
+#: data/po/gui_strings.h:610
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In key bindings configuration menu
-#: data/po/gui_strings.h:522
+#: data/po/gui_strings.h:531
 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:540
+#: data/po/gui_strings.h:549
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -1305,28 +1327,22 @@ msgid "Problems removing the addon '%s'."
 msgstr ""
 
 #. I18N: ./data/karts/puffy/kart.xml
-#: data/po/gui_strings.h:823
+#: data/po/gui_strings.h:829
 msgid "Puffy"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:465
+#: data/po/gui_strings.h:474
 msgid "Quit"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:437
-msgid "Race"
-msgstr ""
-
 #: src/states_screens/dialogs/race_over_dialog.cpp:107
 msgid "Race Results"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:639
+#: data/po/gui_strings.h:648
 msgid "Race Setup"
 msgstr ""
 
@@ -1339,7 +1355,7 @@ msgid "Random Arena"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:809
-#: src/states_screens/kart_selection.cpp:1834
+#: src/states_screens/kart_selection.cpp:1840
 msgid "Random Kart"
 msgstr ""
 
@@ -1359,7 +1375,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:380
+#: data/po/gui_strings.h:389
 msgid ""
 "Regular Race: all blows allowed, so catch weapons and make clever use of "
 "them!"
@@ -1367,7 +1383,7 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: Reload button to reload addon data
-#: data/po/gui_strings.h:194
+#: data/po/gui_strings.h:197
 msgid "Reload"
 msgstr ""
 
@@ -1388,17 +1404,17 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the graphics settings
-#: data/po/gui_strings.h:590
+#: data/po/gui_strings.h:599
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:111
+#: src/states_screens/race_result_gui.cpp:114
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:624
+#: data/po/gui_strings.h:633
 msgid "Restart Race"
 msgstr ""
 
@@ -1407,13 +1423,20 @@ msgstr ""
 msgid "Right"
 msgstr ""
 
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:360
+msgid ""
+"Rubber Ball - bounces after the leader, and might squash and slow down karts "
+"down on the way."
+msgstr ""
+
 #. I18N: ./data/tracks/scotland/track.xml
-#: data/po/gui_strings.h:41
+#: data/po/gui_strings.h:44
 msgid "Scotland"
 msgstr ""
 
 #. I18N: ./data/tracks/secretgarden/track.xml
-#: data/po/gui_strings.h:44
+#: data/po/gui_strings.h:47
 msgid "Secret Garden"
 msgstr ""
 
@@ -1432,7 +1455,7 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:658
+#: data/po/gui_strings.h:667
 msgid "Select a game mode"
 msgstr ""
 
@@ -1443,7 +1466,7 @@ msgstr ""
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
 #: src/states_screens/dialogs/race_over_dialog.cpp:369
-#: src/states_screens/race_result_gui.cpp:108 data/po/gui_strings.h:620
+#: src/states_screens/race_result_gui.cpp:111 data/po/gui_strings.h:629
 msgid "Setup New Race"
 msgstr ""
 
@@ -1453,15 +1476,21 @@ msgid "Sharp Turn"
 msgstr ""
 
 #. I18N: ./data/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:38
+#: data/po/gui_strings.h:41
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ./data/tracks/city/track.xml
-#: data/po/gui_strings.h:8
+#: data/po/gui_strings.h:11
 msgid "Shiny Suburbs"
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+#: data/po/gui_strings.h:446
+msgid "Single-player"
+msgstr ""
+
 #: src/states_screens/dialogs/addons_loading.cpp:158
 #, c-format
 msgid "Size: %s"
@@ -1469,22 +1498,22 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the graphics settings
-#: data/po/gui_strings.h:555
+#: data/po/gui_strings.h:564
 msgid "Skin"
 msgstr ""
 
 #. I18N: ./data/tracks/skyline/track.xml
-#: data/po/gui_strings.h:47
+#: data/po/gui_strings.h:50
 msgid "Skyline"
 msgstr ""
 
 #. I18N: ./data/grandprix/snagdrive.grandprix
-#: data/po/gui_strings.h:176 data/po/gui_strings.h:781
+#: data/po/gui_strings.h:179 data/po/gui_strings.h:790
 msgid "Snag Drive"
 msgstr ""
 
 #. I18N: ./data/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:53
+#: data/po/gui_strings.h:56
 msgid "Snow Peak"
 msgstr ""
 
@@ -1497,18 +1526,18 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in audio/video settings submenu
-#: data/po/gui_strings.h:488
+#: data/po/gui_strings.h:497
 msgid "Sound Effects"
 msgstr ""
 
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:214
+#: data/po/gui_strings.h:217
 msgid "Standard"
 msgstr ""
 
 #. I18N: ./data/tracks/startrack/track.xml
-#: data/po/gui_strings.h:59
+#: data/po/gui_strings.h:62
 msgid "Star Track"
 msgstr ""
 
@@ -1531,7 +1560,7 @@ msgid "Steer Right"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:190
+#: data/po/gui_strings.h:193
 msgid "SuperTuxKart Addons"
 msgstr ""
 
@@ -1539,8 +1568,8 @@ msgstr ""
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:266 data/po/gui_strings.h:313
-#: data/po/gui_strings.h:357 data/po/gui_strings.h:399
+#: data/po/gui_strings.h:269 data/po/gui_strings.h:316
+#: data/po/gui_strings.h:366 data/po/gui_strings.h:408
 msgid "SuperTuxKart Help"
 msgstr ""
 
@@ -1550,19 +1579,19 @@ msgstr ""
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:468 data/po/gui_strings.h:499
-#: data/po/gui_strings.h:514 data/po/gui_strings.h:532
-#: data/po/gui_strings.h:547 data/po/gui_strings.h:570
+#: data/po/gui_strings.h:477 data/po/gui_strings.h:508
+#: data/po/gui_strings.h:523 data/po/gui_strings.h:541
+#: data/po/gui_strings.h:556 data/po/gui_strings.h:579
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:418
+#: data/po/gui_strings.h:427
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:376
+#: data/po/gui_strings.h:385
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
@@ -1575,15 +1604,20 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:826
+#: data/po/gui_strings.h:832
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:354
+#: data/po/gui_strings.h:357
 msgid ""
 "Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time"
+"time."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:363
+msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
 #. I18N: in the language choice, to select the same language as the OS
@@ -1593,14 +1627,14 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:306
+#: data/po/gui_strings.h:309
 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:23
+#: data/po/gui_strings.h:26
 msgid "The Island"
 msgstr ""
 
@@ -1609,7 +1643,7 @@ msgid "The Space Shuttle has landed!"
 msgstr ""
 
 #. I18N: ./data/tracks/stadium/track.xml
-#: data/po/gui_strings.h:56
+#: data/po/gui_strings.h:59
 msgid "The Stadium"
 msgstr ""
 
@@ -1638,7 +1672,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:384
+#: data/po/gui_strings.h:393
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
@@ -1656,12 +1690,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:333
+#: data/po/gui_strings.h:336
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/tothemoonandback.grandprix
-#: data/po/gui_strings.h:179 data/po/gui_strings.h:784
+#: data/po/gui_strings.h:182 data/po/gui_strings.h:793
 msgid "To the Moon and Back"
 msgstr ""
 
@@ -1679,7 +1713,7 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: Section in the addons menu
-#: data/po/gui_strings.h:202
+#: data/po/gui_strings.h:205
 msgid "Tracks"
 msgstr ""
 
@@ -1689,17 +1723,17 @@ msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:670
+#: data/po/gui_strings.h:679
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ./data/karts/tux/kart.xml
-#: data/po/gui_strings.h:829
+#: data/po/gui_strings.h:835
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/tracks/tuxtollway/track.xml
-#: data/po/gui_strings.h:62
+#: data/po/gui_strings.h:65
 msgid "Tux Tollway"
 msgstr ""
 
@@ -1722,7 +1756,7 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:586
+#: data/po/gui_strings.h:595
 msgid "Use Frame Buffer Objects (requires restart)"
 msgstr ""
 
@@ -1732,7 +1766,7 @@ msgstr ""
 #: src/states_screens/options_screen_input.cpp:131
 #: src/states_screens/options_screen_input2.cpp:72
 #: src/states_screens/options_screen_players.cpp:69
-#: src/states_screens/options_screen_video.cpp:82 data/po/gui_strings.h:551
+#: src/states_screens/options_screen_video.cpp:82 data/po/gui_strings.h:560
 msgid "User Interface"
 msgstr ""
 
@@ -1743,7 +1777,7 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:582
+#: data/po/gui_strings.h:591
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
@@ -1751,7 +1785,7 @@ msgstr ""
 #. I18N: Music volume in options
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Sound volume in options
-#: data/po/gui_strings.h:484 data/po/gui_strings.h:496
+#: data/po/gui_strings.h:493 data/po/gui_strings.h:505
 msgid "Volume"
 msgstr ""
 
@@ -1759,7 +1793,7 @@ msgstr ""
 msgid "WRONG WAY!"
 msgstr ""
 
-#: src/states_screens/options_screen_input2.cpp:363
+#: src/states_screens/options_screen_input2.cpp:384
 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 "
@@ -1774,8 +1808,8 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:274 data/po/gui_strings.h:321
-#: data/po/gui_strings.h:365 data/po/gui_strings.h:407
+#: data/po/gui_strings.h:277 data/po/gui_strings.h:324
+#: data/po/gui_strings.h:374 data/po/gui_strings.h:416
 msgid "Weapons"
 msgstr ""
 
@@ -1787,7 +1821,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:429
+#: data/po/gui_strings.h:438
 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, "
@@ -1798,112 +1832,112 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/karts/wilber/kart.xml
-#: data/po/gui_strings.h:832
+#: data/po/gui_strings.h:838
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/challenges/followtheleader.challenge
-#: data/po/gui_strings.h:95 data/po/gui_strings.h:700
+#: data/po/gui_strings.h:98 data/po/gui_strings.h:709
 msgid "Win Penguin Playground Grand Prix"
 msgstr ""
 
 #. I18N: ./data/challenges/followtheleader.challenge
-#: data/po/gui_strings.h:98 data/po/gui_strings.h:703
+#: data/po/gui_strings.h:101 data/po/gui_strings.h:712
 msgid "Win Penguin Playground Grand Prix with 3 Expert Level AI karts."
 msgstr ""
 
 #. I18N: ./data/challenges/snagdrive.challenge
-#: data/po/gui_strings.h:143 data/po/gui_strings.h:748
+#: data/po/gui_strings.h:146 data/po/gui_strings.h:757
 msgid "Win To the Moon and Back Grand Prix"
 msgstr ""
 
 #. I18N: ./data/challenges/skyline.challenge
-#: data/po/gui_strings.h:140 data/po/gui_strings.h:745
+#: data/po/gui_strings.h:143 data/po/gui_strings.h:754
 msgid ""
 "Win a 1 lap Head to Head in the Secret Garden against 1 easy level AI kart."
 msgstr ""
 
 #. I18N: ./data/challenges/xr591.challenge
-#: data/po/gui_strings.h:164 data/po/gui_strings.h:769
+#: data/po/gui_strings.h:167 data/po/gui_strings.h:778
 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:110 data/po/gui_strings.h:715
+#: data/po/gui_strings.h:113 data/po/gui_strings.h:724
 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:122 data/po/gui_strings.h:727
+#: data/po/gui_strings.h:125 data/po/gui_strings.h:736
 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:86 data/po/gui_strings.h:691
+#: data/po/gui_strings.h:89 data/po/gui_strings.h:700
 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:80 data/po/gui_strings.h:685
+#: data/po/gui_strings.h:83 data/po/gui_strings.h:694
 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:128 data/po/gui_strings.h:733
+#: data/po/gui_strings.h:131 data/po/gui_strings.h:742
 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:137 data/po/gui_strings.h:742
+#: data/po/gui_strings.h:140 data/po/gui_strings.h:751
 msgid "Win a Head to Head in the Secret Garden"
 msgstr ""
 
 #. I18N: ./data/challenges/xr591.challenge
-#: data/po/gui_strings.h:161 data/po/gui_strings.h:766
+#: data/po/gui_strings.h:164 data/po/gui_strings.h:775
 msgid "Win a race on Canyon"
 msgstr ""
 
 #. I18N: ./data/challenges/gnu.challenge
-#: data/po/gui_strings.h:107 data/po/gui_strings.h:712
+#: data/po/gui_strings.h:110 data/po/gui_strings.h:721
 msgid "Win a race on Fort Magma"
 msgstr ""
 
 #. I18N: ./data/challenges/island.challenge
-#: data/po/gui_strings.h:119 data/po/gui_strings.h:724
+#: data/po/gui_strings.h:122 data/po/gui_strings.h:733
 msgid "Win a race on Snow Mountain"
 msgstr ""
 
 #. I18N: ./data/challenges/canyon.challenge
-#: data/po/gui_strings.h:83 data/po/gui_strings.h:688
+#: data/po/gui_strings.h:86 data/po/gui_strings.h:697
 msgid "Win a race on Tux Tollway"
 msgstr ""
 
 #. I18N: ./data/challenges/alltracks.challenge
-#: data/po/gui_strings.h:71 data/po/gui_strings.h:676
+#: data/po/gui_strings.h:74 data/po/gui_strings.h:685
 msgid "Win the At World's End Grand Prix"
 msgstr ""
 
 #. I18N: ./data/challenges/snagdrive.challenge
-#: data/po/gui_strings.h:146 data/po/gui_strings.h:751
+#: data/po/gui_strings.h:149 data/po/gui_strings.h:760
 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:65
+#: data/po/gui_strings.h:68
 msgid "XR591"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: data/po/gui_strings.h:230
+#: data/po/gui_strings.h:233
 msgid "Yes"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:388
+#: src/states_screens/grand_prix_win.cpp:368
 msgid "You completed the Grand Prix!"
 msgstr ""
 
-#: src/karts/kart.cpp:612 src/karts/kart.cpp:631
+#: src/karts/kart.cpp:615 src/karts/kart.cpp:634
 msgid "You finished the race!"
 msgstr ""
 
@@ -1911,22 +1945,22 @@ msgstr ""
 msgid "You have been eliminated!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:700
+#: src/states_screens/race_result_gui.cpp:698
 msgid "You topped the highscore list!"
 msgstr ""
 
 #: src/states_screens/dialogs/race_over_dialog.cpp:341
-#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/grand_prix_win.cpp:104
 msgid "You unlocked a new feature!"
 msgstr ""
 
-#: src/states_screens/addons_screen.cpp:236
+#: src/states_screens/addons_screen.cpp:275
 msgid ""
 "You will be taken back to the Main Menu while an updated list of Addons are "
 "downloaded."
 msgstr ""
 
-#: src/karts/kart.cpp:612 src/karts/kart.cpp:631
+#: src/karts/kart.cpp:615 src/karts/kart.cpp:634
 msgid "You won the race!"
 msgstr ""
 
@@ -1947,7 +1981,7 @@ msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
 
 #. I18N: ./data/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:68
+#: data/po/gui_strings.h:71
 msgid "Zen Garden"
 msgstr ""