diff --git a/data/po/fr_CA.po b/data/po/fr_CA.po
index 4f835a9ba..891410aa8 100644
--- a/data/po/fr_CA.po
+++ b/data/po/fr_CA.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-01 12:02-0400\n"
+"POT-Creation-Date: 2011-09-02 19:31-0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Marianne Gagnon (Auria) <auria.mg@gmail.com>\n"
 "Language-Team: \n"
@@ -12,68 +12,73 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: CANADA\n"
 
-#: src/states_screens/options_screen_input.cpp:92
-#, c-format
-msgid "   Keyboard %i"
+#. I18N: Do NOT literally translate this string!! Please enter Y as the
+#. translation if your language is a RTL (right-to-left) language,
+#. N (or nothing) otherwise
+#: src/utils/translation.cpp:255
+msgid "   Is this a RTL language?"
 msgstr ""
 
 #. I18N: shown when hit by plunger. %0 is the victim, %1 is the attacker
-#: src/items/rubber_band.cpp:43
+#: src/items/rubber_band.cpp:45
 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:49
+#: 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:73
+#. 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 "%0 a été renversé par la boule de quilles de %1"
 
 #. I18N: shown when hit by cake. %1 is the attacker, %0 is the victim.
-#: src/items/flyable.cpp:51
+#: 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:53
+#: 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:69
-msgid "%0 will not play bowling with %1 again"
+#. 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 "%0 ne jouera plus aux quilles avec %1"
 
 #. I18N: shown when hit by plunger. %0 is the victim, %1 is the attacker
-#: src/items/rubber_band.cpp:45
+#: src/items/rubber_band.cpp:47
 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:71
+#. 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 ""
 
 #. I18N: shown when hit by plunger. %0 is the victim, %1 is the attacker
-#: src/items/rubber_band.cpp:47
+#: src/items/rubber_band.cpp:49
 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:123
+#: src/states_screens/dialogs/track_info_dialog.cpp:136
 #, c-format
 msgid "%i laps"
 msgstr ""
@@ -86,388 +91,493 @@ 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
+msgid "%s KB"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:146
+#, c-format
+msgid "%s MB"
+msgstr ""
+
 #. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:328
+#. I18N: as in: The Old Island by Johannes Sjolund
+#: src/modes/linear_world.cpp:309
+#: src/states_screens/addons_screen.cpp:182
 #, 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 ""
 
-#: src/states_screens/kart_selection.cpp:436
+#. 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/bowling.cpp:125
+#, c-format
+msgid "%s is practicing with a blue, big, spheric yo-yo"
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:527
 #, c-format
 msgid "%s is ready"
 msgstr ""
 
-#: src/items/powerup.cpp:47
+#. I18N: shown when hit by own bowling ball. %s is the kart.
+#: src/items/bowling.cpp:127
+#, c-format
+msgid "%s is the world master of the boomerang ball"
+msgstr ""
+
+#: src/items/powerup.cpp:48
 #, c-format
 msgid "%s pays the next round of grog!"
 msgstr ""
 
-#: src/modes/world.cpp:623
+#. I18N: shown when hit by own bowling ball. %s is the kart.
+#: src/items/bowling.cpp:129
+#, c-format
+msgid "%s should play (rubber) darts instead of bowling"
+msgstr ""
+
+#: src/modes/world.cpp:797
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
 #. I18N: for empty highscores entries
-#: src/states_screens/dialogs/track_info_dialog.cpp:260
+#: src/states_screens/dialogs/track_info_dialog.cpp:272
 msgid "(Empty)"
 msgstr ""
 
-#. I18N: ./data/gui/karts.stkgui
-#. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:250
-msgid "(more players can join by pressing 'fire' now)"
+#. I18N: ./data/gui/help4.stkgui
+#: 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:152
+#: 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:238
-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 rank, the more points you get. In the end, the player with the most points wins the cup."
+#: 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 rank, the more points you get. In the end, the player with the most points wins the cup."
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:421
+#: data/po/gui_strings.h:538
 msgid "* Which config to use will be inferred from which 'fire' key is pressed to join the game."
 msgstr ""
 
 #. I18N: Game mode
-#: src/race/race_manager.hpp:150
+#: src/race/race_manager.hpp:149
 msgid "3 Strikes Battle"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:234
-msgid "3 Strikes Battle : only in multiplayer games. Hit others with weapons until they lose all their lives."
+#: data/po/gui_strings.h:401
+msgid "3 Strikes Battle: only in multiplayer games. Hit others with weapons until they lose all their lives."
 msgstr ""
 
-#: src/states_screens/dialogs/track_info_dialog.cpp:185
+#: src/states_screens/dialogs/track_info_dialog.cpp:198
 msgid "= Highscores ="
 msgstr ""
 
-#: src/items/powerup.cpp:81
+#: src/items/powerup.cpp:82
 msgid "A wizard did it!"
 msgstr ""
 
-#: src/states_screens/dialogs/race_over_dialog.cpp:426
-#: src/states_screens/race_result_gui.cpp:99
+#: src/states_screens/dialogs/race_over_dialog.cpp:424
+#: src/states_screens/race_result_gui.cpp:102
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/mainaddons.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:274
-#: data/po/gui_strings.h:310
+#: data/po/gui_strings.h:470
 msgid "About"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:135
+#: src/states_screens/options_screen_input2.cpp:182
 msgid "Accelerate"
 msgstr ""
 
 #. I18N: In the 'add new input device' dialog
-#: src/states_screens/dialogs/add_device_dialog.cpp:60
+#: src/states_screens/dialogs/add_device_dialog.cpp:65
 msgid "Add Keyboard Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In players configuration menu
-#: data/po/gui_strings.h:452
+#: 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:418
+#: data/po/gui_strings.h:535
 msgid "Add a device"
 msgstr ""
 
+#. I18N: arena group name
+#. I18N: kart group name
+#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:66
+#: 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:221
 msgid "Add-Ons"
 msgstr ""
 
-#. I18N: ./data/gui/mainaddons.stkgui
+#: src/states_screens/addons_screen.cpp:76
+msgid "Add-on name"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:298
+#: data/po/gui_strings.h:458
 msgid "Addons"
 msgstr ""
 
 #. I18N: ./data/karts/adiumy/kart.xml
-#: data/po/gui_strings.h:680
+#: data/po/gui_strings.h:796
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: name of the tab that will show arenas from all groups
 #. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/kart_selection.cpp:763
-#: src/states_screens/tracks_screen.cpp:85
-#: data/po/gui_strings.h:70
+#: 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:225
 msgid "All"
 msgstr ""
 
+#. I18N: ./data/grandprix/alltracks.grandprix
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
-#: data/po/gui_strings.h:572
+#. I18N: ./data/grandprix/alltracks.grandprix
+#: data/po/gui_strings.h:170
+#: data/po/gui_strings.h:675
+#: data/po/gui_strings.h:781
 msgid "All Tracks"
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:183
+#: src/states_screens/race_setup_screen.cpp:198
 msgid "All blows allowed, so catch weapons and make clever use of them!"
 msgstr ""
 
-#. I18N: ./data/grandprix/alltracks.grandprix
-#: data/po/gui_strings.h:650
-msgid "All tracks"
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+#: 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:29
+msgid "Amazonian Journey"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:193
-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
+#: src/states_screens/options_screen_video.cpp:304
+#, c-format
+msgid "Animated Characters : %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:300
+#, c-format
+msgid "Animated Scenery : %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:307
+#, c-format
+msgid "Anti-aliasing (requires restart) : %s"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings menu
-#: data/po/gui_strings.h:491
-msgid "Apply video changes"
+#: 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:466
+msgid "Are you sure you want to permanently delete this configuration?"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: Section in the addons menu
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: Section in arena tracks selection screen
-#: data/po/gui_strings.h:58
+#: 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:32
+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:502
+#: data/po/gui_strings.h:614
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/atworldsend.grandprix
-#: data/po/gui_strings.h:653
+#: data/po/gui_strings.h:173
+#: data/po/gui_strings.h:784
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_device.stkgui
-#. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: Section in the settings menu
-#: data/po/gui_strings.h:325
-#: data/po/gui_strings.h:372
-#: data/po/gui_strings.h:402
-#: data/po/gui_strings.h:436
-#: data/po/gui_strings.h:467
+#: src/states_screens/options_screen_input.cpp:130
+#: 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:481
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:136
+#: data/po/gui_strings.h:297
 msgid "Avoid bananas!"
 msgstr ""
 
 #. I18N: to appear in input configuration screen, for gamepad axes
-#: src/input/input.cpp:478
+#: src/input/binding.cpp:266
 #, c-format
 msgid "Axis %d %s"
 msgstr ""
 
-#. I18N: ./data/gui/addons.stkgui
-#. I18N: In the options menu, to go back to the main menu or game
-#. I18N: ./data/gui/addons_update.stkgui
-#. I18N: In the options menu, to go back to the main menu or game
-#. I18N: ./data/gui/addons_view_dialog.stkgui
+#. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Addons
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: In the help menu, to return to the previous screen
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: In the help menu, to return to the previous screen
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu, to return to the previous screen
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: In the options menu, to go back to the main menu or game
-#. I18N: ./data/gui/options_device.stkgui
-#. I18N: In the options menu, to go back to the main menu or game
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: In the options menu, to go back to the main menu or game
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: In the options menu, to go back to the main menu or game
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the options menu, to go back to the main menu or game
-#: data/po/gui_strings.h:18
-#: data/po/gui_strings.h:37
-#: data/po/gui_strings.h:41
-#: data/po/gui_strings.h:156
-#: data/po/gui_strings.h:200
-#: data/po/gui_strings.h:242
-#: data/po/gui_strings.h:361
-#: data/po/gui_strings.h:391
-#: data/po/gui_strings.h:425
-#: data/po/gui_strings.h:456
-#: data/po/gui_strings.h:495
+#: 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:513
+#: 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:387
+#: data/po/gui_strings.h:520
 msgid "Back to device list"
 msgstr ""
 
-#. I18N: ./data/gui/challenges.stkgui
-#. I18N: ./data/gui/credits.stkgui
-#: data/po/gui_strings.h:77
-#: data/po/gui_strings.h:92
-msgid "Back to main menu"
-msgstr ""
-
-#: src/states_screens/dialogs/race_over_dialog.cpp:394
+#: src/states_screens/dialogs/race_over_dialog.cpp:392
 msgid "Back to the main menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:112
+#: src/states_screens/race_result_gui.cpp:117
 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/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:799
+msgid "Beagle"
+msgstr ""
+
+#. I18N: ./data/karts/beastie/kart.xml
+#: data/po/gui_strings.h:802
+msgid "Beastie"
+msgstr ""
+
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:194
+#: src/states_screens/grand_prix_lose.cpp:258
 msgid "Better luck next time!"
 msgstr ""
 
+#. I18N: ./data/tracks/farm/track.xml
+#: data/po/gui_strings.h:17
+msgid "Bovine Barnyard"
+msgstr ""
+
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:187
+#: data/po/gui_strings.h:348
 msgid "Bowling Ball - bounces off walls. If you are looking back, it will be thrown backwards."
 msgstr "Boule de Quilles - rebondit sur les murs. Tu peux aussi la lancer derrière toi en utilisant la touche 'regarder derrière'."
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:138
+#: src/states_screens/options_screen_input2.cpp:185
 msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:178
-msgid "BubbleGum - leave a sticky pink puddle behind you"
-msgstr ""
-"Gomme \"balloune\" - laisse une mare de gomme\n"
-"rose et collante derrière toi"
+#: data/po/gui_strings.h:339
+msgid "BubbleGum - leave a sticky pink puddle behind you."
+msgstr "Gomme \"balloune\" - laisse une mare de gomme rose et collante derrière toi."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:181
-msgid "Cake - thrown at the closest rival, best on short ranges and long straights"
+#: data/po/gui_strings.h:342
+msgid "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
+#: src/addons/network_http.cpp:421
+#: src/addons/news_manager.cpp:142
+msgid "Can't access stkaddons server..."
+msgstr ""
+
+#: src/addons/network_http.cpp:328
+msgid "Can't download addons list, check terminal for details."
+msgstr ""
+
+#: src/addons/network_http.cpp:338
+msgid "Can't download news file, check terminal for details."
+msgstr ""
+
+#. I18N: ./data/gui/confirm_dialog.stkgui
+#. I18N: In a 'are you sure?' dialog
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
 #. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: src/states_screens/dialogs/add_device_dialog.cpp:76
-#: src/states_screens/dialogs/player_info_dialog.cpp:88
-#: data/po/gui_strings.h:85
+#: 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:237
+#: data/po/gui_strings.h:245
 msgid "Cancel"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/dialogs/player_info_dialog.cpp:173
+#: src/states_screens/dialogs/player_info_dialog.cpp:185
 msgid "Cancel Remove"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:174
+#: src/states_screens/options_screen_input2.cpp:223
 msgid "Cancel/Back"
 msgstr ""
 
-#: src/states_screens/dialogs/enter_player_name_dialog.cpp:88
+#: src/states_screens/dialogs/enter_player_name_dialog.cpp:119
+#: src/states_screens/dialogs/enter_player_name_dialog.cpp:134
 msgid "Cannot add a player with this name."
 msgstr ""
 
+#. I18N: ./data/tracks/cave/track.xml
+#: data/po/gui_strings.h:8
+msgid "Cave X"
+msgstr ""
+
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/mainaddons.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:262
-#: data/po/gui_strings.h:294
+#: data/po/gui_strings.h:454
 msgid "Challenges"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:74
+#: 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:246
+#: data/po/gui_strings.h:442
 msgid "Choose a Kart"
 msgstr ""
 
-#. I18N: ./data/tracks/crescentcrossing/crescentcrossing.challenge
-#: data/po/gui_strings.h:629
+#. I18N: ./data/challenges/crescentcrossing.challenge
+#: 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:132
+#: data/po/gui_strings.h:293
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#. I18N: ./data/grandprix/tothemoonandback.challenge
-#: data/po/gui_strings.h:605
+#. I18N: ./data/challenges/mines.challenge
+#: 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: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:140
+#: 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 bar at the right of the game screen."
 msgstr ""
 
-#. I18N: ./data/grandprix/alltracks.challenge
-#: data/po/gui_strings.h:590
-msgid "Come first in the At World's End Grand Prix with 3 'Racer' Level AI karts."
+#. I18N: ./data/challenges/alltracks.challenge
+#: 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 ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/dialogs/player_info_dialog.cpp:154
+#: src/states_screens/dialogs/player_info_dialog.cpp:166
 msgid "Confirm Remove"
 msgstr ""
 
@@ -477,194 +587,267 @@ msgstr ""
 msgid "Confirm resolution within %i seconds"
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:190
+#: src/states_screens/race_setup_screen.cpp:205
 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:93
-#: data/po/gui_strings.h:103
-#: data/po/gui_strings.h:106
-#: data/po/gui_strings.h:109
+#: 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 ""
 
-#: src/states_screens/dialogs/race_over_dialog.cpp:411
+#: src/states_screens/dialogs/race_over_dialog.cpp:409
 msgid "Continue Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: Section in the settings menu
-#: data/po/gui_strings.h:333
-#: data/po/gui_strings.h:380
-#: data/po/gui_strings.h:410
-#: data/po/gui_strings.h:444
-#: data/po/gui_strings.h:475
+#: 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:512
+#: data/po/gui_strings.h:527
 msgid "Controls"
 msgstr ""
 
+#. I18N: ./data/tracks/canyon/track.xml
+#: 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:89
+#: data/po/gui_strings.h:249
 msgid "Credits"
 msgstr ""
 
-#. I18N: ./data/gui/addons_view_dialog.stkgui
-#: data/po/gui_strings.h:47
-msgid "Description:"
+#. I18N: ./data/tracks/crescentcrossing/track.xml
+#: data/po/gui_strings.h:14
+msgid "Crescent Crossing"
 msgstr ""
 
-#: src/states_screens/dialogs/addons_loading.cpp:71
-#, c-format
-msgid "Description: %i"
+#. 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: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:477
+msgid "Disable Device"
+msgstr ""
+
+#. I18N: in the graphical options tooltip; indicates a graphical feature is disabled
+#: src/states_screens/options_screen_video.cpp:291
+msgid "Disabled"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+#: data/po/gui_strings.h:568
+msgid "Display FPS"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/dialogs/player_info_dialog.cpp:138
+#: src/states_screens/dialogs/player_info_dialog.cpp:150
 #, c-format
 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 ""
 
+#: src/karts/controller/player_controller.cpp:294
+msgid "Don't accelerate before go"
+msgstr ""
+
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:162
+#: src/states_screens/options_screen_input2.cpp:211
 msgid "Down"
 msgstr ""
 
+#: src/states_screens/dialogs/addons_loading.cpp:221
+msgid "Download failed."
+msgstr ""
+
 #. I18N: ./data/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:683
+#: data/po/gui_strings.h:805
 msgid "Elephpant"
 msgstr ""
 
+#. I18N: ./data/karts/emule/kart.xml
+#: 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: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
-#: data/po/gui_strings.h:341
-#: data/po/gui_strings.h:353
+#: src/states_screens/options_screen_video.cpp:289
+#: data/po/gui_strings.h:489
+#: data/po/gui_strings.h:501
 msgid "Enabled"
 msgstr ""
 
-#: src/states_screens/dialogs/race_over_dialog.cpp:695
+#: src/states_screens/dialogs/race_over_dialog.cpp:682
 msgid "Energy"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:96
+#: data/po/gui_strings.h:253
 msgid "Enter the new player's name"
 msgstr ""
 
-#. I18N: ./data/karts/eviltux/kart.xml
-#: data/po/gui_strings.h:686
-msgid "Eviltux"
+#: src/states_screens/kart_selection.cpp:1139
+msgid ""
+"Everyone:\n"
+"Press 'Fire' now to join the game!"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:533
+#: data/po/gui_strings.h:645
 msgid "Exit Race"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:561
+#: data/po/gui_strings.h:664
 msgid "Expert"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:421
+#: src/states_screens/feature_unlocked.cpp:476
 msgid "Feature Unlocked"
 msgstr ""
 
-#: src/modes/linear_world.cpp:265
+#: src/modes/linear_world.cpp:228
 msgid "Final lap!"
 msgstr ""
 
-#. I18N: ./data/tracks/jungle/jungle.challenge
-#: data/po/gui_strings.h:644
-msgid "Finish 3 laps in Racetrack with 3 easy AI karts in under 2:40 minutes."
+#. I18N: ./data/challenges/hacienda.challenge
+#: 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/tracks/canyon/canyon.challenge
-#: data/po/gui_strings.h:620
-msgid "Finish 3 laps on the Tux Tollway track with 3 AI karts in under 3:35 minutes."
+#. I18N: ./data/challenges/tollway.challenge
+#: 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/tracks/jungle/jungle.challenge
-#: data/po/gui_strings.h:641
-msgid "Finish Race track in 2:40"
+#. I18N: ./data/challenges/fortmagma.challenge
+#: 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/tracks/canyon/canyon.challenge
-#: data/po/gui_strings.h:617
-msgid "Finish Tux Tollway track in 3:35"
+#. I18N: ./data/challenges/hacienda.challenge
+#: data/po/gui_strings.h:116
+#: data/po/gui_strings.h:727
+msgid "Finish Farm in 2:30"
 msgstr ""
 
-#. I18N: ./data/tracks/crescentcrossing/crescentcrossing.challenge
-#: data/po/gui_strings.h:632
-msgid "Finish with at least 6 points of nitro on three laps of Oliver's Math Class in under 52 seconds."
+#. I18N: ./data/challenges/tollway.challenge
+#: data/po/gui_strings.h:152
+#: data/po/gui_strings.h:763
+msgid "Finish Lighthouse in 1:30"
 msgstr ""
 
-#. I18N: ./data/grandprix/tothemoonandback.challenge
-#: data/po/gui_strings.h:608
-msgid "Finish with at least 9 nitro points on 3 laps of Shifting Sands in under 2:20 minutes."
+#. I18N: ./data/challenges/fortmagma.challenge
+#: data/po/gui_strings.h:104
+#: data/po/gui_strings.h:715
+msgid "Finish Mines in 3:00"
 msgstr ""
 
-#. I18N: Shown at the end of a race
-#: src/states_screens/race_gui.cpp:89
-msgid "Finished"
+#. I18N: ./data/challenges/crescentcrossing.challenge
+#: 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: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: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."
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:141
+#: src/states_screens/options_screen_input2.cpp:188
 msgid "Fire"
 msgstr ""
 
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: In the help menu
+#: 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 configuration screen and setup the gamepads. It is also possible to play on keyboard(s), however each player will need a different set of keys, and keep in mind that most keyboards are not appropriate for multiplayer gameplay because they do not support large number of keypresses."
+msgstr ""
+
 #. I18N: Game mode
-#: src/race/race_manager.hpp:148
+#: src/race/race_manager.hpp:147
 msgid "Follow the Leader"
 msgstr ""
 
-#. I18N: ./data/tracks/city/city.challenge
-#: data/po/gui_strings.h:623
-msgid "Follow the Leader in the Jungle"
+#. I18N: ./data/challenges/lighthouse.challenge
+#: data/po/gui_strings.h:128
+#: data/po/gui_strings.h:739
+msgid "Follow the Leader around the Solar System"
 msgstr ""
 
-#. I18N: ./data/grandprix/atworldsend.challenge
-#: data/po/gui_strings.h:593
+#. I18N: ./data/challenges/atworldsend.challenge
+#: 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:230
+#: 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 the leader will get you eliminated too!"
 msgstr ""
 
+#. I18N: ./data/tracks/fortmagma/track.xml
+#: 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:487
+#: data/po/gui_strings.h:603
 msgid "Fullscreen"
 msgstr ""
 
 #. I18N: warning, this string needs to be SHORT!
-#: src/states_screens/dialogs/race_over_dialog.cpp:259
+#: src/states_screens/dialogs/race_over_dialog.cpp:258
 msgid "GP scores :"
 msgstr ""
 
 #. I18N: Key binding section
-#: src/states_screens/options_screen_input2.cpp:79
+#: src/states_screens/options_screen_input2.cpp:124
 msgid "Game Keys"
 msgstr ""
 
@@ -674,20 +857,24 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:124
-#: data/po/gui_strings.h:171
-#: data/po/gui_strings.h:215
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+#: 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 ""
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
-#: src/input/input.cpp:482
+#: src/input/binding.cpp:271
 #, c-format
 msgid "Gamepad button %d"
 msgstr ""
 
 #. I18N: to appear in input configuration screen, for gamepad hats
-#: src/input/input.cpp:486
+#: src/input/binding.cpp:256
+#: src/input/binding.cpp:261
 #, c-format
 msgid "Gamepad hat %d"
 msgstr ""
@@ -698,68 +885,71 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:116
-#: data/po/gui_strings.h:163
-#: data/po/gui_strings.h:207
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+#: 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 ""
 
-#: src/items/powerup.cpp:63
+#: src/items/powerup.cpp:64
 msgid "Geronimo!!!"
 msgstr ""
 
 #. I18N: ./data/karts/gnu/kart.xml
-#: data/po/gui_strings.h:689
+#: data/po/gui_strings.h:811
 msgid "Gnu"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:94
+#: src/states_screens/race_gui_base.cpp:56
 msgid "Go!"
 msgstr ""
 
-#. I18N: ./data/karts/gooey/kart.xml
-#: data/po/gui_strings.h:692
-msgid "Gooey"
-msgstr ""
-
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
-#: data/po/gui_strings.h:568
+#: data/po/gui_strings.h:671
 msgid "Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_device.stkgui
-#. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: Section in the settings menu
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the graphics settings
+#: data/po/gui_strings.h:587
+msgid "Graphical Effects Level"
+msgstr ""
+
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: data/po/gui_strings.h:321
-#: data/po/gui_strings.h:368
-#: data/po/gui_strings.h:398
-#: data/po/gui_strings.h:432
-#: data/po/gui_strings.h:463
+#: src/states_screens/options_screen_audio.cpp:63
+#: 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:583
 msgid "Graphics"
 msgstr ""
 
+#: src/config/user_config.cpp:542
+msgid "Guest"
+msgstr ""
+
+#. I18N: ./data/tracks/hacienda/track.xml
+#: data/po/gui_strings.h:23
+msgid "Hacienda"
+msgstr ""
+
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/mainaddons.stkgui
-#. I18N: Main menu button
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:270
-#: data/po/gui_strings.h:306
-#: data/po/gui_strings.h:529
+#: 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:695
+#: data/po/gui_strings.h:814
 msgid "Hexley"
 msgstr ""
 
@@ -767,563 +957,723 @@ msgstr ""
 msgid "Highscores"
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:212
+#: src/states_screens/race_setup_screen.cpp:227
 msgid "Hit others with weapons until they lose all their lives. (Only in multiplayer games)"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:144
+#: 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."
 msgstr ""
 
-#. I18N: message shown when an input device is used but is not associated to any player
-#: src/input/input_manager.cpp:449
+#: src/input/input_manager.cpp:560
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
-#. I18N: ./data/gui/addons_view_dialog.stkgui
+#. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Addons
-#: data/po/gui_strings.h:54
+#: data/po/gui_strings.h:186
 msgid "Install"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:557
+#: data/po/gui_strings.h:660
 msgid "Intermediate"
 msgstr ""
 
-#. I18N: ./data/gui/addons.stkgui
+#. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: Section in the addons menu
-#. I18N: ./data/gui/addons_update.stkgui
-#. I18N: Section in the addons menu
-#: data/po/gui_strings.h:6
-#: data/po/gui_strings.h:25
+#: 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:81
+#: data/po/gui_strings.h:241
 msgid "Keep this resolution"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:90
+#. I18N: short definition for follow-the-leader game mode
+#: src/states_screens/race_setup_screen.cpp:218
+msgid "Keep up with the leader kart but don't overtake it!"
+msgstr ""
+
+#: src/states_screens/options_screen_input.cpp:95
+#, c-format
+msgid "Keyboard %i"
+msgstr ""
+
+#. I18N: ./data/karts/konqi/kart.xml
+#: data/po/gui_strings.h:817
+msgid "Konqi"
+msgstr ""
+
+#. I18N: Shown at the end of a race
+#: src/states_screens/minimal_race_gui.cpp:105
+#: src/states_screens/race_gui.cpp:88
 msgid "Lap"
 msgstr ""
 
-#: src/modes/follow_the_leader.cpp:140
+#: src/modes/linear_world.cpp:253
+#, c-format
+msgid "Lap %i"
+msgstr ""
+
+#: src/modes/follow_the_leader.cpp:201
+#: src/modes/tutorial_race.cpp:192
 msgid "Leader"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:165
+#: src/states_screens/options_screen_input2.cpp:214
 msgid "Left"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1016
+#: src/guiengine/engine.cpp:1135
 msgid "Loading"
 msgstr ""
 
-#. I18N: ./data/gui/mainaddons.stkgui
-#. I18N: In the main screen
-#: data/po/gui_strings.h:282
-msgid "Loading news from stkaddons..."
+#: src/states_screens/kart_selection.cpp:820
+msgid "Locked"
 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:1477
-#: src/states_screens/kart_selection.cpp:1505
-#: src/states_screens/race_setup_screen.cpp:195
-#: src/states_screens/tracks_screen.cpp:261
-#: src/states_screens/tracks_screen.cpp:285
+#: src/states_screens/arenas_screen.cpp:199
+#: 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: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
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:216
+#: src/states_screens/tracks_screen.cpp:252
 msgid "Locked!"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:150
+#: src/states_screens/options_screen_input2.cpp:197
 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:128
+#: data/po/gui_strings.h:289
 msgid "Make your rivals bite dust!"
 msgstr ""
 
+#. I18N: if some kart animations are enabled
+#: src/states_screens/options_screen_video.cpp:295
+msgid "Me Only"
+msgstr ""
+
 #. I18N: Key binding section
-#: src/states_screens/options_screen_input2.cpp:92
+#: src/states_screens/options_screen_input2.cpp:138
 msgid "Menu Keys"
 msgstr ""
 
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+#: data/po/gui_strings.h:576
+msgid "Minimal Race GUI"
+msgstr ""
+
 #. I18N: to appear in input configuration screen, for mouse (might not be used at all)
-#: src/input/input.cpp:494
+#: src/input/binding.cpp:278
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
 #. I18N: to appear in input configuration screen, for mouse (might not be used at all)
-#: src/input/input.cpp:490
+#: src/input/binding.cpp:274
 #, c-format
 msgid "Mouse button %d"
 msgstr ""
 
 #. I18N: ./data/karts/mozilla/kart.xml
-#: data/po/gui_strings.h:698
+#: data/po/gui_strings.h:820
 msgid "Mozilla"
 msgstr ""
 
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: Section in the audio/video settings submenu
-#: data/po/gui_strings.h:337
-msgid "Music"
-msgstr ""
-
-#. I18N: ./data/gui/addons_view_dialog.stkgui
-#: data/po/gui_strings.h:44
-msgid "Name:"
-msgstr ""
-
-#: src/states_screens/dialogs/addons_loading.cpp:70
-#, c-format
-msgid "Name: %i"
-msgstr ""
-
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/mainaddons.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:258
-#: data/po/gui_strings.h:290
-msgid "Networking"
+#: data/po/gui_strings.h:450
+msgid "Multiplayer"
 msgstr ""
 
-#: src/challenges/challenge.cpp:53
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. 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: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:485
+msgid "Music"
+msgstr ""
+
+#: src/challenges/challenge.cpp:60
 #, c-format
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
-#: src/challenges/challenge.cpp:58
+#: src/challenges/challenge.cpp:64
 #, c-format
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:322
+#: src/modes/linear_world.cpp:314
 msgid "New fastest lap"
 msgstr ""
 
-#: src/challenges/challenge.cpp:47
+#: src/challenges/challenge.cpp:50
 #, c-format
 msgid "New game mode '%s' now available"
 msgstr ""
 
-#: src/challenges/challenge.cpp:64
+#: src/states_screens/race_result_gui.cpp:698
+msgid "New highscore!"
+msgstr ""
+
+#: src/challenges/challenge.cpp:74
 #, c-format
 msgid "New kart '%s' now available"
 msgstr ""
 
-#: src/challenges/challenge.cpp:41
+#: src/challenges/challenge.cpp:45
 #, c-format
 msgid "New track '%s' now available"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:144
+#: src/states_screens/options_screen_input2.cpp:191
 msgid "Nitro"
 msgstr ""
 
 #. I18N: ./data/karts/nolok/kart.xml
-#: data/po/gui_strings.h:704
+#: data/po/gui_strings.h:823
 msgid "Nolok"
 msgstr ""
 
+#. I18N: if no kart animations are enabled
+#: src/states_screens/options_screen_video.cpp:297
+msgid "None"
+msgstr ""
+
 #. I18N: Game mode
-#: src/race/race_manager.hpp:144
+#: src/race/race_manager.hpp:143
 msgid "Normal Race"
 msgstr ""
 
+#. I18N: ./data/tracks/snowmountain/track.xml
+#: data/po/gui_strings.h:53
+msgid "Northern Resort"
+msgstr ""
+
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:553
+#: data/po/gui_strings.h:656
 msgid "Novice"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: In race setup menu
-#: data/po/gui_strings.h:549
+#: data/po/gui_strings.h:652
 msgid "Number of AI karts"
 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:474
+#: src/states_screens/dialogs/message_dialog.cpp:63
+msgid "OK"
+msgstr ""
+
+#. I18N: ./data/tracks/mines/track.xml
+#: data/po/gui_strings.h:35
+msgid "Old Mine"
+msgstr ""
+
+#. I18N: ./data/tracks/olivermath/track.xml
+#: data/po/gui_strings.h:38
+msgid "Oliver's Math Class"
+msgstr ""
+
+#: src/input/input_manager.cpp:590
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/mainaddons.stkgui
-#. I18N: Main menu button
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:266
-#: data/po/gui_strings.h:302
-#: data/po/gui_strings.h:525
+#: 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:190
-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
+#: src/states_screens/options_screen_input2.cpp:203
+msgid "Pause Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:509
+#: data/po/gui_strings.h:621
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:280
+#: src/karts/controller/player_controller.cpp:293
 msgid "Penalty time!!"
 msgstr ""
 
 #. I18N: ./data/grandprix/penguinplayground.grandprix
-#: data/po/gui_strings.h:668
+#: 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:707
+#: data/po/gui_strings.h:826
 msgid "Pidgin"
 msgstr ""
 
-#. I18N: In kart selection screen (Will read like 'Player 1 (foobartech gamepad)')
-#: src/states_screens/kart_selection.cpp:246
-#: src/states_screens/kart_selection.cpp:364
-#, c-format
-msgid "Player %i (%s)"
+#. I18N: ./data/gui/tutorial.stkgui
+#: data/po/gui_strings.h:682
+msgid "Play all"
 msgstr ""
 
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_device.stkgui
-#. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: Section in the settings menu
-#: data/po/gui_strings.h:329
-#: data/po/gui_strings.h:376
-#: data/po/gui_strings.h:406
-#: data/po/gui_strings.h:440
-#: data/po/gui_strings.h:471
+#: src/states_screens/options_screen_audio.cpp:65
+#: 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:545
 msgid "Players"
 msgstr ""
 
 #. I18N: shown when config file is too old
-#: src/input/device_manager.cpp:351
+#: src/input/device_manager.cpp:444
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/main_menu_screen.cpp:324
+msgid "Please wait while the add-ons are loading"
+msgstr ""
+
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:184
-msgid "Plunger - throw straight to pull an opponent back, or throw while looking back to make one lose sight!"
+#: data/po/gui_strings.h:345
+#, fuzzy
+msgid "Plunger - throw straight to pull an opponent back, or throw while looking back to make one lose sight."
 msgstr "Suce à toilettes - lance-la droit devant pour tirer un opposant vers l'arrière, ou lance-la en regardant vers l'arrière pour lui obstruer la vue !"
 
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:309
+#, c-format
+msgid "Post-processing (motion blur) : %s"
+msgstr ""
+
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: When configuring input
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:100
-#: data/po/gui_strings.h:506
+#: 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:498
+#: 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:414
+#: 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:448
+#: data/po/gui_strings.h:549
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
+#: src/states_screens/dialogs/addons_loading.cpp:270
+#, c-format
+msgid "Problems installing the addon '%s'."
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:284
+#, c-format
+msgid "Problems removing the addon '%s'."
+msgstr ""
+
 #. I18N: ./data/karts/puffy/kart.xml
-#: data/po/gui_strings.h:710
+#: data/po/gui_strings.h:829
 msgid "Puffy"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/mainaddons.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:278
-#: data/po/gui_strings.h:314
+#: data/po/gui_strings.h:474
 msgid "Quit"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-#. I18N: ./data/gui/mainaddons.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:254
-#: data/po/gui_strings.h:286
-msgid "Race"
-msgstr ""
-
-#: src/states_screens/dialogs/race_over_dialog.cpp:103
+#: src/states_screens/dialogs/race_over_dialog.cpp:107
 msgid "Race Results"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:545
+#: data/po/gui_strings.h:648
 msgid "Race Setup"
 msgstr ""
 
-#: src/states_screens/dialogs/race_over_dialog.cpp:382
+#: src/states_screens/dialogs/race_over_dialog.cpp:380
 msgid "Race in this track again"
 msgstr ""
 
-#: src/states_screens/arenas_screen.cpp:221
+#: src/states_screens/arenas_screen.cpp:232
 msgid "Random Arena"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:684
-#: src/states_screens/kart_selection.cpp:1519
+#: src/states_screens/kart_selection.cpp:809
+#: src/states_screens/kart_selection.cpp:1840
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
+#: src/states_screens/tracks_screen.cpp:348
 msgid "Random Track"
 msgstr ""
 
+#: src/states_screens/minimal_race_gui.cpp:106
+#: src/states_screens/race_gui.cpp:89
+msgid "Rank"
+msgstr ""
+
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:92
+#: src/states_screens/race_gui_base.cpp:54
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:222
-msgid "Regular Race - all blows allowed, so catch weapons and make clever use of them!"
+#: data/po/gui_strings.h:389
+msgid "Regular Race: all blows allowed, so catch weapons and make clever use of them!"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: Reload button to reload addon data
+#: data/po/gui_strings.h:197
+msgid "Reload"
 msgstr ""
 
 #. I18N: In the player info dialog
-#: src/states_screens/dialogs/player_info_dialog.cpp:107
+#: src/states_screens/dialogs/player_info_dialog.cpp:119
 msgid "Remove"
 msgstr ""
 
 #. I18N: In the player info dialog
-#: src/states_screens/dialogs/player_info_dialog.cpp:73
+#: src/states_screens/dialogs/player_info_dialog.cpp:85
 msgid "Rename"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:153
+#: src/states_screens/options_screen_input2.cpp:200
 msgid "Rescue"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the graphics settings
-#: data/po/gui_strings.h:483
+#: data/po/gui_strings.h:599
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:96
-#: src/states_screens/race_result_gui.cpp:109
+#: 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:521
+#: data/po/gui_strings.h:633
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:168
+#: src/states_screens/options_screen_input2.cpp:217
 msgid "Right"
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:203
-msgid "Run for second place, as the last kart will be disqualified every time the counter hits zero. Beware : going in front of the leader will get you eliminated too!"
+#. 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 ""
 
-#: src/states_screens/race_result_gui.cpp:85
+#. I18N: ./data/tracks/scotland/track.xml
+#: data/po/gui_strings.h:44
+msgid "Scotland"
+msgstr ""
+
+#. I18N: ./data/tracks/secretgarden/track.xml
+#: data/po/gui_strings.h:47
+msgid "Secret Garden"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:88
 msgid "See unlocked feature"
 msgstr ""
 
-#: src/states_screens/dialogs/race_over_dialog.cpp:355
-#: src/states_screens/race_result_gui.cpp:86
+#: src/states_screens/dialogs/race_over_dialog.cpp:353
+#: src/states_screens/race_result_gui.cpp:89
 msgid "See unlocked features"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:171
+#: src/states_screens/options_screen_input2.cpp:220
 msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:564
+#: data/po/gui_strings.h:667
 msgid "Select a game mode"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:93
+#: src/states_screens/race_gui_base.cpp:55
 msgid "Set!"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/dialogs/race_over_dialog.cpp:371
-#: src/states_screens/race_result_gui.cpp:106
-#: data/po/gui_strings.h:517
+#: src/states_screens/dialogs/race_over_dialog.cpp:369
+#: src/states_screens/race_result_gui.cpp:111
+#: data/po/gui_strings.h:629
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:147
+#: src/states_screens/options_screen_input2.cpp:194
 msgid "Sharp Turn"
 msgstr ""
 
-#. I18N: ./data/gui/options_video.stkgui
+#. I18N: ./data/tracks/sandtrack/track.xml
+#: data/po/gui_strings.h:41
+msgid "Shifting Sands"
+msgstr ""
+
+#. I18N: ./data/tracks/city/track.xml
+#: 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"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the graphics settings
-#: data/po/gui_strings.h:479
+#: data/po/gui_strings.h:564
 msgid "Skin"
 msgstr ""
 
+#. I18N: ./data/tracks/skyline/track.xml
+#: data/po/gui_strings.h:50
+msgid "Skyline"
+msgstr ""
+
 #. I18N: ./data/grandprix/snagdrive.grandprix
-#: data/po/gui_strings.h:671
+#: 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:56
+msgid "Snow Peak"
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:320
+msgid "Sorry, an error occurred while contacting the add-ons website. Make sure you are connected to the Internet and that SuperTuxKart is not blocked by a firewall"
+msgstr ""
+
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in audio/video settings submenu
-#: data/po/gui_strings.h:349
+#: data/po/gui_strings.h:497
 msgid "Sound Effects"
 msgstr ""
 
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:62
+#: data/po/gui_strings.h:217
 msgid "Standard"
 msgstr ""
 
-#: src/states_screens/dialogs/gp_info_dialog.cpp:144
+#. I18N: ./data/tracks/startrack/track.xml
+#: data/po/gui_strings.h:62
+msgid "Star Track"
+msgstr ""
+
+#: src/states_screens/dialogs/gp_info_dialog.cpp:145
 msgid "Start Grand Prix"
 msgstr ""
 
-#: src/states_screens/dialogs/track_info_dialog.cpp:139
+#: src/states_screens/dialogs/track_info_dialog.cpp:152
 msgid "Start Race"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:129
+#: src/states_screens/options_screen_input2.cpp:176
 msgid "Steer Left"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:132
+#: src/states_screens/options_screen_input2.cpp:179
 msgid "Steer Right"
 msgstr ""
 
+#. I18N: ./data/gui/addons_screen.stkgui
+#: data/po/gui_strings.h:193
+msgid "SuperTuxKart Addons"
+msgstr ""
+
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:112
-#: data/po/gui_strings.h:159
-#: data/po/gui_strings.h:203
+#. I18N: ./data/gui/help4.stkgui
+#: 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 ""
 
-#. I18N: ./data/gui/addons.stkgui
-#. I18N: ./data/gui/addons_update.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:2
-#: data/po/gui_strings.h:21
-#: data/po/gui_strings.h:317
-#: data/po/gui_strings.h:364
-#: data/po/gui_strings.h:394
-#: data/po/gui_strings.h:428
-#: data/po/gui_strings.h:459
+#: 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:427
+msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
+msgstr ""
+
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:218
+#: data/po/gui_strings.h:385
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:196
-msgid "Swapper - gift boxes are transformed into bananas and vice versa for a short time"
+#: src/main.cpp:1033
+msgid "SuperTuxKart may connect to a server to download add-ons and notify you of updates. Would you like this feature to be enabled? (To change this setting at a later time, go to options, select tab 'User Interface', and edit \"Allow STK to connect to the Internet\")."
 msgstr ""
 
-#. I18N: ./data/grandprix/test.grandprix
-#: data/po/gui_strings.h:674
-msgid "Test"
+#. I18N: ./data/karts/suzanne/kart.xml
+#: data/po/gui_strings.h:832
+msgid "Suzanne"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:357
+msgid "Swapper - gift boxes are transformed into bananas and vice versa for a short 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
+#: src/states_screens/options_screen_ui.cpp:163
+msgid "System Language"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:148
+#: 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 ""
 
-#: src/items/powerup.cpp:64
+#. I18N: ./data/tracks/islandtrack/track.xml
+#: data/po/gui_strings.h:26
+msgid "The Island"
+msgstr ""
+
+#: src/items/powerup.cpp:65
 msgid "The Space Shuttle has landed!"
 msgstr ""
 
-#: src/race/highscore_manager.cpp:96
+#. I18N: ./data/tracks/stadium/track.xml
+#: data/po/gui_strings.h:59
+msgid "The Stadium"
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:316
+msgid "The add-ons module is currently disabled in the Options screen"
+msgstr ""
+
+#: src/race/highscore_manager.cpp:98
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
 msgstr ""
 
-#: src/states_screens/dialogs/gp_info_dialog.cpp:149
+#: src/states_screens/dialogs/gp_info_dialog.cpp:150
 msgid "This Grand Prix is broken!"
 msgstr ""
 
-#: src/states_screens/dialogs/race_over_dialog.cpp:690
+#: src/states_screens/dialogs/race_over_dialog.cpp:677
 msgid "Time"
 msgstr ""
 
 #. I18N: Game mode
-#: src/race/race_manager.hpp:146
+#: src/race/race_manager.hpp:145
 msgid "Time Trial"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:226
+#: data/po/gui_strings.h:393
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
-#: src/states_screens/dialogs/add_device_dialog.cpp:49
+#: src/states_screens/dialogs/add_device_dialog.cpp:52
 msgid ""
 "To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
@@ -1332,196 +1682,333 @@ msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:175
+#: 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:677
+#: data/po/gui_strings.h:182
+#: data/po/gui_strings.h:793
 msgid "To the Moon and Back"
 msgstr ""
 
+#. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
+#: src/states_screens/race_gui.cpp:92
+#, c-format
+msgid "Top %i"
+msgstr ""
+
 #. I18N: when showing who is the author of track '%s' (place %s where the name of the author should appear)
-#: src/states_screens/dialogs/track_info_dialog.cpp:73
+#: src/states_screens/dialogs/track_info_dialog.cpp:78
 #, c-format
 msgid "Track by %s"
 msgstr ""
 
-#. I18N: ./data/gui/addons.stkgui
+#. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: Section in the addons menu
-#. I18N: ./data/gui/addons_update.stkgui
-#. I18N: Section in the addons menu
-#: data/po/gui_strings.h:10
-#: data/po/gui_strings.h:29
+#: data/po/gui_strings.h:205
 msgid "Tracks"
 msgstr ""
 
+#: src/states_screens/dialogs/addons_loading.cpp:294
+msgid "Try again"
+msgstr ""
+
+#. I18N: ./data/gui/tutorial.stkgui
+#. I18N: Title for tutorials screen
+#: data/po/gui_strings.h:679
+msgid "Tutorial : Selection Room"
+msgstr ""
+
 #. I18N: ./data/karts/tux/kart.xml
-#: data/po/gui_strings.h:713
+#: data/po/gui_strings.h:835
 msgid "Tux"
 msgstr ""
 
+#. I18N: ./data/tracks/tuxtollway/track.xml
+#: data/po/gui_strings.h:65
+msgid "Tux Tollway"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:66
+msgid "Uninstall"
+msgstr ""
+
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:159
+#: src/states_screens/options_screen_input2.cpp:208
 msgid "Up"
 msgstr ""
 
-#. I18N: ./data/gui/addons.stkgui
-#. I18N: Section in the addons menu
-#. I18N: ./data/gui/addons_update.stkgui
-#. I18N: Section in the addons menu
-#: data/po/gui_strings.h:14
-#: data/po/gui_strings.h:33
+#: src/states_screens/dialogs/addons_loading.cpp:64
 msgid "Update"
 msgstr ""
 
-#: src/states_screens/addons_screen.cpp:150
-msgid "Updating the list..."
+#: src/states_screens/addons_screen.cpp:77
+msgid "Updated date"
 msgstr ""
 
-#. I18N: ./data/gui/addons_view_dialog.stkgui
-#: data/po/gui_strings.h:50
-msgid "Version:"
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+#: data/po/gui_strings.h:595
+msgid "Use Frame Buffer Objects (requires restart)"
 msgstr ""
 
-#: src/states_screens/dialogs/addons_loading.cpp:72
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:64
+#: 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:560
+msgid "User Interface"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:92
 #, c-format
-msgid "Version: %i"
+msgid "Version: %d"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+#: data/po/gui_strings.h:591
+msgid "Vertical Sync (requires restart)"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Music volume in options
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Sound volume in options
-#: data/po/gui_strings.h:345
-#: data/po/gui_strings.h:357
+#: data/po/gui_strings.h:493
+#: data/po/gui_strings.h:505
 msgid "Volume"
 msgstr ""
 
-#: src/modes/linear_world.cpp:837
+#: src/modes/linear_world.cpp:756
 msgid "WRONG WAY!"
 msgstr ""
 
+#: 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 working."
+msgstr ""
+
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:120
-#: data/po/gui_strings.h:167
-#: data/po/gui_strings.h:211
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+#: 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 ""
 
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:302
+#, c-format
+msgid "Weather Effects : %s"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: In the help menu
+#: 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, each player can press on the 'fire' key of their gamepad or keyboard to join the game. Each player can use their input device to select their kart. The game continues when everyone selected their kart. Note that the mouse may not be used for this operation."
+msgstr ""
+
 #. I18N: ./data/karts/wilber/kart.xml
-#: data/po/gui_strings.h:716
+#: data/po/gui_strings.h:838
 msgid "Wilber"
 msgstr ""
 
-#. I18N: ./data/followtheleader.challenge
-#: data/po/gui_strings.h:581
+#. I18N: ./data/challenges/followtheleader.challenge
+#: data/po/gui_strings.h:98
+#: data/po/gui_strings.h:709
 msgid "Win Penguin Playground Grand Prix"
 msgstr ""
 
-#. I18N: ./data/followtheleader.challenge
-#: data/po/gui_strings.h:584
-msgid "Win Penguin Playground Grand Prix with 3 'Racer' Level AI karts."
+#. I18N: ./data/challenges/followtheleader.challenge
+#: 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/grandprix/snagdrive.challenge
-#: data/po/gui_strings.h:599
+#. I18N: ./data/challenges/snagdrive.challenge
+#: data/po/gui_strings.h:146
+#: data/po/gui_strings.h:757
 msgid "Win To the Moon and Back Grand Prix"
 msgstr ""
 
-#. I18N: ./data/tracks/fortmagma/fortmagma.challenge
-#: data/po/gui_strings.h:638
-msgid "Win a 1 lap Head to Head on Tux Tollway against 1 'Racer' level AI kart."
+#. I18N: ./data/challenges/skyline.challenge
+#: 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/karts/gnu/gnu.challenge
-#: data/po/gui_strings.h:614
-msgid "Win a 4 lap race on Snow Mountain against 4 'Racer' level AI kart."
+#. I18N: ./data/challenges/xr591.challenge
+#: 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/tracks/city/city.challenge
-#: data/po/gui_strings.h:626
-msgid "Win a Follow the Leader race with 3 AI karts in the Amazonian Jungle."
+#. I18N: ./data/challenges/gnu.challenge
+#: 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/grandprix/atworldsend.challenge
-#: data/po/gui_strings.h:596
+#. I18N: ./data/challenges/island.challenge
+#: 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: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: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/tracks/fortmagma/fortmagma.challenge
-#: data/po/gui_strings.h:635
-msgid "Win a Head to Head on Tux Tollway"
+#. I18N: ./data/challenges/lighthouse.challenge
+#: 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/karts/gnu/gnu.challenge
-#: data/po/gui_strings.h:611
+#. I18N: ./data/challenges/skyline.challenge
+#: 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:164
+#: data/po/gui_strings.h:775
+msgid "Win a race on Canyon"
+msgstr ""
+
+#. I18N: ./data/challenges/gnu.challenge
+#: 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:122
+#: data/po/gui_strings.h:733
 msgid "Win a race on Snow Mountain"
 msgstr ""
 
-#. I18N: ./data/grandprix/alltracks.challenge
-#: data/po/gui_strings.h:587
+#. I18N: ./data/challenges/canyon.challenge
+#: 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:74
+#: data/po/gui_strings.h:685
 msgid "Win the At World's End Grand Prix"
 msgstr ""
 
-#. I18N: ./data/grandprix/snagdrive.challenge
-#: data/po/gui_strings.h:602
-msgid "Win the To the Moon and Back Grand Prix with 3 'Racer' Level AI karts."
+#. I18N: ./data/challenges/snagdrive.challenge
+#: 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 ""
 
-#: src/karts/kart.cpp:498
-#: src/karts/kart.cpp:517
+#. I18N: ./data/tracks/xr591/track.xml
+#: 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:233
+msgid "Yes"
+msgstr ""
+
+#: src/states_screens/grand_prix_win.cpp:368
+msgid "You completed the Grand Prix!"
+msgstr ""
+
+#: src/karts/kart.cpp:615
+#: src/karts/kart.cpp:634
 msgid "You finished the race!"
 msgstr ""
 
-#: src/modes/world.cpp:619
+#: src/modes/world.cpp:793
 msgid "You have been eliminated!"
 msgstr ""
 
-#: src/states_screens/dialogs/race_over_dialog.cpp:343
-#: src/states_screens/grand_prix_win.cpp:90
+#: 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:104
 msgid "You unlocked a new feature!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:349
-msgid "You won the Grand Prix!"
+#: 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:498
-#: src/karts/kart.cpp:517
+#: src/karts/kart.cpp:615
+#: src/karts/kart.cpp:634
 msgid "You won the race!"
 msgstr ""
 
-#: src/config/user_config.cpp:423
+#: src/config/user_config.cpp:585
 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:595
 msgid "Your config file was too old, so it was deleted and a new one will be created."
 msgstr ""
 
-#: src/input/device_manager.cpp:353
+#: src/input/device_manager.cpp:446
 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:71
+msgid "Zen Garden"
+msgstr ""
+
 #. I18N: Unbound key binding
-#. I18N: ./data/gui/options_device.stkgui
-#: src/input/input.cpp:39
-#: data/po/gui_strings.h:383
+#: src/input/binding.cpp:87
 msgid "[none]"
 msgstr ""
 
-#. I18N: ./data/karts/mriceblock/kart.xml
-#: data/po/gui_strings.h:701
-msgid "mr. iceblock"
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#: src/states_screens/race_gui_base.cpp:459
+msgid "by"
 msgstr ""
 
-#: src/states_screens/credits.cpp:229
+#: src/states_screens/dialogs/addons_loading.cpp:120
+msgid "featured"
+msgstr ""
+
+#. I18N: arena group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:70
+#: src/states_screens/kart_selection.cpp:914
+#: src/states_screens/tracks_screen.cpp:193
+msgid "standard"
+msgstr ""
+
+#: src/states_screens/credits.cpp:228
 msgid "translator-credits"
 msgstr ""