From 03fb11823bf5c495e66fe9ca21241559c1efd851 Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Wed, 30 Mar 2011 17:12:29 +0000
Subject: [PATCH] Improve unicode string extraction

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8122 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/help1.stkgui               |  Bin 6564 -> 6644 bytes
 data/gui/help2.stkgui               |  Bin 7400 -> 7480 bytes
 data/gui/help3.stkgui               |  Bin 6490 -> 6570 bytes
 data/gui/help4.stkgui               |  Bin 5552 -> 5632 bytes
 data/po/extract_strings_from_XML.py |    8 +-
 data/po/supertuxkart.pot            | 1241 +++------------------------
 data/po/update_pot.sh               |    4 +-
 7 files changed, 113 insertions(+), 1140 deletions(-)

diff --git a/data/gui/help1.stkgui b/data/gui/help1.stkgui
index 91a9a34bdc6a744c5ede9a527133dcb7746dbf89..56819b846036c6689ef02723261463fda68a2f55 100644
GIT binary patch
delta 91
zcmZ2t{KYuv|34cBdxi>zT!tJ51%@()RE8pkVunnHe1<#*TLvWtLk2wt10bycl*waA
l28yQuW%C%)!Lp$YAq;K|x<FNCKsELZb_`q$8<`eK0sz8$5wHLN

delta 11
Scmexjyu_I4|G$kvizERf_658E

diff --git a/data/gui/help2.stkgui b/data/gui/help2.stkgui
index b11aadff0b1866391d7d8694769b058a7234d7ad..055f9865b0adda3145eb8a98cded4e208af3ca72 100644
GIT binary patch
delta 91
zcmaE1xx*^x|34cBdxi>zT!tJ51%@()RE8pkVunnHe1<#*TLvWtLk2wt10bycl*waA
l28yQuW%C%)!Lp$YAq;K|x<FNCKsELZb_`q$8=0QT007F`5)1$U

delta 11
ScmdmC^}>?r|G$kv&tw23#|9Vx

diff --git a/data/gui/help3.stkgui b/data/gui/help3.stkgui
index 77a7e0aa462b092b6ead27e156d140d05e795e62..22f67a691a1db9a75b768a8b1e2ea0aca9979bcf 100644
GIT binary patch
delta 91
zcmca*w8}W>|34cBdxi>zT!tJ51%@()RE8pkVunnHe1<#*TLvWtLk2wt10bycl*waA
k28yQuW%C%)!Lp$YAq;K|x<FNCKsELZb_`q$8<`>`0lNheQ2+n{

delta 11
ScmZ2we9MUG|G$kv5t0BR5(QlV

diff --git a/data/gui/help4.stkgui b/data/gui/help4.stkgui
index 6ec36dfc9ed8e568c9279c88d71b63d0ff8150ec..c942ebc167f783a4a389c16a985f7b7b81679d81 100644
GIT binary patch
delta 91
zcmdm>-Jlcn|DO$mJwpXUE<+B30z(-?Dnk)NF+(OpK0_XZErSw+A%h-+0gzSz%H%O5
k1I1H-vUv>YVA)WH5C%5}U7#v6pc;DyI|eR>jZEuA0hvb;K>z>%

delta 11
ScmZqB*`Uqz|KG--b)o<s^aV`-

diff --git a/data/po/extract_strings_from_XML.py b/data/po/extract_strings_from_XML.py
index e769d34ba..ed590958a 100755
--- a/data/po/extract_strings_from_XML.py
+++ b/data/po/extract_strings_from_XML.py
@@ -1,7 +1,9 @@
 import xml.dom.minidom
 import sys
+import codecs
 
 f = open('./data/po/gui_strings.h', 'w')
+f.write( codecs.BOM_UTF8 )
 
 def traverse(file, node, isChallenge, isGP, isKart, isTrack, level=0):
   
@@ -24,7 +26,7 @@ def traverse(file, node, isChallenge, isGP, isKart, isTrack, level=0):
                else:
                    line += "//I18N: File : " + file + "\n//I18N: " + comment + "\n_(\"" + e.getAttribute("name") + "\");\n\n"
                
-               f.write( line )
+               f.write( line.encode( "utf-8" ) )
            
            # challenges and GPs can have a description file; karts don't
            if e.hasAttribute("description"):
@@ -35,7 +37,7 @@ def traverse(file, node, isChallenge, isGP, isKart, isTrack, level=0):
                else:
                    line += "//I18N: File : " + file + "\n//I18N: " + comment + "\n_(\"" + e.getAttribute("description") + "\");\n\n"
                
-               f.write( line )
+               f.write( line.encode( "utf-8" ) )
         else:
            if e.hasAttribute("text"):
                # print "Label=", e.getAttribute("text"), " Comment=", comment
@@ -45,7 +47,7 @@ def traverse(file, node, isChallenge, isGP, isKart, isTrack, level=0):
                else:
                    line += "//I18N: " + file + "\n//I18N: " + comment + "\n_(\"" + e.getAttribute("text") + "\");\n\n"
                
-               f.write( line )
+               f.write( line.encode( "utf-8" ) )
 
         # don't recurse in children nodes for karts, they can contain sounds, etc. that should not be translated
         if not isKart:
diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index 3ac93df15..41680e1ff 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 14:57-0400\n"
+"POT-Creation-Date: 2011-03-30 13:08-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/utils/translation.cpp:265
+#: src/utils/translation.cpp:197
 msgid "   Is this a RTL language?"
 msgstr ""
 
-#: src/states_screens/options_screen_input.cpp:94
+#: src/states_screens/options_screen_input.cpp:95
 #, c-format
 msgid "   Keyboard %i"
 msgstr ""
@@ -143,47 +143,11 @@ msgstr ""
 msgid "(Empty)"
 msgstr ""
 
-#. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:447
-msgid "(network play is not yet available)"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: in the help screen
-#: data/po/gui_strings.h:324
-msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
-#: data/po/gui_strings.h:418
-msgid ""
-"* Most of these game modes can also be played in a Grand Prix fashion: "
-"instead of playing a single race, you play many in a row. The better you "
-"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:607
-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:149
 msgid "3 Strikes Battle"
 msgstr ""
 
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
-#: data/po/gui_strings.h:414
-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:189
 msgid "= Highscores ="
 msgstr ""
@@ -197,14 +161,8 @@ msgstr ""
 msgid "Abort Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:491
-msgid "About"
-msgstr ""
-
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:173
+#: src/states_screens/options_screen_input2.cpp:180
 msgid "Accelerate"
 msgstr ""
 
@@ -213,202 +171,69 @@ msgstr ""
 msgid "Add Keyboard Configuration"
 msgstr ""
 
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: In players configuration menu
-#: data/po/gui_strings.h:638
-msgid "Add Player"
-msgstr ""
-
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: In the input configuration screen
-#: data/po/gui_strings.h:604
-msgid "Add a device"
-msgstr ""
-
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: track group
-#: data/po/gui_strings.h:226
-msgid "Add-Ons"
-msgstr ""
-
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:479
-msgid "Addons"
-msgstr ""
-
-#. I18N: ./data/karts/adiumy/kart.xml
-#: data/po/gui_strings.h:880
-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:888
-#: src/states_screens/options_screen_video.cpp:320
-#: src/states_screens/tracks_screen.cpp:85 data/po/gui_strings.h:230
+#: src/states_screens/kart_selection.cpp:889
+#: src/states_screens/options_screen_video.cpp:278
+#: src/states_screens/tracks_screen.cpp:85
 msgid "All"
 msgstr ""
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: Section in track selection screen
-#: data/po/gui_strings.h:753
-msgid "All Tracks"
-msgstr ""
-
-#: src/states_screens/race_setup_screen.cpp:193
+#: src/states_screens/race_setup_screen.cpp:197
 msgid "All blows allowed, so catch weapons and make clever use of them!"
 msgstr ""
 
-#. I18N: ./data/grandprix/alltracks.grandprix
-#: data/po/gui_strings.h:164 data/po/gui_strings.h:862
-msgid "All tracks"
-msgstr ""
-
-#. I18N: ./data/tracks/jungle/track.xml
-#: data/po/gui_strings.h:26
-msgid "Amazonian Journey"
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:369
-msgid "Anchor - slows down greatly the kart in the first position"
-msgstr ""
-
-#: src/states_screens/options_screen_video.cpp:328
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:289
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
-#: src/states_screens/options_screen_video.cpp:326
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:285
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the video settings menu
-#: data/po/gui_strings.h:681
-msgid "Apply new resolution"
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:292
+#, c-format
+msgid "Anti-aliasing (requires restart) : %s"
 msgstr ""
 
 #. I18N: shown before deleting an input configuration
-#: src/states_screens/options_screen_input2.cpp:433
+#: src/states_screens/options_screen_input2.cpp:446
 msgid "Are you sure you want to permanently delete this configuration?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
-#: data/po/gui_strings.h:218
-msgid "Arenas"
-msgstr ""
-
-#. I18N: ./data/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:29
-msgid "Around the Lighthouse"
-msgstr ""
-
 #. I18N: shown when anchor applied. %s is the victim.
 #: 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:692
-msgid "Assign to ESC key"
-msgstr ""
-
-#. I18N: ./data/grandprix/atworldsend.grandprix
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:865
-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:510 data/po/gui_strings.h:557
-#: data/po/gui_strings.h:588 data/po/gui_strings.h:622
-#: data/po/gui_strings.h:653
+#: 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:110
+#: src/states_screens/options_screen_video.cpp:80
 msgid "Audio"
 msgstr ""
 
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: In the help menu
-#: data/po/gui_strings.h:308
-msgid "Avoid bananas!"
-msgstr ""
-
 #. I18N: to appear in input configuration screen, for gamepad axes
 #: src/input/binding.cpp:252
 #, 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_view_dialog.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/help4.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
 #: src/states_screens/dialogs/addons_loading.cpp:119
-#: src/states_screens/dialogs/addons_loading.cpp:124 data/po/gui_strings.h:194
-#: data/po/gui_strings.h:211 data/po/gui_strings.h:328
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:422
-#: data/po/gui_strings.h:459 data/po/gui_strings.h:546
-#: data/po/gui_strings.h:577 data/po/gui_strings.h:611
-#: data/po/gui_strings.h:642 data/po/gui_strings.h:685
+#: src/states_screens/dialogs/addons_loading.cpp:124
 msgid "Back"
 msgstr ""
 
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-#: data/po/gui_strings.h:703
-msgid "Back to Race"
-msgstr ""
-
-#. I18N: ./data/gui/options_device.stkgui
-#. I18N: In the input configuration screen
-#: data/po/gui_strings.h:573
-msgid "Back to device list"
-msgstr ""
-
-#. I18N: ./data/gui/challenges.stkgui
-#. I18N: ./data/gui/credits.stkgui
-#. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:237 data/po/gui_strings.h:260
-#: data/po/gui_strings.h:760
-msgid "Back to main menu"
-msgstr ""
-
 #: src/states_screens/dialogs/race_over_dialog.cpp:389
 msgid "Back to the main menu"
 msgstr ""
@@ -421,52 +246,23 @@ msgstr ""
 msgid "Banana? Box? Banana? Box? Banana? Box?"
 msgstr ""
 
-#. I18N: ./data/karts/beagle/kart.xml
-#: data/po/gui_strings.h:883
-msgid "Beagle"
-msgstr ""
-
 #. I18N: when failing a GP
 #: src/states_screens/grand_prix_lose.cpp:251
 msgid "Better luck next time!"
 msgstr ""
 
-#. I18N: ./data/tracks/farm/track.xml
-#: data/po/gui_strings.h:14
-msgid "Bovine Barnyard"
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:363
-msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:176
+#: src/states_screens/options_screen_input2.cpp:183
 msgid "Brake"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:354
-msgid "BubbleGum - leave a sticky pink puddle behind you"
+#: src/addons/network_http.cpp:296
+msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:357
-msgid ""
-"Cake - thrown at the closest rival, best on short ranges and long straights"
-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/addons_loading.cpp:96
 #: src/states_screens/dialogs/player_info_dialog.cpp:89
-#: data/po/gui_strings.h:245 data/po/gui_strings.h:253
 msgid "Cancel"
 msgstr ""
 
@@ -476,7 +272,7 @@ msgid "Cancel Remove"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:212
+#: src/states_screens/options_screen_input2.cpp:219
 msgid "Cancel/Back"
 msgstr ""
 
@@ -485,69 +281,6 @@ msgstr ""
 msgid "Cannot add a player with this name."
 msgstr ""
 
-#. I18N: ./data/tracks/cave/track.xml
-#: data/po/gui_strings.h:5
-msgid "Cave X"
-msgstr ""
-
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:475
-msgid "Challenges"
-msgstr ""
-
-#. I18N: ./data/gui/challenges.stkgui
-#. I18N: Title for challenges screen
-#: data/po/gui_strings.h:234
-msgid "Challenges : Trophy Room"
-msgstr ""
-
-#. I18N: ./data/gui/karts.stkgui
-#. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:463
-msgid "Choose a Kart"
-msgstr ""
-
-#. I18N: ./data/tracks/city/track.xml
-#: data/po/gui_strings.h:8
-msgid "City"
-msgstr ""
-
-#. I18N: ./data/challenges/crescentcrossing.challenge
-#: data/po/gui_strings.h:86 data/po/gui_strings.h:784
-msgid "Collect Nitro in Math Class"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: In the help menu
-#: data/po/gui_strings.h:304
-msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-
-#. I18N: ./data/challenges/mines.challenge
-#: data/po/gui_strings.h:128 data/po/gui_strings.h:826
-msgid "Collect fuel for your rocket"
-msgstr ""
-
-#. I18N: ./data/challenges/tothemoonandback.challenge
-#: data/po/gui_strings.h:152 data/po/gui_strings.h:850
-msgid "Collect the Pharaohs Treasure"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: In the help menu
-#: data/po/gui_strings.h:312
-msgid ""
-"Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-
-#. I18N: ./data/challenges/alltracks.challenge
-#: data/po/gui_strings.h:71 data/po/gui_strings.h:769
-msgid "Come first in the At World's End Grand Prix with 3 Expert AI karts."
-msgstr ""
-
 #. I18N: In the player info dialog (when deleting)
 #: src/states_screens/dialogs/player_info_dialog.cpp:155
 msgid "Confirm Remove"
@@ -559,15 +292,11 @@ msgstr ""
 msgid "Confirm resolution within %i seconds"
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:200
+#: src/states_screens/race_setup_screen.cpp:204
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:92 data/po/gui_strings.h:271
-#: data/po/gui_strings.h:274 data/po/gui_strings.h:277
+#: src/states_screens/race_result_gui.cpp:92
 msgid "Continue"
 msgstr ""
 
@@ -575,62 +304,30 @@ msgstr ""
 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:518 data/po/gui_strings.h:565
-#: data/po/gui_strings.h:596 data/po/gui_strings.h:630
-#: data/po/gui_strings.h:661
+#: src/states_screens/options_screen_audio.cpp:66
+#: src/states_screens/options_screen_players.cpp:70
+#: src/states_screens/options_screen_ui.cpp:112
+#: src/states_screens/options_screen_video.cpp:83
 msgid "Controls"
 msgstr ""
 
-#. I18N: ./data/tracks/canyon/track.xml
-#: data/po/gui_strings.h:2
-msgid "Coyote Canyon"
-msgstr ""
-
-#. I18N: ./data/gui/credits.stkgui
-#. I18N: Title in credits screen
-#: data/po/gui_strings.h:257
-msgid "Credits"
-msgstr ""
-
-#. I18N: ./data/tracks/crescentcrossing/track.xml
-#: data/po/gui_strings.h:11
-msgid "Crescent Crossing"
-msgstr ""
-
-#. I18N: ./data/gui/options_device.stkgui
-#. I18N: To delete a keyboard configuration
-#: src/states_screens/options_screen_input2.cpp:86 data/po/gui_strings.h:569
+#: src/states_screens/options_screen_input2.cpp:93
 msgid "Delete Configuration"
 msgstr ""
 
-#. I18N: ./data/gui/addons_view_dialog.stkgui
-#: data/po/gui_strings.h:200
-msgid "Description:"
-msgstr ""
-
 #: src/states_screens/dialogs/addons_loading.cpp:68
 #, c-format
 msgid "Description: %i"
 msgstr ""
 
 #. I18N: button to disable a gamepad configuration
-#: src/states_screens/options_screen_input2.cpp:73
-#: src/states_screens/options_screen_input2.cpp:443
+#: src/states_screens/options_screen_input2.cpp:80
+#: src/states_screens/options_screen_input2.cpp:456
 msgid "Disable Device"
 msgstr ""
 
 #. I18N: in the graphical options tooltip; indicates a graphical feature is disabled
-#: src/states_screens/options_screen_video.cpp:318
+#: src/states_screens/options_screen_video.cpp:276
 msgid "Disabled"
 msgstr ""
 
@@ -649,7 +346,7 @@ msgid "Don't accelerate before go"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:200
+#: src/states_screens/options_screen_input2.cpp:207
 msgid "Down"
 msgstr ""
 
@@ -657,22 +354,14 @@ msgstr ""
 msgid "Download failed.\n"
 msgstr ""
 
-#. I18N: ./data/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:886
-msgid "Elephpant"
-msgstr ""
-
 #. I18N: button to enable a gamepad configuration
-#: src/states_screens/options_screen_input2.cpp:75
-#: src/states_screens/options_screen_input2.cpp:444
+#: src/states_screens/options_screen_input2.cpp:82
+#: src/states_screens/options_screen_input2.cpp:457
 msgid "Enable Device"
 msgstr ""
 
 #. I18N: in the graphical options tooltip; indicates a graphical feature is enabled
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: Next to checkbox in settings menu
-#: src/states_screens/options_screen_video.cpp:316 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:538
+#: src/states_screens/options_screen_video.cpp:274
 msgid "Enabled"
 msgstr ""
 
@@ -681,34 +370,16 @@ msgid "Energy"
 msgstr ""
 
 #. I18N: Enter the name of YOUR language here, do not literally translate the word "English"
-#: src/states_screens/main_menu_screen.cpp:134
+#: src/states_screens/main_menu_screen.cpp:141
 msgid "English"
 msgstr ""
 
-#. I18N: ./data/gui/enter_player_name_dialog.stkgui
-#. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:264
-msgid "Enter the new player's name"
-msgstr ""
-
-#: src/states_screens/kart_selection.cpp:1091
+#: src/states_screens/kart_selection.cpp:1092
 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:723
-msgid "Exit Race"
-msgstr ""
-
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: Difficulty
-#: data/po/gui_strings.h:742
-msgid "Expert"
-msgstr ""
-
 #: src/states_screens/feature_unlocked.cpp:461
 msgid "Feature Unlocked"
 msgstr ""
@@ -717,133 +388,26 @@ msgstr ""
 msgid "Final lap!"
 msgstr ""
 
-#. I18N: ./data/challenges/hacienda.challenge
-#: data/po/gui_strings.h:113 data/po/gui_strings.h:811
-msgid "Finish 3 laps in Farm with 3 easy AI karts in under 2:30 minutes."
-msgstr ""
-
-#. I18N: ./data/challenges/tollway.challenge
-#: data/po/gui_strings.h:149 data/po/gui_strings.h:847
-msgid ""
-"Finish 3 laps in Lighthouse with 3 Expert AI karts in under 1:30 minutes."
-msgstr ""
-
-#. I18N: ./data/challenges/fortmagma.challenge
-#: data/po/gui_strings.h:101 data/po/gui_strings.h:799
-msgid "Finish 3 laps in mines with 3 expert AI karts in under 3:00 minutes."
-msgstr ""
-
-#. I18N: ./data/challenges/hacienda.challenge
-#: data/po/gui_strings.h:110 data/po/gui_strings.h:808
-msgid "Finish Farm in 2:30"
-msgstr ""
-
-#. I18N: ./data/challenges/tollway.challenge
-#: data/po/gui_strings.h:146 data/po/gui_strings.h:844
-msgid "Finish Lighthouse in 1:30"
-msgstr ""
-
-#. I18N: ./data/challenges/fortmagma.challenge
-#: data/po/gui_strings.h:98 data/po/gui_strings.h:796
-msgid "Finish Mines in 3:00"
-msgstr ""
-
-#. I18N: ./data/challenges/crescentcrossing.challenge
-#: data/po/gui_strings.h:89 data/po/gui_strings.h:787
-msgid ""
-"Finish with at least 10 points of nitro on three laps of Oliver's Math Class "
-"in under 55 seconds."
-msgstr ""
-
-#. I18N: ./data/challenges/tothemoonandback.challenge
-#: data/po/gui_strings.h:155 data/po/gui_strings.h:853
-msgid ""
-"Finish with at least 12 nitro points on 3 laps of Shifting Sands in under "
-"2:20 minutes."
-msgstr ""
-
-#. I18N: ./data/challenges/mines.challenge
-#: data/po/gui_strings.h:131 data/po/gui_strings.h:829
-msgid ""
-"Finish with at least 16 nitro points on 2 laps of XR591 in under 2:30 "
-"minutes."
-msgstr ""
-
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:179
+#: src/states_screens/options_screen_input2.cpp:186
 msgid "Fire"
 msgstr ""
 
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: In the help menu
-#: data/po/gui_strings.h:451
-msgid ""
-"First, you will need several input devices (having multiple gamepads or "
-"joysticks is the best way to play with several people). Go in the input "
-"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:147
 msgid "Follow the Leader"
 msgstr ""
 
-#. I18N: ./data/challenges/lighthouse.challenge
-#: data/po/gui_strings.h:122 data/po/gui_strings.h:820
-msgid "Follow the Leader around the Solar System"
-msgstr ""
-
-#. I18N: ./data/challenges/atworldsend.challenge
-#: data/po/gui_strings.h:74 data/po/gui_strings.h:772
-msgid "Follow the Leader on a Desert Island"
-msgstr ""
-
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
-#: data/po/gui_strings.h:410
-msgid ""
-"Follow the leader: run for second place, as the last kart will be "
-"disqualified every time the counter hits zero. Beware : going in front of "
-"the leader will get you eliminated too!"
-msgstr ""
-
-#. I18N: ./data/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:17
-msgid "Fort Magma"
-msgstr ""
-
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the video settings
-#: data/po/gui_strings.h:677
-msgid "Fullscreen"
-msgstr ""
-
 #. I18N: warning, this string needs to be SHORT!
 #: src/states_screens/dialogs/race_over_dialog.cpp:255
 msgid "GP scores :"
 msgstr ""
 
 #. I18N: Key binding section
-#: src/states_screens/options_screen_input2.cpp:117
+#: src/states_screens/options_screen_input2.cpp:124
 msgid "Game Keys"
 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
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
-#: data/po/gui_strings.h:292 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:391 data/po/gui_strings.h:437
-msgid "Game Modes"
-msgstr ""
-
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:256
 #, c-format
@@ -856,148 +420,50 @@ msgstr ""
 msgid "Gamepad hat %d"
 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
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
-#: data/po/gui_strings.h:284 data/po/gui_strings.h:335
-#: data/po/gui_strings.h:383 data/po/gui_strings.h:429
-msgid "General"
-msgstr ""
-
 #: src/items/powerup.cpp:64
 msgid "Geronimo!!!"
 msgstr ""
 
-#. I18N: ./data/karts/gnu/kart.xml
-#: data/po/gui_strings.h:889
-msgid "Gnu"
-msgstr ""
-
-#: src/states_screens/minimal_race_gui.cpp:102
+#: src/states_screens/minimal_race_gui.cpp:114
 #: src/states_screens/race_gui.cpp:113
 msgid "Go!"
 msgstr ""
 
-#. I18N: ./data/karts/gooey/kart.xml
-#: data/po/gui_strings.h:892
-msgid "Gooey"
-msgstr ""
-
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: Section in track selection screen
-#: data/po/gui_strings.h:749
-msgid "Grand Prix"
-msgstr ""
-
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the graphics settings
-#: data/po/gui_strings.h:669
-msgid "Graphical Effects Settings"
-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:506 data/po/gui_strings.h:553
-#: data/po/gui_strings.h:584 data/po/gui_strings.h:618
-#: data/po/gui_strings.h:649
+#: 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:109
 msgid "Graphics"
 msgstr ""
 
-#: src/config/user_config.cpp:422
+#: src/config/user_config.cpp:487
 msgid "Guest"
 msgstr ""
 
-#. I18N: ./data/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:20
-msgid "Hacienda"
-msgstr ""
-
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-#: data/po/gui_strings.h:487 data/po/gui_strings.h:719
-msgid "Help"
-msgstr ""
-
-#. I18N: ./data/karts/hexley/kart.xml
-#: data/po/gui_strings.h:895
-msgid "Hexley"
-msgstr ""
-
 #: src/states_screens/dialogs/race_over_dialog.cpp:216
 msgid "Highscores"
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:222
+#: src/states_screens/race_setup_screen.cpp:226
 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:316
-msgid ""
-"If you see a button with a lock like this one, you need to complete a "
-"challenge to unlock it."
-msgstr ""
-
 #. I18N: message shown when an input device is used but is not associated to any player
-#: src/input/input_manager.cpp:527
+#: src/input/input_manager.cpp:537
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
-#. I18N: ./data/gui/addons_view_dialog.stkgui
-#. I18N: Addons
-#: data/po/gui_strings.h:207
-msgid "Install"
-msgstr ""
-
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: Difficulty
-#: data/po/gui_strings.h:738
-msgid "Intermediate"
-msgstr ""
-
-#. I18N: ./data/gui/addons.stkgui
-#. I18N: Section in the addons menu
-#: data/po/gui_strings.h:186
-msgid "Karts"
-msgstr ""
-
-#. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:249
-msgid "Keep this resolution"
-msgstr ""
-
 #. I18N: short definition for follow-the-leader game mode
-#: src/states_screens/race_setup_screen.cpp:213
+#: src/states_screens/race_setup_screen.cpp:217
 msgid "Keep up with the leader kart but don't overtake it!"
 msgstr ""
 
-#. I18N: ./data/karts/konqi/kart.xml
-#: data/po/gui_strings.h:898
-msgid "Konqi"
-msgstr ""
-
 #. I18N: Shown at the end of a race
-#: src/states_screens/minimal_race_gui.cpp:94
+#: src/states_screens/minimal_race_gui.cpp:108
 #: src/states_screens/race_gui.cpp:105
 msgid "Lap"
 msgstr ""
@@ -1007,43 +473,37 @@ msgstr ""
 msgid "Lap %i"
 msgstr ""
 
-#: src/modes/follow_the_leader.cpp:196 src/modes/tutorial_race.cpp:192
+#: 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:203
+#: src/states_screens/options_screen_input2.cpp:210
 msgid "Left"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1071
+#: src/guiengine/engine.cpp:1077
 msgid "Loading"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: In the main screen
-#: data/po/gui_strings.h:499
-msgid "Loading news from stkaddons..."
-msgstr ""
-
-#: src/states_screens/arenas_screen.cpp:188
-#: src/states_screens/arenas_screen.cpp:211
+#: src/states_screens/arenas_screen.cpp:192
+#: src/states_screens/arenas_screen.cpp:215
 #: src/states_screens/challenges.cpp:96
-#: src/states_screens/kart_selection.cpp:796
-#: src/states_screens/kart_selection.cpp:1713
-#: src/states_screens/kart_selection.cpp:1739
-#: src/states_screens/race_setup_screen.cpp:205
-#: src/states_screens/tracks_screen.cpp:279
-#: src/states_screens/tracks_screen.cpp:303
+#: src/states_screens/kart_selection.cpp:797
+#: src/states_screens/kart_selection.cpp:1718
+#: src/states_screens/kart_selection.cpp:1744
+#: src/states_screens/race_setup_screen.cpp:209
+#: src/states_screens/tracks_screen.cpp:283
+#: src/states_screens/tracks_screen.cpp:307
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:229
+#: src/states_screens/tracks_screen.cpp:233
 msgid "Locked!"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:188
+#: src/states_screens/options_screen_input2.cpp:195
 msgid "Look Back"
 msgstr ""
 
@@ -1051,19 +511,13 @@ msgstr ""
 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:300
-msgid "Make your rivals bite dust!"
-msgstr ""
-
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:322
+#: src/states_screens/options_screen_video.cpp:280
 msgid "Me Only"
 msgstr ""
 
 #. I18N: Key binding section
-#: src/states_screens/options_screen_input2.cpp:130
+#: src/states_screens/options_screen_input2.cpp:137
 msgid "Menu Keys"
 msgstr ""
 
@@ -1079,41 +533,6 @@ msgstr ""
 msgid "Mouse button %d"
 msgstr ""
 
-#. I18N: ./data/karts/mozilla/kart.xml
-#: data/po/gui_strings.h:901
-msgid "Mozilla"
-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
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
-#: data/po/gui_strings.h:296 data/po/gui_strings.h:347
-#: data/po/gui_strings.h:395 data/po/gui_strings.h:441
-msgid "Multiplayer"
-msgstr ""
-
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:471
-msgid "Multiplayer Race"
-msgstr ""
-
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: Section in the audio/video settings submenu
-#: data/po/gui_strings.h:522
-msgid "Music"
-msgstr ""
-
-#. I18N: ./data/gui/addons_view_dialog.stkgui
-#: data/po/gui_strings.h:197
-msgid "Name:"
-msgstr ""
-
 #: src/states_screens/dialogs/addons_loading.cpp:65
 #, c-format
 msgid "Name: %i"
@@ -1149,17 +568,12 @@ msgid "New track '%s' now available"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:182
+#: src/states_screens/options_screen_input2.cpp:189
 msgid "Nitro"
 msgstr ""
 
-#. I18N: ./data/karts/nolok/kart.xml
-#: data/po/gui_strings.h:904
-msgid "Nolok"
-msgstr ""
-
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:324
+#: src/states_screens/options_screen_video.cpp:282
 msgid "None"
 msgstr ""
 
@@ -1168,93 +582,25 @@ msgstr ""
 msgid "Normal Race"
 msgstr ""
 
-#. I18N: ./data/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:50
-msgid "Northern Resort"
-msgstr ""
-
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: Difficulty
-#: data/po/gui_strings.h:734
-msgid "Novice"
-msgstr ""
-
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: In race setup menu
-#: data/po/gui_strings.h:730
-msgid "Number of AI karts"
-msgstr ""
-
 #: src/states_screens/dialogs/message_dialog.cpp:57
 msgid "OK"
 msgstr ""
 
-#. I18N: ./data/tracks/mines/track.xml
-#: data/po/gui_strings.h:32
-msgid "Old Mine"
-msgstr ""
-
-#. I18N: ./data/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:35
-msgid "Oliver's Math Class"
-msgstr ""
-
 #. I18N: message shown when a player that isn't game master tries to modify options that
 #. I18N: only the game master is allowed to
-#: src/input/input_manager.cpp:552
+#: src/input/input_manager.cpp:562
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-#: data/po/gui_strings.h:483 data/po/gui_strings.h:715
-msgid "Options"
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:366
-msgid "Parachute - slows down all karts in a better position!"
-msgstr ""
-
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:699
-msgid "Paused"
-msgstr ""
-
 #: src/karts/controller/player_controller.cpp:281
 msgid "Penalty time!!"
 msgstr ""
 
-#. I18N: ./data/grandprix/penguinplayground.grandprix
-#: data/po/gui_strings.h:170 data/po/gui_strings.h:868
-msgid "Penguin Playground"
-msgstr ""
-
-#. I18N: ./data/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:907
-msgid "Pidgin"
-msgstr ""
-
-#. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:763
-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:514 data/po/gui_strings.h:561
-#: data/po/gui_strings.h:592 data/po/gui_strings.h:626
-#: data/po/gui_strings.h:657
+#: 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:111
+#: src/states_screens/options_screen_video.cpp:82
 msgid "Players"
 msgstr ""
 
@@ -1263,38 +609,6 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:360
-msgid ""
-"Plunger - throw straight to pull an opponent back, or throw while looking "
-"back to make one lose sight!"
-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:268 data/po/gui_strings.h:696
-msgid "Press ESC to cancel"
-msgstr ""
-
-#. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:688
-msgid "Press a key"
-msgstr ""
-
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: In key bindings configuration menu
-#: data/po/gui_strings.h:600
-msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: In players configuration menu
-#: data/po/gui_strings.h:634
-msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-
 #: src/states_screens/dialogs/addons_loading.cpp:166
 #, c-format
 msgid "Problems installing the addon '%s'."
@@ -1305,68 +619,38 @@ msgstr ""
 msgid "Problems removing the addon '%s'."
 msgstr ""
 
-#. I18N: ./data/karts/puffy/kart.xml
-#: data/po/gui_strings.h:910
-msgid "Puffy"
-msgstr ""
-
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:495
-msgid "Quit"
-msgstr ""
-
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-#: data/po/gui_strings.h:467
-msgid "Race"
-msgstr ""
-
 #: src/states_screens/dialogs/race_over_dialog.cpp:104
 msgid "Race Results"
 msgstr ""
 
-#. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:726
-msgid "Race Setup"
-msgstr ""
-
 #: src/states_screens/dialogs/race_over_dialog.cpp:377
 msgid "Race in this track again"
 msgstr ""
 
-#: src/states_screens/arenas_screen.cpp:221
+#: src/states_screens/arenas_screen.cpp:225
 msgid "Random Arena"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:787
-#: src/states_screens/kart_selection.cpp:1756
+#: src/states_screens/kart_selection.cpp:1761
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:316
+#: src/states_screens/tracks_screen.cpp:320
 msgid "Random Track"
 msgstr ""
 
-#: src/states_screens/minimal_race_gui.cpp:95
+#: src/states_screens/minimal_race_gui.cpp:109
 #: src/states_screens/race_gui.cpp:106
 msgid "Rank"
 msgstr ""
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/minimal_race_gui.cpp:100
+#: src/states_screens/minimal_race_gui.cpp:112
 #: src/states_screens/race_gui.cpp:111
 msgid "Ready!"
 msgstr ""
 
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
-#: data/po/gui_strings.h:402
-msgid ""
-"Regular Race: all blows allowed, so catch weapons and make clever use of "
-"them!"
-msgstr ""
-
 #. I18N: In the player info dialog
 #: src/states_screens/dialogs/player_info_dialog.cpp:108
 msgid "Remove"
@@ -1378,41 +662,19 @@ msgid "Rename"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:191
+#: src/states_screens/options_screen_input2.cpp:198
 msgid "Rescue"
 msgstr ""
 
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the graphics settings
-#: data/po/gui_strings.h:673
-msgid "Resolution"
-msgstr ""
-
 #: src/states_screens/race_result_gui.cpp:105
 msgid "Restart"
 msgstr ""
 
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-#: data/po/gui_strings.h:711
-msgid "Restart Race"
-msgstr ""
-
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:206
+#: src/states_screens/options_screen_input2.cpp:213
 msgid "Right"
 msgstr ""
 
-#. I18N: ./data/tracks/scotland/track.xml
-#: data/po/gui_strings.h:41
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/tracks/secretgarden/track.xml
-#: data/po/gui_strings.h:44
-msgid "Secret Garden"
-msgstr ""
-
 #: src/states_screens/race_result_gui.cpp:82
 msgid "See unlocked feature"
 msgstr ""
@@ -1423,75 +685,25 @@ msgid "See unlocked features"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:209
+#: src/states_screens/options_screen_input2.cpp:216
 msgid "Select"
 msgstr ""
 
-#. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:745
-msgid "Select a game mode"
-msgstr ""
-
-#: src/states_screens/minimal_race_gui.cpp:101
+#: src/states_screens/minimal_race_gui.cpp:113
 #: src/states_screens/race_gui.cpp:112
 msgid "Set!"
 msgstr ""
 
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
 #: src/states_screens/dialogs/race_over_dialog.cpp:366
-#: src/states_screens/race_result_gui.cpp:102 data/po/gui_strings.h:707
+#: src/states_screens/race_result_gui.cpp:102
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:185
+#: src/states_screens/options_screen_input2.cpp:192
 msgid "Sharp Turn"
 msgstr ""
 
-#. I18N: ./data/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:38
-msgid "Shifting Sands"
-msgstr ""
-
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the graphics settings
-#: data/po/gui_strings.h:665
-msgid "Skin"
-msgstr ""
-
-#. I18N: ./data/tracks/skyline/track.xml
-#: data/po/gui_strings.h:47
-msgid "Skyline"
-msgstr ""
-
-#. I18N: ./data/grandprix/snagdrive.grandprix
-#: data/po/gui_strings.h:173 data/po/gui_strings.h:871
-msgid "Snag Drive"
-msgstr ""
-
-#. I18N: ./data/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:53
-msgid "Snow Peak"
-msgstr ""
-
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: Section in audio/video settings submenu
-#: data/po/gui_strings.h:534
-msgid "Sound Effects"
-msgstr ""
-
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: track group
-#: data/po/gui_strings.h:222
-msgid "Standard"
-msgstr ""
-
-#. I18N: ./data/tracks/startrack/track.xml
-#: data/po/gui_strings.h:59
-msgid "Star Track"
-msgstr ""
-
 #: src/states_screens/dialogs/gp_info_dialog.cpp:144
 msgid "Start Grand Prix"
 msgstr ""
@@ -1500,95 +712,25 @@ msgstr ""
 msgid "Start Race"
 msgstr ""
 
-#. I18N: ./data/gui/addons_view_dialog.stkgui
-#: data/po/gui_strings.h:214
-msgid "Status"
-msgstr ""
-
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:167
+#: src/states_screens/options_screen_input2.cpp:174
 msgid "Steer Left"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:170
+#: src/states_screens/options_screen_input2.cpp:177
 msgid "Steer Right"
 msgstr ""
 
-#. I18N: ./data/gui/addons.stkgui
-#: data/po/gui_strings.h:182
-msgid "SuperTuxKart Addons"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:280 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:379 data/po/gui_strings.h:425
-msgid "SuperTuxKart Help"
-msgstr ""
-
-#. 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_video.stkgui
-#: data/po/gui_strings.h:502 data/po/gui_strings.h:549
-#: data/po/gui_strings.h:580 data/po/gui_strings.h:614
-#: data/po/gui_strings.h:645
-msgid "SuperTuxKart Options"
-msgstr ""
-
-#. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:444
-msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-
-#. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:398
-msgid "SuperTuxKart features several game modes"
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:372
-msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time"
-msgstr ""
-
 #. I18N: in the language choice, to select the same language as the OS
-#: src/states_screens/main_menu_screen.cpp:192
+#: src/states_screens/main_menu_screen.cpp:199
 msgid "System Language"
 msgstr ""
 
-#. I18N: ./data/grandprix/test.grandprix
-#: data/po/gui_strings.h:176 data/po/gui_strings.h:874
-msgid "Test"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: in the help menu
-#: data/po/gui_strings.h:320
-msgid ""
-"The 'sharp turn' key allows you to do sharp turns and have better control in "
-"tight curves"
-msgstr ""
-
-#. I18N: ./data/tracks/islandtrack/track.xml
-#: data/po/gui_strings.h:23
-msgid "The Island"
-msgstr ""
-
 #: src/items/powerup.cpp:65
 msgid "The Space Shuttle has landed!"
 msgstr ""
 
-#. I18N: ./data/tracks/stadium/track.xml
-#: data/po/gui_strings.h:56
-msgid "The Stadium"
-msgstr ""
-
 #: src/race/highscore_manager.cpp:97
 msgid ""
 "The highscore file was too old,\n"
@@ -1608,12 +750,6 @@ msgstr ""
 msgid "Time Trial"
 msgstr ""
 
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
-#: data/po/gui_strings.h:406
-msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-
 #: src/states_screens/dialogs/add_device_dialog.cpp:49
 msgid ""
 "To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
@@ -1626,19 +762,7 @@ msgid ""
 "needs different keybindings in this case.)"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: In the help menu
-#: data/po/gui_strings.h:351
-msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-
-#. I18N: ./data/grandprix/tothemoonandback.grandprix
-#: data/po/gui_strings.h:179 data/po/gui_strings.h:877
-msgid "To the Moon and Back"
-msgstr ""
-
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
-#: src/states_screens/minimal_race_gui.cpp:98
 #: src/states_screens/race_gui.cpp:109
 #, c-format
 msgid "Top %i"
@@ -1650,38 +774,16 @@ msgstr ""
 msgid "Track by %s"
 msgstr ""
 
-#. I18N: ./data/gui/addons.stkgui
-#. I18N: Section in the addons menu
-#: data/po/gui_strings.h:190
-msgid "Tracks"
-msgstr ""
-
 #: src/states_screens/dialogs/addons_loading.cpp:187
 msgid "Try again"
 msgstr ""
 
-#. I18N: ./data/gui/tutorial.stkgui
-#. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:757
-msgid "Tutorial : Selection Room"
-msgstr ""
-
-#. I18N: ./data/karts/tux/kart.xml
-#: data/po/gui_strings.h:913
-msgid "Tux"
-msgstr ""
-
-#. I18N: ./data/tracks/tuxtollway/track.xml
-#: data/po/gui_strings.h:62
-msgid "Tux Tollway"
-msgstr ""
-
 #: src/states_screens/dialogs/addons_loading.cpp:62
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:197
+#: src/states_screens/options_screen_input2.cpp:204
 msgid "Up"
 msgstr ""
 
@@ -1693,9 +795,12 @@ msgstr ""
 msgid "Updating the list..."
 msgstr ""
 
-#. I18N: ./data/gui/addons_view_dialog.stkgui
-#: data/po/gui_strings.h:203
-msgid "Version:"
+#: 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:81
+msgid "User Interface"
 msgstr ""
 
 #: src/states_screens/dialogs/addons_loading.cpp:71
@@ -1703,157 +808,23 @@ msgstr ""
 msgid "Version: %d"
 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:530 data/po/gui_strings.h:542
-msgid "Volume"
-msgstr ""
-
 #: src/modes/linear_world.cpp:821
 msgid "WRONG WAY!"
 msgstr ""
 
-#: src/states_screens/options_screen_input2.cpp:352
+#: src/states_screens/options_screen_input2.cpp:364
 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
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
-#: data/po/gui_strings.h:288 data/po/gui_strings.h:339
-#: data/po/gui_strings.h:387 data/po/gui_strings.h:433
-msgid "Weapons"
-msgstr ""
-
-#: src/states_screens/options_screen_video.cpp:327
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:287
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: In the help menu
-#: data/po/gui_strings.h:455
-msgid ""
-"When input devices are configured, you are ready to play. Select the "
-"'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"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:916
-msgid "Wilber"
-msgstr ""
-
-#. I18N: ./data/challenges/followtheleader.challenge
-#: data/po/gui_strings.h:92 data/po/gui_strings.h:790
-msgid "Win Penguin Playground Grand Prix"
-msgstr ""
-
-#. I18N: ./data/challenges/followtheleader.challenge
-#: data/po/gui_strings.h:95 data/po/gui_strings.h:793
-msgid "Win Penguin Playground Grand Prix with 3 Expert Level AI karts."
-msgstr ""
-
-#. I18N: ./data/challenges/snagdrive.challenge
-#: data/po/gui_strings.h:140 data/po/gui_strings.h:838
-msgid "Win To the Moon and Back Grand Prix"
-msgstr ""
-
-#. I18N: ./data/challenges/skyline.challenge
-#: data/po/gui_strings.h:137 data/po/gui_strings.h:835
-msgid ""
-"Win a 1 lap Head to Head in the Secret Garden against 1 Expert level AI kart."
-msgstr ""
-
-#. I18N: ./data/challenges/xr591.challenge
-#: data/po/gui_strings.h:161 data/po/gui_strings.h:859
-msgid "Win a 3 lap race on Canyon against 4 Expert level AI karts."
-msgstr ""
-
-#. I18N: ./data/challenges/gnu.challenge
-#: data/po/gui_strings.h:107 data/po/gui_strings.h:805
-msgid "Win a 3 lap race on Fort Magma against 3 Expert level AI karts."
-msgstr ""
-
-#. I18N: ./data/challenges/island.challenge
-#: data/po/gui_strings.h:119 data/po/gui_strings.h:817
-msgid "Win a 3 lap race on Snow Mountain under 3:05 against 3 medium AI karts."
-msgstr ""
-
-#. I18N: ./data/challenges/canyon.challenge
-#: data/po/gui_strings.h:83 data/po/gui_strings.h:781
-msgid "Win a 3 lap race on Tux Tollway against 4 Expert level AI karts."
-msgstr ""
-
-#. I18N: ./data/challenges/atworldsend.challenge
-#: data/po/gui_strings.h:77 data/po/gui_strings.h:775
-msgid "Win a Follow the Leader race with 3 AI karts on a Desert Island."
-msgstr ""
-
-#. I18N: ./data/challenges/lighthouse.challenge
-#: data/po/gui_strings.h:125 data/po/gui_strings.h:823
-msgid "Win a Follow the Leader race with 5 AI karts on Star track"
-msgstr ""
-
-#. I18N: ./data/challenges/skyline.challenge
-#: data/po/gui_strings.h:134 data/po/gui_strings.h:832
-msgid "Win a Head to Head in the Secret Garden"
-msgstr ""
-
-#. I18N: ./data/challenges/xr591.challenge
-#: data/po/gui_strings.h:158 data/po/gui_strings.h:856
-msgid "Win a race on Canyon"
-msgstr ""
-
-#. I18N: ./data/challenges/gnu.challenge
-#: data/po/gui_strings.h:104 data/po/gui_strings.h:802
-msgid "Win a race on Fort Magma"
-msgstr ""
-
-#. I18N: ./data/challenges/island.challenge
-#: data/po/gui_strings.h:116 data/po/gui_strings.h:814
-msgid "Win a race on Snow Mountain"
-msgstr ""
-
-#. I18N: ./data/challenges/canyon.challenge
-#: data/po/gui_strings.h:80 data/po/gui_strings.h:778
-msgid "Win a race on Tux Tollway"
-msgstr ""
-
-#. I18N: ./data/challenges/alltracks.challenge
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:766
-msgid "Win the At World's End Grand Prix"
-msgstr ""
-
-#. I18N: ./data/challenges/snagdrive.challenge
-#: data/po/gui_strings.h:143 data/po/gui_strings.h:841
-msgid "Win the To the Moon and Back Grand Prix with 3 Expert Level AI karts."
-msgstr ""
-
-#. I18N: ./data/tracks/xr591/track.xml
-#: data/po/gui_strings.h:65
-msgid "XR591"
-msgstr ""
-
-#. I18N: ./data/gui/confirm_dialog.stkgui
-#. I18N: In a 'are you sure?' dialog
-#: data/po/gui_strings.h:241
-msgid "Yes"
-msgstr ""
-
 #: src/states_screens/grand_prix_win.cpp:378
 msgid "You completed the Grand Prix!"
 msgstr ""
@@ -1875,13 +846,13 @@ msgstr ""
 msgid "You won the race!"
 msgstr ""
 
-#: src/config/user_config.cpp:465
+#: src/config/user_config.cpp:530
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
 msgstr ""
 
-#: src/config/user_config.cpp:475
+#: src/config/user_config.cpp:540
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
@@ -1897,7 +868,7 @@ msgid "[none]"
 msgstr ""
 
 #. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
-#: src/states_screens/minimal_race_gui.cpp:757
+#: src/states_screens/minimal_race_gui.cpp:785
 #: src/states_screens/race_gui.cpp:1195
 msgid "by"
 msgstr ""
diff --git a/data/po/update_pot.sh b/data/po/update_pot.sh
index 843a1a0ad..2bc5ac16d 100755
--- a/data/po/update_pot.sh
+++ b/data/po/update_pot.sh
@@ -29,10 +29,10 @@ echo "    Generating .pot file..."
 xgettext    -d supertuxkart -s --keyword=_ --keyword=_LTR --add-comments="I18N:" -p ./data/po -o supertuxkart.pot $CPP_FILE_LIST --package-name=supertuxkart
 
 # Lisp files
-xgettext -j -L lisp -d supertuxkart -s --keyword=_ --add-comments="I18N:" -p ./data/po -o supertuxkart.pot $XML_FILE_LIST --package-name=supertuxkart
+#xgettext -j -L lisp -d supertuxkart -s --keyword=_ --add-comments="I18N:" -p ./data/po -o supertuxkart.pot $XML_FILE_LIST --package-name=supertuxkart
 
 # XML Files
-xgettext -j -d supertuxkart -s --keyword=_ --add-comments="I18N:" -p ./data/po -o supertuxkart.pot ./data/po/gui_strings.h --package-name=supertuxkart
+xgettext -j -d supertuxkart -s --keyword=_ --add-comments="I18N:" -p ./data/po -o supertuxkart.pot --from-code=UTF-16 ./data/po/gui_strings.h --package-name=supertuxkart
 
 echo "    Done"
 echo "---------------------------"