diff --git a/data/po/extract_strings_from_XML.py b/data/po/extract_strings_from_XML.py
index ed590958a..49948ba0a 100755
--- a/data/po/extract_strings_from_XML.py
+++ b/data/po/extract_strings_from_XML.py
@@ -18,7 +18,7 @@ def traverse(file, node, isChallenge, isGP, isKart, isTrack, level=0):
            comment = e.getAttribute("I18N")
          
         if isChallenge or isGP or isKart or isTrack:
-           if e.hasAttribute("name"):
+           if e.hasAttribute("name") and len(e.getAttribute("name")) > 0:
                #print "Label=", e.getAttribute("name"), " Comment=", comment
                line = ""
                if comment == None:
@@ -29,7 +29,7 @@ def traverse(file, node, isChallenge, isGP, isKart, isTrack, level=0):
                f.write( line.encode( "utf-8" ) )
            
            # challenges and GPs can have a description file; karts don't
-           if e.hasAttribute("description"):
+           if e.hasAttribute("description") and len(e.getAttribute("description")) > 0:
                # print "Label=", e.getAttribute("description"), " Comment=", comment
                line = ""
                if comment == None:
@@ -39,7 +39,7 @@ def traverse(file, node, isChallenge, isGP, isKart, isTrack, level=0):
                
                f.write( line.encode( "utf-8" ) )
         else:
-           if e.hasAttribute("text"):
+           if e.hasAttribute("text") and len(e.getAttribute("text")) > 0:
                # print "Label=", e.getAttribute("text"), " Comment=", comment
                line = ""
                if comment == None:
diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index 41680e1ff..59fda3562 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-30 13:08-0400\n"
+"POT-Creation-Date: 2011-03-30 13:16-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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/utils/translation.cpp:197
@@ -143,11 +143,47 @@ msgstr ""
 msgid "(Empty)"
 msgstr ""
 
+#. I18N: ./data/gui/help4.stkgui
+#: data/po/gui_strings.h:429
+msgid "(network play is not yet available)"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: in the help screen
+#: data/po/gui_strings.h:318
+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:404
+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:537
+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:400
+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 ""
@@ -161,6 +197,12 @@ msgstr ""
 msgid "Abort Grand Prix"
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+#: data/po/gui_strings.h:469
+msgid "About"
+msgstr ""
+
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:180
 msgid "Accelerate"
@@ -171,21 +213,73 @@ msgstr ""
 msgid "Add Keyboard Configuration"
 msgstr ""
 
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: In players configuration menu
+#: data/po/gui_strings.h:552
+msgid "Add Player"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: In the input configuration screen
+#: data/po/gui_strings.h:534
+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:457
+msgid "Addons"
+msgstr ""
+
+#. I18N: ./data/karts/adiumy/kart.xml
+#: data/po/gui_strings.h:798
+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:889
 #: src/states_screens/options_screen_video.cpp:278
-#: src/states_screens/tracks_screen.cpp:85
+#: src/states_screens/tracks_screen.cpp:85 data/po/gui_strings.h:230
 msgid "All"
 msgstr ""
 
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: Section in track selection screen
+#: data/po/gui_strings.h:670
+msgid "All Tracks"
+msgstr ""
+
 #: 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:780
+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:359
+msgid "Anchor - slows down greatly the kart in the first position"
+msgstr ""
+
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:289
 #, c-format
@@ -204,36 +298,95 @@ msgstr ""
 msgid "Anti-aliasing (requires restart) : %s"
 msgstr ""
 
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings menu
+#: data/po/gui_strings.h:602
+msgid "Apply new resolution"
+msgstr ""
+
 #. I18N: shown before deleting an input configuration
 #: 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:609
+msgid "Assign to ESC key"
+msgstr ""
+
+#. I18N: ./data/grandprix/atworldsend.grandprix
+#: data/po/gui_strings.h:167 data/po/gui_strings.h:783
+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: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
+#: src/states_screens/options_screen_video.cpp:80 data/po/gui_strings.h:480
 msgid "Audio"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+#: data/po/gui_strings.h:302
+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
 #: src/states_screens/dialogs/addons_loading.cpp:119
-#: src/states_screens/dialogs/addons_loading.cpp:124
+#: src/states_screens/dialogs/addons_loading.cpp:124 data/po/gui_strings.h:194
+#: data/po/gui_strings.h:211
 msgid "Back"
 msgstr ""
 
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+#: data/po/gui_strings.h:620
+msgid "Back to Race"
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: In the input configuration screen
+#: data/po/gui_strings.h:519
+msgid "Back to device list"
+msgstr ""
+
+#. I18N: ./data/gui/tutorial.stkgui
+#. I18N: In the options menu, to go back to the main menu or game
+#: data/po/gui_strings.h:678
+msgid "Back to menu"
+msgstr ""
+
 #: src/states_screens/dialogs/race_over_dialog.cpp:389
 msgid "Back to the main menu"
 msgstr ""
@@ -246,23 +399,56 @@ msgstr ""
 msgid "Banana? Box? Banana? Box? Banana? Box?"
 msgstr ""
 
+#. I18N: ./data/karts/beagle/kart.xml
+#: data/po/gui_strings.h:801
+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:353
+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:183
 msgid "Brake"
 msgstr ""
 
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:344
+msgid "BubbleGum - leave a sticky pink puddle behind you"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:347
+msgid ""
+"Cake - thrown at the closest rival, best on short ranges and long straights"
+msgstr ""
+
 #: src/addons/network_http.cpp:296
 msgid "Can't access stkaddons server..."
 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:242 data/po/gui_strings.h:250
 msgid "Cancel"
 msgstr ""
 
@@ -281,6 +467,64 @@ 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:453
+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:441
+msgid "Choose a Kart"
+msgstr ""
+
+#. I18N: ./data/challenges/crescentcrossing.challenge
+#: data/po/gui_strings.h:86 data/po/gui_strings.h:702
+msgid "Collect Nitro in Math Class"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+#: data/po/gui_strings.h:298
+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:744
+msgid "Collect fuel for your rocket"
+msgstr ""
+
+#. I18N: ./data/challenges/tothemoonandback.challenge
+#: data/po/gui_strings.h:152 data/po/gui_strings.h:768
+msgid "Collect the Pharaohs Treasure"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+#: data/po/gui_strings.h:306
+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:687
+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"
@@ -296,7 +540,11 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:92
+#. 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:265
+#: data/po/gui_strings.h:268 data/po/gui_strings.h:271
 msgid "Continue"
 msgstr ""
 
@@ -304,17 +552,45 @@ msgstr ""
 msgid "Continue Grand Prix"
 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_players.cpp:70
 #: src/states_screens/options_screen_ui.cpp:112
-#: src/states_screens/options_screen_video.cpp:83
+#: src/states_screens/options_screen_video.cpp:83 data/po/gui_strings.h:511
+#: data/po/gui_strings.h:526
 msgid "Controls"
 msgstr ""
 
-#: src/states_screens/options_screen_input2.cpp:93
+#. 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:254
+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:93 data/po/gui_strings.h:515
 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"
@@ -331,6 +607,12 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+#: data/po/gui_strings.h:567
+msgid "Display FPS"
+msgstr ""
+
 #. I18N: In the player info dialog (when deleting)
 #: src/states_screens/dialogs/player_info_dialog.cpp:139
 #, c-format
@@ -354,6 +636,11 @@ msgstr ""
 msgid "Download failed.\n"
 msgstr ""
 
+#. I18N: ./data/karts/elephpant/kart.xml
+#: data/po/gui_strings.h:804
+msgid "Elephpant"
+msgstr ""
+
 #. I18N: button to enable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:82
 #: src/states_screens/options_screen_input2.cpp:457
@@ -361,7 +648,10 @@ msgid "Enable Device"
 msgstr ""
 
 #. I18N: in the graphical options tooltip; indicates a graphical feature is enabled
-#: src/states_screens/options_screen_video.cpp:274
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: Next to checkbox in settings menu
+#: src/states_screens/options_screen_video.cpp:274 data/po/gui_strings.h:488
+#: data/po/gui_strings.h:500
 msgid "Enabled"
 msgstr ""
 
@@ -374,12 +664,30 @@ msgstr ""
 msgid "English"
 msgstr ""
 
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+#: data/po/gui_strings.h:258
+msgid "Enter the new player's name"
+msgstr ""
+
 #: 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:640
+msgid "Exit Race"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#: data/po/gui_strings.h:659
+msgid "Expert"
+msgstr ""
+
 #: src/states_screens/feature_unlocked.cpp:461
 msgid "Feature Unlocked"
 msgstr ""
@@ -388,16 +696,110 @@ msgstr ""
 msgid "Final lap!"
 msgstr ""
 
+#. I18N: ./data/challenges/hacienda.challenge
+#: data/po/gui_strings.h:113 data/po/gui_strings.h:729
+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:765
+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:717
+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:726
+msgid "Finish Farm in 2:30"
+msgstr ""
+
+#. I18N: ./data/challenges/tollway.challenge
+#: data/po/gui_strings.h:146 data/po/gui_strings.h:762
+msgid "Finish Lighthouse in 1:30"
+msgstr ""
+
+#. I18N: ./data/challenges/fortmagma.challenge
+#: data/po/gui_strings.h:98 data/po/gui_strings.h:714
+msgid "Finish Mines in 3:00"
+msgstr ""
+
+#. I18N: ./data/challenges/crescentcrossing.challenge
+#: data/po/gui_strings.h:89 data/po/gui_strings.h:705
+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:771
+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:747
+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:186
 msgid "Fire"
 msgstr ""
 
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: In the help menu
+#: data/po/gui_strings.h:433
+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:738
+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:690
+msgid "Follow the Leader on a Desert Island"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+#: data/po/gui_strings.h:396
+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:598
+msgid "Fullscreen"
+msgstr ""
+
 #. I18N: warning, this string needs to be SHORT!
 #: src/states_screens/dialogs/race_over_dialog.cpp:255
 msgid "GP scores :"
@@ -408,6 +810,19 @@ msgstr ""
 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:286 data/po/gui_strings.h:333
+#: data/po/gui_strings.h:377 data/po/gui_strings.h:419
+msgid "Game Modes"
+msgstr ""
+
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:256
 #, c-format
@@ -420,20 +835,57 @@ 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:278 data/po/gui_strings.h:325
+#: data/po/gui_strings.h:369 data/po/gui_strings.h:411
+msgid "General"
+msgstr ""
+
 #: src/items/powerup.cpp:64
 msgid "Geronimo!!!"
 msgstr ""
 
+#. I18N: ./data/karts/gnu/kart.xml
+#: data/po/gui_strings.h:807
+msgid "Gnu"
+msgstr ""
+
 #: 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:810
+msgid "Gooey"
+msgstr ""
+
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: Section in track selection screen
+#: data/po/gui_strings.h:666
+msgid "Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the graphics settings
+#: data/po/gui_strings.h:586
+msgid "Graphical Effects Settings"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: Section in the settings menu
 #: 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
+#: src/states_screens/options_screen_ui.cpp:109 data/po/gui_strings.h:582
 msgid "Graphics"
 msgstr ""
 
@@ -441,6 +893,24 @@ msgstr ""
 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:465 data/po/gui_strings.h:636
+msgid "Help"
+msgstr ""
+
+#. I18N: ./data/karts/hexley/kart.xml
+#: data/po/gui_strings.h:813
+msgid "Hexley"
+msgstr ""
+
 #: src/states_screens/dialogs/race_over_dialog.cpp:216
 msgid "Highscores"
 msgstr ""
@@ -451,17 +921,60 @@ msgid ""
 "multiplayer games)"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+#: data/po/gui_strings.h:310
+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: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:655
+msgid "Intermediate"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+#: data/po/gui_strings.h:571
+msgid "Internet STK news"
+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:246
+msgid "Keep this resolution"
+msgstr ""
+
 #. I18N: short definition for follow-the-leader game mode
 #: 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:816
+msgid "Konqi"
+msgstr ""
+
 #. I18N: Shown at the end of a race
 #: src/states_screens/minimal_race_gui.cpp:108
 #: src/states_screens/race_gui.cpp:105
@@ -511,6 +1024,12 @@ 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:294
+msgid "Make your rivals bite dust!"
+msgstr ""
+
 #. I18N: if some kart animations are enabled
 #: src/states_screens/options_screen_video.cpp:280
 msgid "Me Only"
@@ -521,6 +1040,12 @@ msgstr ""
 msgid "Menu Keys"
 msgstr ""
 
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+#: data/po/gui_strings.h:575
+msgid "Minimal Race GUI"
+msgstr ""
+
 #. I18N: to appear in input configuration screen, for mouse (might not be used at all)
 #: src/input/binding.cpp:268
 #, c-format
@@ -533,6 +1058,41 @@ msgstr ""
 msgid "Mouse button %d"
 msgstr ""
 
+#. I18N: ./data/karts/mozilla/kart.xml
+#: data/po/gui_strings.h:819
+msgid "Mozilla"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+#: data/po/gui_strings.h:449
+msgid "Multiplayer Race"
+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:290 data/po/gui_strings.h:337
+#: data/po/gui_strings.h:381 data/po/gui_strings.h:423
+msgid "Multi­player"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: Section in the audio/video settings submenu
+#: data/po/gui_strings.h:484
+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"
@@ -572,6 +1132,11 @@ msgstr ""
 msgid "Nitro"
 msgstr ""
 
+#. I18N: ./data/karts/nolok/kart.xml
+#: data/po/gui_strings.h:822
+msgid "Nolok"
+msgstr ""
+
 #. I18N: if no kart animations are enabled
 #: src/states_screens/options_screen_video.cpp:282
 msgid "None"
@@ -582,25 +1147,87 @@ 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:651
+msgid "Novice"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: In race setup menu
+#: data/po/gui_strings.h:647
+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: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:461 data/po/gui_strings.h:632
+msgid "Options"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:356
+msgid "Parachute - slows down all karts in a better position!"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#: data/po/gui_strings.h:616
+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:786
+msgid "Penguin Playground"
+msgstr ""
+
+#. I18N: ./data/karts/pidgin/kart.xml
+#: data/po/gui_strings.h:825
+msgid "Pidgin"
+msgstr ""
+
+#. I18N: ./data/gui/tutorial.stkgui
+#: data/po/gui_strings.h:681
+msgid "Play all"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: Section in the settings menu
 #: 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
+#: src/states_screens/options_screen_video.cpp:82 data/po/gui_strings.h:544
 msgid "Players"
 msgstr ""
 
@@ -609,6 +1236,38 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:350
+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:262 data/po/gui_strings.h:613
+msgid "Press ESC to cancel"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#: data/po/gui_strings.h:605
+msgid "Press a key"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: In key bindings configuration menu
+#: data/po/gui_strings.h:530
+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:548
+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'."
@@ -619,10 +1278,32 @@ msgstr ""
 msgid "Problems removing the addon '%s'."
 msgstr ""
 
+#. I18N: ./data/karts/puffy/kart.xml
+#: data/po/gui_strings.h:828
+msgid "Puffy"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+#: data/po/gui_strings.h:473
+msgid "Quit"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+#: data/po/gui_strings.h:445
+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:643
+msgid "Race Setup"
+msgstr ""
+
 #: src/states_screens/dialogs/race_over_dialog.cpp:377
 msgid "Race in this track again"
 msgstr ""
@@ -651,6 +1332,14 @@ msgstr ""
 msgid "Ready!"
 msgstr ""
 
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+#: data/po/gui_strings.h:388
+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"
@@ -666,15 +1355,37 @@ msgstr ""
 msgid "Rescue"
 msgstr ""
 
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the graphics settings
+#: data/po/gui_strings.h:594
+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:628
+msgid "Restart Race"
+msgstr ""
+
 #. I18N: Key binding name
 #: 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 ""
@@ -689,13 +1400,20 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
+#. I18N: ./data/gui/racesetup.stkgui
+#: data/po/gui_strings.h:662
+msgid "Select a game mode"
+msgstr ""
+
 #: 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
+#: src/states_screens/race_result_gui.cpp:102 data/po/gui_strings.h:624
 msgid "Setup New Race"
 msgstr ""
 
@@ -704,6 +1422,54 @@ msgstr ""
 msgid "Sharp Turn"
 msgstr ""
 
+#. I18N: ./data/tracks/sandtrack/track.xml
+#: data/po/gui_strings.h:38
+msgid "Shifting Sands"
+msgstr ""
+
+#. I18N: ./data/tracks/city/track.xml
+#: data/po/gui_strings.h:8
+msgid "Shiny Suburbs"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the graphics settings
+#: data/po/gui_strings.h:563
+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:789
+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:496
+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 ""
@@ -712,6 +1478,11 @@ 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:174
 msgid "Steer Left"
@@ -722,15 +1493,81 @@ msgstr ""
 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:274 data/po/gui_strings.h:321
+#: data/po/gui_strings.h:365 data/po/gui_strings.h:407
+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_ui.stkgui
+#. I18N: ./data/gui/options_video.stkgui
+#: data/po/gui_strings.h:476 data/po/gui_strings.h:507
+#: data/po/gui_strings.h:522 data/po/gui_strings.h:540
+#: data/po/gui_strings.h:555 data/po/gui_strings.h:578
+msgid "SuperTuxKart Options"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#: data/po/gui_strings.h:426
+msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#: data/po/gui_strings.h:384
+msgid "SuperTuxKart features several game modes"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:362
+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:199
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/grandprix/test.grandprix
+#: data/po/gui_strings.h:176 data/po/gui_strings.h:792
+msgid "Test"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: in the help menu
+#: data/po/gui_strings.h:314
+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"
@@ -750,6 +1587,12 @@ msgstr ""
 msgid "Time Trial"
 msgstr ""
 
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+#: data/po/gui_strings.h:392
+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 "
@@ -762,6 +1605,17 @@ msgid ""
 "needs different keybindings in this case.)"
 msgstr ""
 
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: In the help menu
+#: data/po/gui_strings.h:341
+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:795
+msgid "To the Moon and Back"
+msgstr ""
+
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui.cpp:109
 #, c-format
@@ -774,10 +1628,32 @@ 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:674
+msgid "Tutorial : Selection Room"
+msgstr ""
+
+#. I18N: ./data/karts/tux/kart.xml
+#: data/po/gui_strings.h:831
+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 ""
@@ -795,19 +1671,40 @@ msgstr ""
 msgid "Updating the list..."
 msgstr ""
 
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:131
 #: src/states_screens/options_screen_input2.cpp:72
 #: src/states_screens/options_screen_players.cpp:69
-#: src/states_screens/options_screen_video.cpp:81
+#: src/states_screens/options_screen_video.cpp:81 data/po/gui_strings.h:559
 msgid "User Interface"
 msgstr ""
 
+#. I18N: ./data/gui/addons_view_dialog.stkgui
+#: data/po/gui_strings.h:203
+msgid "Version:"
+msgstr ""
+
 #: src/states_screens/dialogs/addons_loading.cpp:71
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+#: data/po/gui_strings.h:590
+msgid "Vertical Sync (requires restart)"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: Music volume in options
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: Sound volume in options
+#: data/po/gui_strings.h:492 data/po/gui_strings.h:504
+msgid "Volume"
+msgstr ""
+
 #: src/modes/linear_world.cpp:821
 msgid "WRONG WAY!"
 msgstr ""
@@ -819,12 +1716,139 @@ msgid ""
 "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:282 data/po/gui_strings.h:329
+#: data/po/gui_strings.h:373 data/po/gui_strings.h:415
+msgid "Weapons"
+msgstr ""
+
 #. 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:437
+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:834
+msgid "Wilber"
+msgstr ""
+
+#. I18N: ./data/challenges/followtheleader.challenge
+#: data/po/gui_strings.h:92 data/po/gui_strings.h:708
+msgid "Win Penguin Playground Grand Prix"
+msgstr ""
+
+#. I18N: ./data/challenges/followtheleader.challenge
+#: data/po/gui_strings.h:95 data/po/gui_strings.h:711
+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:756
+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:753
+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:777
+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:723
+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:735
+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:699
+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:693
+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:741
+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:750
+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:774
+msgid "Win a race on Canyon"
+msgstr ""
+
+#. I18N: ./data/challenges/gnu.challenge
+#: data/po/gui_strings.h:104 data/po/gui_strings.h:720
+msgid "Win a race on Fort Magma"
+msgstr ""
+
+#. I18N: ./data/challenges/island.challenge
+#: data/po/gui_strings.h:116 data/po/gui_strings.h:732
+msgid "Win a race on Snow Mountain"
+msgstr ""
+
+#. I18N: ./data/challenges/canyon.challenge
+#: data/po/gui_strings.h:80 data/po/gui_strings.h:696
+msgid "Win a race on Tux Tollway"
+msgstr ""
+
+#. I18N: ./data/challenges/alltracks.challenge
+#: data/po/gui_strings.h:68 data/po/gui_strings.h:684
+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:759
+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:238
+msgid "Yes"
+msgstr ""
+
 #: src/states_screens/grand_prix_win.cpp:378
 msgid "You completed the Grand Prix!"
 msgstr ""
diff --git a/data/po/update_pot.sh b/data/po/update_pot.sh
index 2bc5ac16d..f01bf0fdb 100755
--- a/data/po/update_pot.sh
+++ b/data/po/update_pot.sh
@@ -32,7 +32,7 @@ xgettext    -d supertuxkart -s --keyword=_ --keyword=_LTR --add-comments="I18N:"
 #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 --from-code=UTF-16 ./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-8 ./data/po/gui_strings.h --package-name=supertuxkart
 
 echo "    Done"
 echo "---------------------------"