From 8eaea2b1ba84a21e48e6171acfe9a21dc4cd2fa6 Mon Sep 17 00:00:00 2001
From: hikerstk <hikerstk@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Wed, 30 Oct 2013 02:59:43 +0000
Subject: [PATCH] Fixed typo in string, updated pot file.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14347 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/help3.stkgui    | Bin 8210 -> 8212 bytes
 data/po/supertuxkart.pot | 544 ++++++++++++++++++++-------------------
 2 files changed, 275 insertions(+), 269 deletions(-)

diff --git a/data/gui/help3.stkgui b/data/gui/help3.stkgui
index f28e32c195d7c6bcb67e43a125c1308e1a87783b..4b5c30c84313e291979ecb46f67a0eaf02ff3e2d 100644
GIT binary patch
delta 14
VcmbQ_FvVd*k_=<==0ur|%m67t1swnY

delta 12
TcmbQ@Fv(#<lFa55nGMVUAxs3j

diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index 6337e013e..bba84a5b7 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: 2013-10-29 19:58-0400\n"
+"POT-Creation-Date: 2013-10-30 13:57+1100\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"
@@ -26,7 +26,7 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml
 #. I18N: ./data/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:98 data/po/gui_strings.h:101
+#: data/po/gui_strings.h:104 data/po/gui_strings.h:107
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
@@ -107,7 +107,7 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info_dialog.stkgui
 #. I18N: In the track setup screen (number of laps choice, where %i is the number)
-#: data/po/gui_strings.h:133
+#: data/po/gui_strings.h:322
 #, c-format
 msgid "%i laps"
 msgstr ""
@@ -199,13 +199,13 @@ msgstr ""
 #. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info_dialog.stkgui
 #: src/states_screens/dialogs/track_info_dialog.cpp:226
-#: data/po/gui_strings.h:119 data/po/gui_strings.h:122
-#: data/po/gui_strings.h:125
+#: data/po/gui_strings.h:308 data/po/gui_strings.h:311
+#: data/po/gui_strings.h:314
 msgid "(Empty)"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:312
+#: data/po/gui_strings.h:247
 msgid "(network play is not yet available)"
 msgstr ""
 
@@ -215,13 +215,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:779
+#: data/po/gui_strings.h:652
 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:488
+#: data/po/gui_strings.h:766
 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 "
@@ -230,7 +230,7 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:592
+#: data/po/gui_strings.h:222
 msgid ""
 "* Which config to use will be inferred from which 'fire' key is pressed to "
 "join the game."
@@ -263,7 +263,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:476
+#: data/po/gui_strings.h:754
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -282,7 +282,7 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info_dialog.stkgui
-#: data/po/gui_strings.h:116
+#: data/po/gui_strings.h:305
 msgid "= Highscores ="
 msgstr ""
 
@@ -296,7 +296,7 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:710
+#: data/po/gui_strings.h:552
 msgid "About"
 msgstr ""
 
@@ -324,7 +324,7 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In players configuration menu
-#: data/po/gui_strings.h:518
+#: data/po/gui_strings.h:520
 msgid "Add Player"
 msgstr ""
 
@@ -335,18 +335,18 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:589
+#: data/po/gui_strings.h:219
 msgid "Add a device"
 msgstr ""
 
+#. I18N: arena group name
 #. I18N: track group name
 #. I18N: kart group name
-#. I18N: arena group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
+#: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/tracks_screen.cpp:176
-#: src/states_screens/kart_selection.cpp:1042
-#: src/states_screens/arenas_screen.cpp:81 data/po/gui_strings.h:803
+#: src/states_screens/kart_selection.cpp:1042 data/po/gui_strings.h:591
 msgid "Add-Ons"
 msgstr ""
 
@@ -356,33 +356,33 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:694
+#: data/po/gui_strings.h:536
 msgid "Addons"
 msgstr ""
 
 #. I18N: ./data/karts/adiumy/kart.xml
-#: data/po/gui_strings.h:849
+#: data/po/gui_strings.h:873
 msgid "Adiumy"
 msgstr ""
 
-#. 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 arenas from all groups
 #. I18N: name of the tab that will show tracks from all groups
 #. I18N: Time filters for add-ons
-#. 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: ./data/gui/arenas.stkgui
 #. I18N: track group
+#: src/states_screens/arenas_screen.cpp:73
 #: src/states_screens/tracks_screen.cpp:168
-#: src/states_screens/options_screen_video.cpp:353
-#: src/states_screens/kart_selection.cpp:1034
 #: src/states_screens/addons_screen.cpp:46
-#: src/states_screens/arenas_screen.cpp:73 data/po/gui_strings.h:807
+#: src/states_screens/kart_selection.cpp:1034
+#: src/states_screens/options_screen_video.cpp:353 data/po/gui_strings.h:595
 msgid "All"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
-#: data/po/gui_strings.h:733
+#: data/po/gui_strings.h:200
 msgid "All Tracks"
 msgstr ""
 
@@ -392,23 +392,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:674
+#: data/po/gui_strings.h:457
 msgid "Allow STK to connect to the Internet"
 msgstr ""
 
 #. I18N: ./data/tracks/jungle/track.xml
-#: data/po/gui_strings.h:2
+#: data/po/gui_strings.h:20
 msgid "Amazonian Journey"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:177
+#: data/po/gui_strings.h:693
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:232
+#: data/po/gui_strings.h:419
 msgid "Animated Characters"
 msgstr ""
 
@@ -420,7 +420,7 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:224
+#: data/po/gui_strings.h:411
 msgid "Animated Scenery"
 msgstr ""
 
@@ -432,7 +432,7 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:240
+#: data/po/gui_strings.h:427
 msgid "Anti-aliasing (requires restart)"
 msgstr ""
 
@@ -444,7 +444,7 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings menu
-#: data/po/gui_strings.h:401
+#: data/po/gui_strings.h:302
 msgid "Apply new resolution"
 msgstr ""
 
@@ -457,12 +457,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:618 data/po/gui_strings.h:795
+#: data/po/gui_strings.h:579 data/po/gui_strings.h:583
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ./data/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:8
+#: data/po/gui_strings.h:50
 msgid "Around the lighthouse"
 msgstr ""
 
@@ -474,28 +474,28 @@ msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:721
+#: data/po/gui_strings.h:468
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:104 data/po/gui_strings.h:810
+#: data/po/gui_strings.h:116 data/po/gui_strings.h:822
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input.cpp:138
 #: src/states_screens/options_screen_input2.cpp:71
-#: src/states_screens/options_screen_video.cpp:87
+#: src/states_screens/options_screen_input.cpp:138
+#: src/states_screens/options_screen_players.cpp:71
 #: src/states_screens/options_screen_ui.cpp:112
-#: src/states_screens/options_screen_players.cpp:71 data/po/gui_strings.h:338
+#: src/states_screens/options_screen_video.cpp:87 data/po/gui_strings.h:145
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:618 data/po/gui_strings.h:763
+#: src/tracks/track_object_presentation.cpp:618 data/po/gui_strings.h:636
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -519,19 +519,19 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-ons screen action
-#: src/states_screens/dialogs/addons_loading.cpp:260 data/po/gui_strings.h:791
+#: src/states_screens/dialogs/addons_loading.cpp:260 data/po/gui_strings.h:192
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:525
+#: data/po/gui_strings.h:482
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:628
+#: data/po/gui_strings.h:332
 msgid "Back to Race"
 msgstr ""
 
@@ -541,13 +541,13 @@ msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:438
+#: data/po/gui_strings.h:404
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:541
+#: data/po/gui_strings.h:498
 msgid "Back to menu"
 msgstr ""
 
@@ -560,24 +560,24 @@ msgid "Banana? Box? Banana? Box? Banana? Box?"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:183
+#: data/po/gui_strings.h:699
 msgid ""
 "Basket Ball - bounces after the leader, and might squash and slow down karts "
 "down on the way."
 msgstr ""
 
 #. I18N: ./data/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:26
+#: data/po/gui_strings.h:29
 msgid "Battle Island"
 msgstr ""
 
 #. I18N: ./data/karts/beagle/kart.xml
-#: data/po/gui_strings.h:822
+#: data/po/gui_strings.h:843
 msgid "Beagle"
 msgstr ""
 
 #. I18N: ./data/karts/beastie/kart.xml
-#: data/po/gui_strings.h:837
+#: data/po/gui_strings.h:855
 msgid "Beastie"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Better luck next time!"
 msgstr ""
 
 #. I18N: ./data/tracks/mansion/track.xml
-#: data/po/gui_strings.h:44
+#: data/po/gui_strings.h:35
 msgid "Blackhill Mansion"
 msgstr ""
 
@@ -595,13 +595,14 @@ msgstr ""
 msgid "Blue Team Wins"
 msgstr ""
 
+#. I18N: ./data/tracks/farm.new/track.xml
 #. I18N: ./data/tracks/farm/track.xml
-#: data/po/gui_strings.h:56
+#: data/po/gui_strings.h:23 data/po/gui_strings.h:44
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:171
+#: data/po/gui_strings.h:687
 msgid ""
 "Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
 "backwards."
@@ -613,7 +614,7 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:162
+#: data/po/gui_strings.h:678
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -621,17 +622,17 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml
 #. I18N: ./data/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:86 data/po/gui_strings.h:89
+#: data/po/gui_strings.h:92 data/po/gui_strings.h:95
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:165
+#: data/po/gui_strings.h:681
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:149 src/addons/network_http.cpp:432
+#: src/addons/network_http.cpp:432 src/addons/news_manager.cpp:149
 msgid "Can't access stkaddons server..."
 msgstr ""
 
@@ -645,13 +646,13 @@ msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
+#. I18N: ./data/gui/story_mode_new.stkgui
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
 #. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/story_mode_new.stkgui
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
 #: src/states_screens/dialogs/player_info_dialog.cpp:106
-#: src/states_screens/dialogs/addons_loading.cpp:226 data/po/gui_strings.h:213
-#: data/po/gui_strings.h:496 data/po/gui_strings.h:566
+#: src/states_screens/dialogs/addons_loading.cpp:226 data/po/gui_strings.h:263
+#: data/po/gui_strings.h:381 data/po/gui_strings.h:389
 msgid "Cancel"
 msgstr ""
 
@@ -671,7 +672,7 @@ msgid "Cannot add a player with this name."
 msgstr ""
 
 #. I18N: ./data/tracks/cave/track.xml
-#: data/po/gui_strings.h:23
+#: data/po/gui_strings.h:26
 msgid "Cave X"
 msgstr ""
 
@@ -685,29 +686,29 @@ msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:324
+#: data/po/gui_strings.h:502
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:423
+#: data/po/gui_strings.h:606
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:755
+#: data/po/gui_strings.h:628
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:251
+#: data/po/gui_strings.h:438
 msgid "Close"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:759
+#: data/po/gui_strings.h:632
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
@@ -727,7 +728,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:767
+#: data/po/gui_strings.h:640
 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 "
@@ -755,28 +756,28 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
+#. I18N: ./data/gui/grand_prix_win.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#: src/states_screens/race_result_gui.cpp:123 data/po/gui_strings.h:217
-#: data/po/gui_strings.h:419 data/po/gui_strings.h:595
-#: data/po/gui_strings.h:621 data/po/gui_strings.h:655
+#: src/states_screens/race_result_gui.cpp:123 data/po/gui_strings.h:180
+#: data/po/gui_strings.h:204 data/po/gui_strings.h:475
+#: data/po/gui_strings.h:795 data/po/gui_strings.h:813
 msgid "Continue"
 msgstr ""
 
-#. I18N: ./data/gui/options_device.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:90
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_players.cpp:73
 #: src/states_screens/options_screen_ui.cpp:114
-#: src/states_screens/options_screen_players.cpp:73 data/po/gui_strings.h:430
-#: data/po/gui_strings.h:581
+#: src/states_screens/options_screen_audio.cpp:66
+#: src/states_screens/options_screen_video.cpp:90 data/po/gui_strings.h:211
+#: data/po/gui_strings.h:396
 msgid "Controls"
 msgstr ""
 
@@ -786,13 +787,13 @@ msgstr ""
 
 #. I18N: ./data/gui/story_mode_lobby.stkgui
 #. I18N: In story mode 'select a game slot' menu
-#: data/po/gui_strings.h:261
+#: data/po/gui_strings.h:712
 msgid "Create a new player"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:500
+#: data/po/gui_strings.h:716
 msgid "Credits"
 msgstr ""
 
@@ -803,16 +804,21 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:377
+#: data/po/gui_strings.h:278
 msgid "Custom settings..."
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: To delete a keyboard configuration
-#: src/states_screens/options_screen_input2.cpp:96 data/po/gui_strings.h:434
+#: src/states_screens/options_screen_input2.cpp:96 data/po/gui_strings.h:400
 msgid "Delete Configuration"
 msgstr ""
 
+#. I18N: ./data/tracks/dp/track.xml
+#: data/po/gui_strings.h:5
+msgid "Desert Point"
+msgstr ""
+
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:81
 #: src/states_screens/options_screen_input2.cpp:516
@@ -821,15 +827,15 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/options_screen_video.cpp:351
 #: src/states_screens/dialogs/custom_video_settings.cpp:56
 #: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/options_screen_video.cpp:351
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:670
+#: data/po/gui_strings.h:453
 msgid "Display FPS"
 msgstr ""
 
@@ -863,8 +869,8 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:484
-msgid "Egg hunt: Explore traks to find all hidden eggs."
+#: data/po/gui_strings.h:762
+msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
 #: src/modes/easter_egg_hunt.cpp:202
@@ -883,7 +889,7 @@ msgid "Eliminated"
 msgstr ""
 
 #. I18N: ./data/karts/emule/kart.xml
-#: data/po/gui_strings.h:855
+#: data/po/gui_strings.h:846
 msgid "Emule"
 msgstr ""
 
@@ -897,8 +903,8 @@ msgstr ""
 #. 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:348 data/po/gui_strings.h:346
-#: data/po/gui_strings.h:358
+#: src/states_screens/options_screen_video.cpp:348 data/po/gui_strings.h:153
+#: data/po/gui_strings.h:165
 msgid "Enabled"
 msgstr ""
 
@@ -909,7 +915,7 @@ msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:570
+#: data/po/gui_strings.h:173
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -921,18 +927,18 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:652
+#: data/po/gui_strings.h:356
 msgid "Exit Race"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Difficulty
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/story_mode_new.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:205 data/po/gui_strings.h:280
-#: data/po/gui_strings.h:560
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#: data/po/gui_strings.h:138 data/po/gui_strings.h:375
+#: data/po/gui_strings.h:785
 msgid "Expert"
 msgstr ""
 
@@ -957,7 +963,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:316
+#: data/po/gui_strings.h:251
 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 "
@@ -978,7 +984,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:472
+#: data/po/gui_strings.h:750
 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 "
@@ -997,7 +1003,7 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:393
+#: data/po/gui_strings.h:294
 msgid "Fullscreen"
 msgstr ""
 
@@ -1011,16 +1017,16 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:151 data/po/gui_strings.h:302
-#: data/po/gui_strings.h:453 data/po/gui_strings.h:748
+#. 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:237 data/po/gui_strings.h:621
+#: data/po/gui_strings.h:667 data/po/gui_strings.h:731
 msgid "Game Modes"
 msgstr ""
 
@@ -1036,16 +1042,16 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:143 data/po/gui_strings.h:294
-#: data/po/gui_strings.h:445 data/po/gui_strings.h:740
+#. 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:229 data/po/gui_strings.h:613
+#: data/po/gui_strings.h:659 data/po/gui_strings.h:723
 msgid "General"
 msgstr ""
 
@@ -1055,12 +1061,12 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:640
+#: data/po/gui_strings.h:344
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/karts/gnu/kart.xml
-#: data/po/gui_strings.h:843
+#: data/po/gui_strings.h:834
 msgid "Gnu"
 msgstr ""
 
@@ -1072,7 +1078,7 @@ msgstr ""
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:140
-#: data/po/gui_strings.h:729
+#: data/po/gui_strings.h:196
 msgid "Grand Prix"
 msgstr ""
 
@@ -1082,27 +1088,27 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the graphics settings
-#: data/po/gui_strings.h:373
+#: data/po/gui_strings.h:274
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input.cpp:137
-#: src/states_screens/options_screen_audio.cpp:63
 #: src/states_screens/options_screen_input2.cpp:70
+#: src/states_screens/options_screen_input.cpp:137
+#: src/states_screens/options_screen_players.cpp:70
 #: src/states_screens/options_screen_ui.cpp:111
-#: src/states_screens/options_screen_players.cpp:70 data/po/gui_strings.h:369
+#: src/states_screens/options_screen_audio.cpp:63 data/po/gui_strings.h:270
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:220
+#: data/po/gui_strings.h:407
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ./data/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:68
+#: data/po/gui_strings.h:11
 msgid "Green Valley"
 msgstr ""
 
@@ -1111,23 +1117,23 @@ msgid "Guest"
 msgstr ""
 
 #. I18N: ./data/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:29
+#: data/po/gui_strings.h:68
 msgid "Hacienda"
 msgstr ""
 
-#. I18N: ./data/gui/overworld_dialog.stkgui
-#. I18N: Race paused button
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: Race paused button
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:537 data/po/gui_strings.h:648
-#: data/po/gui_strings.h:702
+#: data/po/gui_strings.h:352 data/po/gui_strings.h:494
+#: data/po/gui_strings.h:544
 msgid "Help"
 msgstr ""
 
 #. I18N: ./data/karts/hexley/kart.xml
-#: data/po/gui_strings.h:828
+#: data/po/gui_strings.h:831
 msgid "Hexley"
 msgstr ""
 
@@ -1148,13 +1154,13 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml
 #. I18N: ./data/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:92 data/po/gui_strings.h:95
+#: data/po/gui_strings.h:98 data/po/gui_strings.h:101
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:771
+#: data/po/gui_strings.h:644
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
@@ -1167,18 +1173,18 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:783
+#: data/po/gui_strings.h:184
 msgid "Install"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Difficulty
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/story_mode_new.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:201 data/po/gui_strings.h:276
-#: data/po/gui_strings.h:556
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#: data/po/gui_strings.h:134 data/po/gui_strings.h:371
+#: data/po/gui_strings.h:781
 msgid "Intermediate"
 msgstr ""
 
@@ -1188,13 +1194,13 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: Section in the addons menu
-#: data/po/gui_strings.h:610
+#: data/po/gui_strings.h:571
 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:492
+#: data/po/gui_strings.h:385
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1209,13 +1215,13 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ./data/karts/konqi/kart.xml
-#: data/po/gui_strings.h:846
+#: data/po/gui_strings.h:867
 msgid "Konqi"
 msgstr ""
 
 #. I18N: Shown at the end of a race
-#: src/states_screens/race_gui_overworld.cpp:106
 #: src/states_screens/race_gui.cpp:103
+#: src/states_screens/race_gui_overworld.cpp:106
 msgid "Lap"
 msgstr ""
 
@@ -1247,13 +1253,13 @@ msgstr ""
 msgid "Locked"
 msgstr ""
 
+#: src/states_screens/arenas_screen.cpp:239
+#: src/states_screens/arenas_screen.cpp:269
 #: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/tracks_screen.cpp:328
 #: src/states_screens/kart_selection.cpp:938
 #: src/states_screens/kart_selection.cpp:2064
 #: src/states_screens/kart_selection.cpp:2096
-#: src/states_screens/arenas_screen.cpp:239
-#: src/states_screens/arenas_screen.cpp:269
 #: src/states_screens/race_setup_screen.cpp:271
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
@@ -1282,13 +1288,13 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ./data/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:5
+#: data/po/gui_strings.h:53
 msgid "Minigolf Mischief"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:678
+#: data/po/gui_strings.h:461
 msgid "Minimal Race GUI"
 msgstr ""
 
@@ -1306,31 +1312,31 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:690
+#: data/po/gui_strings.h:532
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:155 data/po/gui_strings.h:306
-#: data/po/gui_strings.h:457 data/po/gui_strings.h:752
+#. 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:241 data/po/gui_strings.h:625
+#: data/po/gui_strings.h:671 data/po/gui_strings.h:735
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the audio/video settings submenu
-#: data/po/gui_strings.h:342
+#: data/po/gui_strings.h:149
 msgid "Music"
 msgstr ""
 
 #. I18N: ./data/gui/story_mode_new.stkgui
-#: data/po/gui_strings.h:544
+#: data/po/gui_strings.h:359
 msgid "New Game"
 msgstr ""
 
@@ -1373,7 +1379,7 @@ msgid "Nitro challenge"
 msgstr ""
 
 #. I18N: ./data/karts/nolok/kart.xml
-#: data/po/gui_strings.h:834
+#: data/po/gui_strings.h:840
 msgid "Nolok"
 msgstr ""
 
@@ -1388,7 +1394,7 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ./data/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:17
+#: data/po/gui_strings.h:71
 msgid "Northern Resort"
 msgstr ""
 
@@ -1400,12 +1406,12 @@ msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Difficulty
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/story_mode_new.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:197 data/po/gui_strings.h:272
-#: data/po/gui_strings.h:552
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#: data/po/gui_strings.h:130 data/po/gui_strings.h:367
+#: data/po/gui_strings.h:777
 msgid "Novice"
 msgstr ""
 
@@ -1416,13 +1422,13 @@ msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: In race setup menu
-#: data/po/gui_strings.h:268
+#: data/po/gui_strings.h:773
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup menu
-#: data/po/gui_strings.h:408
+#: data/po/gui_strings.h:802
 msgid "Number of goals to win"
 msgstr ""
 
@@ -1432,23 +1438,23 @@ msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:107 data/po/gui_strings.h:813
+#: data/po/gui_strings.h:119 data/po/gui_strings.h:825
 msgid "Off the beaten track"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml
 #. I18N: ./data/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:80 data/po/gui_strings.h:83
+#: data/po/gui_strings.h:86 data/po/gui_strings.h:89
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ./data/tracks/mines/track.xml
-#: data/po/gui_strings.h:32
+#: data/po/gui_strings.h:77
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ./data/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:20
+#: data/po/gui_strings.h:8
 msgid "Oliver's Math Class"
 msgstr ""
 
@@ -1461,19 +1467,19 @@ msgstr ""
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
 
-#. I18N: ./data/gui/overworld_dialog.stkgui
-#. I18N: Race paused button
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: Race paused button
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:533 data/po/gui_strings.h:644
-#: data/po/gui_strings.h:698
+#: data/po/gui_strings.h:348 data/po/gui_strings.h:490
+#: data/po/gui_strings.h:540
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:174
+#: data/po/gui_strings.h:690
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
@@ -1482,9 +1488,9 @@ msgstr ""
 msgid "Pause Game"
 msgstr ""
 
-#. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:521 data/po/gui_strings.h:624
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#: data/po/gui_strings.h:328 data/po/gui_strings.h:478
 msgid "Paused"
 msgstr ""
 
@@ -1498,13 +1504,13 @@ msgid "Penguin Playground"
 msgstr ""
 
 #. I18N: ./data/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:852
+#: data/po/gui_strings.h:858
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:248
+#: data/po/gui_strings.h:435
 msgid "Pixel Shaders"
 msgstr ""
 
@@ -1515,17 +1521,17 @@ msgid "Pixel shaders : %s"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:331
+#: data/po/gui_strings.h:602
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input.cpp:140
-#: src/states_screens/options_screen_audio.cpp:65
 #: src/states_screens/options_screen_input2.cpp:73
-#: src/states_screens/options_screen_video.cpp:89
-#: src/states_screens/options_screen_ui.cpp:113 data/po/gui_strings.h:507
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_ui.cpp:113
+#: src/states_screens/options_screen_audio.cpp:65
+#: src/states_screens/options_screen_video.cpp:89 data/po/gui_strings.h:509
 msgid "Players"
 msgstr ""
 
@@ -1543,7 +1549,7 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:168
+#: data/po/gui_strings.h:684
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
@@ -1551,7 +1557,7 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:244
+#: data/po/gui_strings.h:431
 msgid "Post-processing (motion blur)"
 msgstr ""
 
@@ -1565,24 +1571,24 @@ msgstr ""
 #. I18N: When configuring input
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:574 data/po/gui_strings.h:725
+#: data/po/gui_strings.h:177 data/po/gui_strings.h:472
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:717
+#: data/po/gui_strings.h:464
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In key bindings configuration menu
-#: data/po/gui_strings.h:585
+#: data/po/gui_strings.h:215
 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:514
+#: data/po/gui_strings.h:516
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -1611,7 +1617,7 @@ msgid "Problems removing the addon '%s'."
 msgstr ""
 
 #. I18N: ./data/karts/puffy/kart.xml
-#: data/po/gui_strings.h:840
+#: data/po/gui_strings.h:852
 msgid "Puffy"
 msgstr ""
 
@@ -1623,15 +1629,15 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:714
+#: data/po/gui_strings.h:556
 msgid "Quit"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:189 data/po/gui_strings.h:264
-#: data/po/gui_strings.h:404
+#: data/po/gui_strings.h:122 data/po/gui_strings.h:769
+#: data/po/gui_strings.h:798
 msgid "Race Setup"
 msgstr ""
 
@@ -1648,14 +1654,14 @@ msgstr ""
 msgid "Random Track"
 msgstr ""
 
-#: src/states_screens/race_gui_overworld.cpp:107
 #: src/states_screens/race_gui.cpp:104
+#: src/states_screens/race_gui_overworld.cpp:107
 msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently items with good rating
-#: data/po/gui_strings.h:606
+#: data/po/gui_strings.h:567
 msgid "Rating >="
 msgstr ""
 
@@ -1670,20 +1676,20 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:464
+#: data/po/gui_strings.h:742
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
 #. I18N: ./data/gui/story_mode_lobby.stkgui
-#: data/po/gui_strings.h:257
+#: data/po/gui_strings.h:708
 msgid "Remember me"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:397
+#: data/po/gui_strings.h:298
 msgid "Remember window location"
 msgstr ""
 
@@ -1719,7 +1725,7 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the graphics settings
-#: data/po/gui_strings.h:389
+#: data/po/gui_strings.h:290
 msgid "Resolution"
 msgstr ""
 
@@ -1729,13 +1735,13 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:636
+#: data/po/gui_strings.h:340
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/track_info_dialog.stkgui
 #. I18N: Drive the track reverse
-#: data/po/gui_strings.h:129
+#: data/po/gui_strings.h:318
 msgid "Reverse"
 msgstr ""
 
@@ -1750,12 +1756,12 @@ msgid "STK Enterprise"
 msgstr ""
 
 #. I18N: ./data/karts/sara/kart.xml
-#: data/po/gui_strings.h:831
+#: data/po/gui_strings.h:861
 msgid "Sara"
 msgstr ""
 
 #. I18N: ./data/tracks/scotland/track.xml
-#: data/po/gui_strings.h:65
+#: data/po/gui_strings.h:2
 msgid "Scotland"
 msgstr ""
 
@@ -1765,24 +1771,24 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/story_mode_lobby.stkgui
-#: data/po/gui_strings.h:254
+#: data/po/gui_strings.h:705
 msgid "Select a Player"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:287
+#: data/po/gui_strings.h:792
 msgid "Select a game mode"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:529
+#: data/po/gui_strings.h:486
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/story_mode_new.stkgui
 #. I18N: In the new story mode game dialog
-#: data/po/gui_strings.h:548
+#: data/po/gui_strings.h:363
 msgid "Select your identity"
 msgstr ""
 
@@ -1793,23 +1799,23 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:146 data/po/gui_strings.h:632
+#: src/states_screens/race_result_gui.cpp:146 data/po/gui_strings.h:336
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:50
+#: data/po/gui_strings.h:65
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ./data/tracks/city/track.xml
-#: data/po/gui_strings.h:14
+#: data/po/gui_strings.h:17
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:686
+#: data/po/gui_strings.h:528
 msgid "Single-player"
 msgstr ""
 
@@ -1825,12 +1831,12 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the graphics settings
-#: data/po/gui_strings.h:666
+#: data/po/gui_strings.h:449
 msgid "Skin"
 msgstr ""
 
 #. I18N: ./data/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:35
+#: data/po/gui_strings.h:14
 msgid "Snow Peak"
 msgstr ""
 
@@ -1840,13 +1846,13 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ./data/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:59
+#: data/po/gui_strings.h:32
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:480
+#: data/po/gui_strings.h:758
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
@@ -1866,18 +1872,18 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in audio/video settings submenu
-#: data/po/gui_strings.h:354
+#: data/po/gui_strings.h:161
 msgid "Sound Effects"
 msgstr ""
 
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:799
+#: data/po/gui_strings.h:587
 msgid "Standard"
 msgstr ""
 
 #. I18N: ./data/gui/story_mode_new.stkgui
-#: data/po/gui_strings.h:563
+#: data/po/gui_strings.h:378
 msgid "Start Game"
 msgstr ""
 
@@ -1886,7 +1892,7 @@ msgid "Start Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/track_info_dialog.stkgui
-#: data/po/gui_strings.h:136
+#: data/po/gui_strings.h:325
 msgid "Start Race"
 msgstr ""
 
@@ -1902,54 +1908,54 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:682
+#: data/po/gui_strings.h:524
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/tracks/subsea/track.xml
-#: data/po/gui_strings.h:11
+#: data/po/gui_strings.h:56
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:284
+#: data/po/gui_strings.h:789
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:598
+#: data/po/gui_strings.h:559
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help4.stkgui
-#. I18N: ./data/gui/help3.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:139 data/po/gui_strings.h:290
-#: data/po/gui_strings.h:441 data/po/gui_strings.h:736
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/help3.stkgui
+#: data/po/gui_strings.h:225 data/po/gui_strings.h:609
+#: data/po/gui_strings.h:655 data/po/gui_strings.h:719
 msgid "SuperTuxKart Help"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: ./data/gui/options_device.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
 #. I18N: ./data/gui/options_ui.stkgui
-#: data/po/gui_strings.h:334 data/po/gui_strings.h:365
-#: data/po/gui_strings.h:426 data/po/gui_strings.h:503
-#: data/po/gui_strings.h:577 data/po/gui_strings.h:658
+#. I18N: ./data/gui/options_players.stkgui
+#: data/po/gui_strings.h:141 data/po/gui_strings.h:207
+#: data/po/gui_strings.h:266 data/po/gui_strings.h:392
+#: data/po/gui_strings.h:441 data/po/gui_strings.h:505
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:309
+#: data/po/gui_strings.h:244
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:460
+#: data/po/gui_strings.h:738
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
@@ -1962,19 +1968,19 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:867
+#: data/po/gui_strings.h:837
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:180
+#: data/po/gui_strings.h:696
 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:186
+#: data/po/gui_strings.h:702
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -1985,18 +1991,18 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:236
+#: data/po/gui_strings.h:423
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:775
+#: data/po/gui_strings.h:648
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ./data/tracks/islandtrack/track.xml
-#: data/po/gui_strings.h:38
+#: data/po/gui_strings.h:59
 msgid "The Island"
 msgstr ""
 
@@ -2005,7 +2011,7 @@ msgid "The Space Shuttle has landed!"
 msgstr ""
 
 #. I18N: ./data/tracks/stadium/track.xml
-#: data/po/gui_strings.h:53
+#: data/po/gui_strings.h:41
 msgid "The Stadium"
 msgstr ""
 
@@ -2030,7 +2036,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:468
+#: data/po/gui_strings.h:746
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
@@ -2048,7 +2054,7 @@ msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:159
+#: data/po/gui_strings.h:675
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
@@ -2071,7 +2077,7 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: Section in the addons menu
-#: data/po/gui_strings.h:614
+#: data/po/gui_strings.h:575
 msgid "Tracks"
 msgstr ""
 
@@ -2082,30 +2088,30 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: src/states_screens/race_gui_overworld.cpp:448 data/po/gui_strings.h:706
+#: src/states_screens/race_gui_overworld.cpp:448 data/po/gui_strings.h:548
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:328
+#: data/po/gui_strings.h:599
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ./data/karts/tux/kart.xml
-#: data/po/gui_strings.h:861
+#: data/po/gui_strings.h:849
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:193
+#: data/po/gui_strings.h:126
 msgid "Type :"
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:787
+#: data/po/gui_strings.h:188
 msgid "Uninstall"
 msgstr ""
 
@@ -2120,7 +2126,7 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:602
+#: data/po/gui_strings.h:563
 msgid "Updated"
 msgstr ""
 
@@ -2130,13 +2136,13 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:385
+#: data/po/gui_strings.h:286
 msgid "Use Frame Buffer Objects (requires restart)"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup menu
-#: data/po/gui_strings.h:412
+#: data/po/gui_strings.h:806
 msgid "Use left/right to choose your team"
 msgstr ""
 
@@ -2147,16 +2153,16 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input2.cpp:72
-#: src/states_screens/options_screen_video.cpp:88
-#: src/states_screens/options_screen_players.cpp:72 data/po/gui_strings.h:662
+#: src/states_screens/options_screen_input.cpp:139
+#: src/states_screens/options_screen_players.cpp:72
+#: src/states_screens/options_screen_audio.cpp:64
+#: src/states_screens/options_screen_video.cpp:88 data/po/gui_strings.h:445
 msgid "User Interface"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:415
+#: data/po/gui_strings.h:809
 msgid "VS"
 msgstr ""
 
@@ -2167,7 +2173,7 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:381
+#: data/po/gui_strings.h:282
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
@@ -2175,7 +2181,7 @@ msgstr ""
 #. I18N: Music volume in options
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Sound volume in options
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:362
+#: data/po/gui_strings.h:157 data/po/gui_strings.h:169
 msgid "Volume"
 msgstr ""
 
@@ -2190,22 +2196,22 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:147 data/po/gui_strings.h:298
-#: data/po/gui_strings.h:449 data/po/gui_strings.h:744
+#. 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:233 data/po/gui_strings.h:617
+#: data/po/gui_strings.h:663 data/po/gui_strings.h:727
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:228
+#: data/po/gui_strings.h:415
 msgid "Weather Effects"
 msgstr ""
 
@@ -2217,13 +2223,13 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml
 #. I18N: ./data/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:74 data/po/gui_strings.h:77
+#: data/po/gui_strings.h:80 data/po/gui_strings.h:83
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:320
+#: data/po/gui_strings.h:255
 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, "
@@ -2234,23 +2240,23 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/karts/wilber/kart.xml
-#: data/po/gui_strings.h:858
+#: data/po/gui_strings.h:870
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/tracks/xr591/track.xml
-#: data/po/gui_strings.h:41
+#: data/po/gui_strings.h:38
 msgid "XR591"
 msgstr ""
 
 #. I18N: ./data/karts/xfcemouse/kart.xml
-#: data/po/gui_strings.h:825
+#: data/po/gui_strings.h:828
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: data/po/gui_strings.h:209
+#: data/po/gui_strings.h:259
 msgid "Yes"
 msgstr ""
 
@@ -2259,7 +2265,7 @@ msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:510
+#: data/po/gui_strings.h:512
 msgid "You are playing as"
 msgstr ""
 
@@ -2339,7 +2345,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:71
+#: data/po/gui_strings.h:74
 msgid "Zen Garden"
 msgstr ""
 
@@ -2357,12 +2363,12 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
+#. I18N: arena group name
 #. I18N: track group name
 #. I18N: kart group name
-#. I18N: arena group name
+#: src/states_screens/arenas_screen.cpp:79
 #: src/states_screens/tracks_screen.cpp:174
 #: src/states_screens/kart_selection.cpp:1040
-#: src/states_screens/arenas_screen.cpp:79
 msgid "standard"
 msgstr ""