From a7a802b918966652badd032ca9799f8b7c568f4a Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Thu, 7 Jan 2010 23:22:45 +0000
Subject: [PATCH] Removed all line breaks from challenge files, since line
 breaking is not automatic

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4409 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/followtheleader.challenge            |   4 +-
 data/grandprix/alltracks.challenge        |   4 +-
 data/grandprix/atworldsend.challenge      |   4 +-
 data/grandprix/snagdrive.challenge        |   4 +-
 data/grandprix/tothemoonandback.challenge |   2 +-
 data/po/extract_strings_from_XML.py       |  18 +-
 data/po/fr.po                             | 655 ++++++++++++----------
 data/po/fr/LC_MESSAGES/supertuxkart.mo    | Bin 13505 -> 14836 bytes
 data/po/supertuxkart.pot                  | 498 +++++++++-------
 9 files changed, 679 insertions(+), 510 deletions(-)

diff --git a/data/followtheleader.challenge b/data/followtheleader.challenge
index 937e312c5..ad17d0e02 100644
--- a/data/followtheleader.challenge
+++ b/data/followtheleader.challenge
@@ -2,8 +2,8 @@
 
 <challenge
     id="penguinplaygroundgp"
-    name="Win Penguin Playground Grand\nPrix"
-    description="Win Penguin Playground Grand\nPrix with 3 &apos;Racer&apos; Level AI karts."
+    name="Win Penguin Playground Grand Prix"
+    description="Win Penguin Playground Grand Prix with 3 &apos;Racer&apos; Level AI karts."
     unlock-mode="FOLLOW_LEADER"
     major="grandprix"
     minor="quickrace"
diff --git a/data/grandprix/alltracks.challenge b/data/grandprix/alltracks.challenge
index 6397a8c22..bac7e40fb 100644
--- a/data/grandprix/alltracks.challenge
+++ b/data/grandprix/alltracks.challenge
@@ -2,8 +2,8 @@
 
 <challenge
     id="worldsend"
-    name="Win the At World's End\nGrand Prix"
-    description="Come first in the At World's End\nGrand Prix with 3 'Racer'\nLevel AI karts."
+    name="Win the At World's End Grand Prix"
+    description="Come first in the At World's End Grand Prix with 3 'Racer' Level AI karts."
     unlock-gp="alltracks"
     depend-on="islandfollow"
     major="grandprix"
diff --git a/data/grandprix/atworldsend.challenge b/data/grandprix/atworldsend.challenge
index eb21f4250..3ae1b992d 100644
--- a/data/grandprix/atworldsend.challenge
+++ b/data/grandprix/atworldsend.challenge
@@ -2,8 +2,8 @@
 
 <challenge
     id="islandfollow"
-    name="Follow the Leader on a\nDesert Island"
-    description="Win a Follow the Leader race\nwith 3 AI karts\non a Desert Island."
+    name="Follow the Leader on a Desert Island"
+    description="Win a Follow the Leader race with 3 AI karts on a Desert Island."
     unlock-gp="atworldsend"
     depend-on="tothemoonandbackgp tollwayhead2head tollwaytime citytime"
     major="single"
diff --git a/data/grandprix/snagdrive.challenge b/data/grandprix/snagdrive.challenge
index 7c7d84262..6b50c4eab 100644
--- a/data/grandprix/snagdrive.challenge
+++ b/data/grandprix/snagdrive.challenge
@@ -2,8 +2,8 @@
 
 <challenge
     id="tothemoonandbackgp"
-    name="Win To the Moon and Back\nGrand Prix"
-    description="Win the To the Moon and Back\nGrand Prix with 3 'Racer'\nLevel AI karts."
+    name="Win To the Moon and Back Grand Prix"
+    description="Win the To the Moon and Back Grand Prix with 3 'Racer' Level AI karts."
     unlock-gp="snagdrive"
     depend-on="energyshiftingsands junglefollow"
     major="grandprix"
diff --git a/data/grandprix/tothemoonandback.challenge b/data/grandprix/tothemoonandback.challenge
index c0a86a9d4..27aa8dfcd 100644
--- a/data/grandprix/tothemoonandback.challenge
+++ b/data/grandprix/tothemoonandback.challenge
@@ -3,7 +3,7 @@
 <challenge
     id="energyshiftingsands"
     name="Collect the Pharaohs Treasure"
-    description="Finish with at least 9 nitro \npoints on 3 laps of Shifting Sands\nin under 2:20 minutes."
+    description="Finish with at least 9 nitro points on 3 laps of Shifting Sands in under 2:20 minutes."
     unlock-gp="tothemoonandback"
     depend-on="energymathclass racetracktime"
     major="single"
diff --git a/data/po/extract_strings_from_XML.py b/data/po/extract_strings_from_XML.py
index 230bc6b75..24b8df925 100755
--- a/data/po/extract_strings_from_XML.py
+++ b/data/po/extract_strings_from_XML.py
@@ -3,7 +3,7 @@ import sys
 
 f = open('./data/po/gui_strings.h', 'w')
 
-def traverse(node, isChallenge, level=0):
+def traverse(file, node, isChallenge, level=0):
   
     for e in node.childNodes:
         if e.localName == None:
@@ -20,9 +20,9 @@ def traverse(node, isChallenge, level=0):
                # print "Label=", e.getAttribute("name"), " Comment=", comment
                line = ""
                if comment == None:
-                   line += "_(\"" + e.getAttribute("name") + "\")\n\n"
+                   line += "//I18N: " + file + "\n_(\"" + e.getAttribute("name") + "\")\n\n"
                else:
-                   line += "//I18N: " + comment + "\n_(\"" + e.getAttribute("name") + "\");\n\n"
+                   line += "//I18N: File : " + file + "\n//I18N: " + comment + "\n_(\"" + e.getAttribute("name") + "\");\n\n"
                
                f.write( line )
                
@@ -30,9 +30,9 @@ def traverse(node, isChallenge, level=0):
                # print "Label=", e.getAttribute("description"), " Comment=", comment
                line = ""
                if comment == None:
-                   line += "_(\"" + e.getAttribute("description") + "\")\n\n"
+                   line += "//I18N: " + file + "\n_(\"" + e.getAttribute("description") + "\")\n\n"
                else:
-                   line += "//I18N: " + comment + "\n_(\"" + e.getAttribute("description") + "\");\n\n"
+                   line += "//I18N: File : " + file + "\n//I18N: " + comment + "\n_(\"" + e.getAttribute("description") + "\");\n\n"
                
                f.write( line )
         else:
@@ -40,14 +40,14 @@ def traverse(node, isChallenge, level=0):
                # print "Label=", e.getAttribute("text"), " Comment=", comment
                line = ""
                if comment == None:
-                   line += "_(\"" + e.getAttribute("text") + "\")\n\n"
+                   line += "//I18N: " + file + "\n_(\"" + e.getAttribute("text") + "\")\n\n"
                else:
-                   line += "//I18N: " + comment + "\n_(\"" + e.getAttribute("text") + "\");\n\n"
+                   line += "//I18N: " + file + "\n//I18N: " + comment + "\n_(\"" + e.getAttribute("text") + "\");\n\n"
                
                f.write( line )
 
         
-        traverse(e, isChallenge, level+1)
+        traverse(file, e, isChallenge, level+1)
       
 filenames = sys.argv[1:]
 for file in filenames:
@@ -58,5 +58,5 @@ for file in filenames:
         isChallenge = True
         
     doc = xml.dom.minidom.parse(file)
-    traverse(doc, isChallenge)
+    traverse(file, doc, isChallenge)
     
diff --git a/data/po/fr.po b/data/po/fr.po
index a7fea2b4f..d45972736 100644
--- a/data/po/fr.po
+++ b/data/po/fr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 21:08-0500\n"
-"PO-Revision-Date: 2010-01-01 21:10-0500\n"
+"POT-Creation-Date: 2010-01-07 18:18-0500\n"
+"PO-Revision-Date: 2010-01-07 18:21-0500\n"
 "Last-Translator: Marianne Gagnon (Auria) <auria.mg@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "%i laps"
 msgstr "%i tours"
 
-#: src/states_screens/kart_selection.cpp:415
+#: src/states_screens/kart_selection.cpp:417
 #, c-format
 msgid "%s is ready"
 msgstr "%s est prêt"
@@ -36,27 +36,32 @@ msgstr ""
 msgid "(Empty)"
 msgstr "(Vide)"
 
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:127
+#: data/po/gui_strings.h:174
 msgid "(more players can join by pressing 'fire' now)"
 msgstr "(d'autres joueurs peuvent se joindre en appuyant sur 'feu')"
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:58
+#: data/po/gui_strings.h:79
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Les contrôles peuvent être vus/modifiés dans les options."
 
+#. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:118
+#: data/po/gui_strings.h:162
 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 "* La plupart de ces modes de jeu peuvent aussi être joués en Grand Prix : au lieu de faire une seule course, il s'agit d'une compétition comprenant plusieurs pistes. Ceux qui arrivent en premier ont plus de points; à la fin, celui qui a le plus de points gagne."
 
-#: data/po/gui_strings.h:271
+#. I18N: ./data/gui/options_input.stkgui
+#: data/po/gui_strings.h:367
 msgid "* Which config to use will be inferred from which 'fire' key is pressed to join the game."
 msgstr "* Le jeu va automatiquement détecter quelle configuration utiliser selon la touche 'feu' utilisée pour se joindre au jeu."
 
+#. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:115
+#: data/po/gui_strings.h:158
 msgid "3 Strikes Battle : only in multiplayer games. Hit others with weapons until they lose all their lives."
 msgstr "Combat '3 prises' : seulement dans les jeux multijoueurs. Utilise des armes pour faire perdre leurs vies à tes rivaux !"
 
@@ -64,13 +69,15 @@ msgstr "Combat '3 prises' : seulement dans les jeux multijoueurs. Utilise des ar
 msgid "= Highscores ="
 msgstr "= Meilleurs scores ="
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:157
+#: data/po/gui_strings.h:214
 msgid "About"
 msgstr "À propos"
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:215
+#: data/po/gui_strings.h:292
 msgid "Accelerate"
 msgstr "Accélérer"
 
@@ -79,36 +86,45 @@ msgstr "Accélérer"
 msgid "Add Keyboard Configuration"
 msgstr "Ajouter un clavier"
 
+#. I18N: ./data/gui/options_players.stkgui
 #. I18N: In players configuration menu
-#: data/po/gui_strings.h:291
+#: data/po/gui_strings.h:394
 msgid "Add Player"
 msgstr "Ajouter un joueur"
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:269
+#: data/po/gui_strings.h:364
 msgid "Add a device"
 msgstr "Ajouter une configuration"
 
+#. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: Kart group
+#. I18N: ./data/gui/tracks.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:11
-#: data/po/gui_strings.h:133
-#: data/po/gui_strings.h:335
+#: data/po/gui_strings.h:15
+#: data/po/gui_strings.h:182
+#: data/po/gui_strings.h:455
 msgid "Add-Ons"
 msgstr ""
 
+#. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: Kart group
+#. I18N: ./data/gui/tracks.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:14
-#: data/po/gui_strings.h:139
-#: data/po/gui_strings.h:338
+#: data/po/gui_strings.h:19
+#: data/po/gui_strings.h:190
+#: data/po/gui_strings.h:459
 msgid "All"
 msgstr "Tout"
 
+#. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
-#: data/po/gui_strings.h:326
+#: data/po/gui_strings.h:443
 msgid "All Tracks"
 msgstr "Toutes les pistes"
 
@@ -116,28 +132,37 @@ msgstr "Toutes les pistes"
 msgid "All blows allowed, so catch weapons and make clever use of them!"
 msgstr "Tous les coups sont permis, alors collecte des armes et utilise-les astucieusement!"
 
-#: data/po/gui_strings.h:87
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:120
 msgid "Anchor - slows down greatly the kart in the first position"
 msgstr "Ancre - ralentit beaucoup le premier kart"
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: In the video settings menu
-#: data/po/gui_strings.h:195
+#: data/po/gui_strings.h:265
 msgid "Apply video changes"
 msgstr "Appliquer le mode vidéo"
 
+#. I18N: ./data/gui/arenas.stkgui
 #. I18N: Section in arena tracks selection screen
-#: data/po/gui_strings.h:2
+#: data/po/gui_strings.h:3
 msgid "Arenas"
 msgstr "Arènes"
 
-#: data/po/gui_strings.h:323
+#. I18N: ./data/gui/tracks.stkgui
+#: data/po/gui_strings.h:439
 msgid "At World's End"
 msgstr "Au bout du monde"
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in the settings menu
-#: data/po/gui_strings.h:165
-#: data/po/gui_strings.h:203
-#: data/po/gui_strings.h:279
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: Section in the settings menu
+#: data/po/gui_strings.h:225
+#: data/po/gui_strings.h:276
+#: data/po/gui_strings.h:378
 msgid "Audio/Video"
 msgstr "Audio/Vidéo"
 
@@ -147,19 +172,31 @@ msgstr "Audio/Vidéo"
 msgid "Axis %d %s"
 msgstr "Axe %d %s"
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu, to return to the previous screen
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: In the help menu, to return to the previous screen
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu, to return to the previous screen
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: In the options menu, to go back to the main menu or game
-#: data/po/gui_strings.h:61
-#: data/po/gui_strings.h:90
-#: data/po/gui_strings.h:121
-#: data/po/gui_strings.h:198
-#: data/po/gui_strings.h:274
-#: data/po/gui_strings.h:294
+#. 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
+#: data/po/gui_strings.h:83
+#: data/po/gui_strings.h:124
+#: data/po/gui_strings.h:166
+#: data/po/gui_strings.h:269
+#: data/po/gui_strings.h:371
+#: data/po/gui_strings.h:398
 msgid "Back"
 msgstr "Retour"
 
-#: data/po/gui_strings.h:22
-#: data/po/gui_strings.h:27
+#. I18N: ./data/gui/challenges.stkgui
+#. I18N: ./data/gui/credits.stkgui
+#: data/po/gui_strings.h:30
+#: data/po/gui_strings.h:37
 msgid "Back to main menu"
 msgstr "Retour au menu principal"
 
@@ -167,22 +204,26 @@ msgstr "Retour au menu principal"
 msgid "Back to the main menu"
 msgstr "Retour au menu principal"
 
-#: data/po/gui_strings.h:83
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:114
 msgid "Bowling Ball - bounces off walls. If you are looking back, it will be thrown backwards."
 msgstr "Boule de Bowling - rebondit sur les murs. Tu peux aussi la lancer derrière toi en utilisant la touche 'regarder derrière'."
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:221
+#: data/po/gui_strings.h:300
 msgid "Brake"
 msgstr "Freiner"
 
-#: data/po/gui_strings.h:77
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:105
 msgid "BubbleGum - leave a sticky pink puddle behind you"
 msgstr ""
 "Chewing gum - laisse une mare de gomme\n"
 "rose et collante derrière toi"
 
-#: data/po/gui_strings.h:79
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:108
 msgid "Cake - thrown at the closest rival, best on short ranges and long straights"
 msgstr "Gâteau - lance-le sur ton plus proche rival, idéal sur courtes distances et sur les routes droites"
 
@@ -197,48 +238,50 @@ msgstr "Annuler"
 msgid "Cancel Remove"
 msgstr "Annuler la supression"
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:148
+#: data/po/gui_strings.h:202
 msgid "Challenges"
 msgstr "Défis"
 
+#. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:17
+#: data/po/gui_strings.h:23
 msgid "Challenges : Trophy Room"
 msgstr "Défis : salle des trophées"
 
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:124
+#: data/po/gui_strings.h:170
 msgid "Choose a Kart"
 msgstr "Choisis un Kart"
 
-#: data/po/gui_strings.h:372
+#. I18N: ./data/tracks/crescentcrossing/crescentcrossing.challenge
+#: data/po/gui_strings.h:510
 msgid "Collect Nitro in Math Class"
 msgstr "Nitro dans la classe de maths !"
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:46
+#: data/po/gui_strings.h:63
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Ramasse les boîtes bleues : elles contiennent des armes et divers bonus"
 
-#: data/po/gui_strings.h:356
+#. I18N: ./data/grandprix/tothemoonandback.challenge
+#: data/po/gui_strings.h:486
 msgid "Collect the Pharaohs Treasure"
 msgstr "Le trésor du Pharaon"
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:49
+#: data/po/gui_strings.h:67
 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 "La nitro que tu collectes peut être ensuite utilisée pour te propulser vers l'avant en utilisant la touche correspondante. Ton niveau de nitro est visible dans la barre à la droite de l'écran."
 
-#: data/po/gui_strings.h:346
-msgid ""
-"Come first in the At World's End\n"
-"Grand Prix with 3 'Racer'\n"
-"Level AI karts."
-msgstr ""
-"Arrive premier dans le grand prix\n"
-"'Au bout du monde' contre 3 opposants\n"
-"virtuels de niveau élevé."
+#. I18N: ./data/grandprix/alltracks.challenge
+#: data/po/gui_strings.h:471
+msgid "Come first in the At World's End Grand Prix with 3 'Racer' Level AI karts."
+msgstr "Arrive premier dans le grand prix 'Au bout du monde' contre 3 opposants virtuels de niveau élevé."
 
 #. I18N: In the player info dialog (when deleting)
 #: src/states_screens/dialogs/player_info_dialog.cpp:147
@@ -249,7 +292,8 @@ msgstr "Confirme la suppression"
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Aucun bonus dans les pistes - seule ton habileté compte !"
 
-#: data/po/gui_strings.h:29
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#: data/po/gui_strings.h:40
 msgid "Continue"
 msgstr "Continuer"
 
@@ -257,15 +301,21 @@ msgstr "Continuer"
 msgid "Continue Grand Prix"
 msgstr "Continuer le Grand Prix"
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in the settings menu
-#: data/po/gui_strings.h:171
-#: data/po/gui_strings.h:209
-#: data/po/gui_strings.h:285
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: Section in the settings menu
+#: data/po/gui_strings.h:233
+#: data/po/gui_strings.h:284
+#: data/po/gui_strings.h:386
 msgid "Controls"
 msgstr "Contrôles"
 
+#. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:25
+#: data/po/gui_strings.h:34
 msgid "Credits"
 msgstr "Crédits"
 
@@ -275,9 +325,10 @@ msgstr "Crédits"
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Voulez-vous vraiment supprimer le joueur '%s' ?"
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Next to checkbox in settings menu
-#: data/po/gui_strings.h:177
-#: data/po/gui_strings.h:183
+#: data/po/gui_strings.h:241
+#: data/po/gui_strings.h:249
 msgid "Enabled"
 msgstr "Activé"
 
@@ -286,8 +337,9 @@ msgstr "Activé"
 msgid "Enter the new player's name"
 msgstr "Entre le nom du nouveau joueur"
 
+#. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:308
+#: data/po/gui_strings.h:417
 msgid "Expert"
 msgstr "Expert"
 
@@ -299,108 +351,88 @@ msgstr "Fonctionnalité Déverouillée"
 msgid "Final lap!"
 msgstr "Dernier tour!"
 
-#: data/po/gui_strings.h:382
-msgid ""
-"Finish 3 laps in Racetrack\n"
-"with 3 easy AI karts\n"
-"in under 2:40 minutes."
-msgstr ""
-"Finis 3 tours dans 'Piste de\n"
-"course' avec trois opposants\n"
-"virtuels novices en 2:40."
+#. I18N: ./data/tracks/jungle/jungle.challenge
+#: data/po/gui_strings.h:525
+msgid "Finish 3 laps in Racetrack with 3 easy AI karts in under 2:40 minutes."
+msgstr "Finis 3 tours dans 'Piste de course' avec trois opposants virtuels novices en 2:40."
 
-#: data/po/gui_strings.h:386
-msgid ""
-"Finish 3 laps on the City track\n"
-"with 3 AI karts\n"
-"in under 4:20 minutes."
-msgstr ""
-"Finis 3 tours dans la piste\n"
-"'Ville' contre 3 opposants\n"
-"virtuels en 4:20."
+#. I18N: ./data/tracks/snowtuxpeak/snowtuxpeak.challenge
+#: data/po/gui_strings.h:531
+msgid "Finish 3 laps on the City track with 3 AI karts in under 4:20 minutes."
+msgstr "Finis 3 tours dans la piste 'Ville' contre 3 opposants virtuels en 4:20."
 
-#: data/po/gui_strings.h:366
-msgid ""
-"Finish 3 laps on the Tux Tollway\n"
-"track with 3 AI karts\n"
-"in under 3:35 minutes."
-msgstr ""
-"Finis 3 tours dans 'L'autoroute\n"
-"de Tux' contre 3 opposants\n"
-"virtuels en 3:35."
+#. I18N: ./data/tracks/canyon/canyon.challenge
+#: data/po/gui_strings.h:501
+msgid "Finish 3 laps on the Tux Tollway track with 3 AI karts in under 3:35 minutes."
+msgstr "Finis 3 tours dans 'L'autoroute de Tux' contre 3 opposants virtuels en 3:35."
 
-#: data/po/gui_strings.h:380
+#. I18N: ./data/tracks/jungle/jungle.challenge
+#: data/po/gui_strings.h:522
 msgid "Finish Race track in 2:40"
 msgstr "Piste de course en 2:40"
 
-#: data/po/gui_strings.h:364
+#. I18N: ./data/tracks/canyon/canyon.challenge
+#: data/po/gui_strings.h:498
 msgid "Finish Tux Tollway track in 3:35"
 msgstr "L'autoroute de Tux en 3:35"
 
-#: data/po/gui_strings.h:384
+#. I18N: ./data/tracks/snowtuxpeak/snowtuxpeak.challenge
+#: data/po/gui_strings.h:528
 msgid "Finish the City track in 4:20"
 msgstr "Course dans la ville en 4:20"
 
-#: data/po/gui_strings.h:374
-#, fuzzy
-msgid ""
-"Finish with at least 6 points\n"
-" of intro on three laps of\n"
-"Oliver's Math Class\n"
-"in under 52 seconds."
-msgstr ""
-"Ramasse au moins 6\n"
-"points de nitro en 3 tours\n"
-"de 'La classe de Maths\n"
-"d'Oliver' en 52 secondes."
+#. I18N: ./data/tracks/crescentcrossing/crescentcrossing.challenge
+#: data/po/gui_strings.h:513
+msgid "Finish with at least 6 points of intro on three laps of Oliver's Math Class in under 52 seconds."
+msgstr "Ramasse au moins 6 points de nitro en 3 tours de 'La classe de Maths d'Oliver' en 52 secondes."
 
-#: data/po/gui_strings.h:358
-msgid ""
-"Finish with at least 9 nitro \n"
-"points on 3 laps of Shifting Sands\n"
-"in under 2:20 minutes."
-msgstr ""
-"Ramasse au moins 9\n"
-"points de nitro en 3 tours\n"
-"sur la piste 'Sables\n"
-"mouvants' en 2:20."
+#. I18N: ./data/grandprix/tothemoonandback.challenge
+#: data/po/gui_strings.h:489
+msgid "Finish with at least 9 nitro points on 3 laps of Shifting Sands in under 2:20 minutes."
+msgstr "Ramasse au moins 9 points de nitro en 3 tours sur la piste 'Sables mouvants' en 2:20."
 
 #. I18N: Shown at the end of a race
-#: src/states_screens/race_gui.cpp:593
+#: src/states_screens/race_gui.cpp:591
 msgid "Finished"
 msgstr "Fini"
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:239
+#: data/po/gui_strings.h:324
 msgid "Fire"
 msgstr "Tirer"
 
-#: data/po/gui_strings.h:368
+#. I18N: ./data/tracks/city/city.challenge
+#: data/po/gui_strings.h:504
 msgid "Follow the Leader in the Jungle"
 msgstr "Suis le meneur dans la jungle"
 
-#: data/po/gui_strings.h:348
-msgid ""
-"Follow the Leader on a\n"
-"Desert Island"
-msgstr ""
-"Suis le meneur sur une\n"
-"île déserte"
+#. I18N: ./data/grandprix/atworldsend.challenge
+#: data/po/gui_strings.h:474
+msgid "Follow the Leader on a Desert Island"
+msgstr "Suis le meneur sur une île déserte"
 
+#. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:112
+#: data/po/gui_strings.h:154
 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 "Suis le meneur: vise la seconde place, car lorsque le compte à rebours atteint zéro, le dernier est éliminé. Attention: dépasser le meneur n'est pas non plus recommendé, car là aussi tu risques l'élimination!"
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:189
+#: data/po/gui_strings.h:257
 msgid "Fullscreen"
 msgstr "Plein-écran"
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:40
-#: data/po/gui_strings.h:72
-#: data/po/gui_strings.h:101
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#: data/po/gui_strings.h:55
+#: data/po/gui_strings.h:98
+#: data/po/gui_strings.h:139
 msgid "Game Modes"
 msgstr "Modes de jeu"
 
@@ -416,25 +448,32 @@ msgstr "Manette, bouton %d"
 msgid "Gamepad hat %d"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:34
-#: data/po/gui_strings.h:66
-#: data/po/gui_strings.h:95
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#: data/po/gui_strings.h:47
+#: data/po/gui_strings.h:90
+#: data/po/gui_strings.h:131
 msgid "General"
 msgstr "Général"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:786
+#: src/states_screens/race_gui.cpp:803
 msgid "Go!"
 msgstr "Partez!"
 
+#. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
-#: data/po/gui_strings.h:315
+#: data/po/gui_strings.h:427
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:154
+#: data/po/gui_strings.h:210
 msgid "Help"
 msgstr "Aide"
 
@@ -443,19 +482,20 @@ msgid "Highscores"
 msgstr "Meilleurs scores"
 
 #: src/states_screens/race_setup_screen.cpp:190
-#, fuzzy
 msgid "Hit others with weapons until they lose all their lives. (Only in multiplayer games)"
 msgstr ""
 "Combat '3 prises' \n"
 "seulement dans les jeux multijoueurs. Utilise des armes pour faire perdre leurs vies à tes rivaux !"
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:52
+#: data/po/gui_strings.h:71
 msgid "If you see a button with a lock like this one, you need to complete a challenge to unlock it."
 msgstr "Certains boutons ont un cadenas comme celui-ci. Tu dois réussir un défi pour en gagner l'accès."
 
+#. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:305
+#: data/po/gui_strings.h:413
 msgid "Intermediate"
 msgstr "Intermédiaire"
 
@@ -464,8 +504,8 @@ msgstr "Intermédiaire"
 msgid "Keyboard %i"
 msgstr "Clavier %i"
 
-#: src/states_screens/race_gui.cpp:601
-#: src/states_screens/race_gui.cpp:604
+#: src/states_screens/race_gui.cpp:599
+#: src/states_screens/race_gui.cpp:602
 msgid "Lap"
 msgstr "Tour"
 
@@ -473,8 +513,9 @@ msgstr "Tour"
 msgid "Leader"
 msgstr "Meneur"
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:227
+#: data/po/gui_strings.h:308
 msgid "Left"
 msgstr "Gauche"
 
@@ -485,13 +526,15 @@ msgstr "Gauche"
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Barré : relève des défis pour accéder à plus!"
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:263
+#: data/po/gui_strings.h:356
 msgid "Look Back"
 msgstr "Regarder en arrière"
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:43
+#: data/po/gui_strings.h:59
 msgid "Make your rivals bite dust!"
 msgstr "Fais mordre la poussière à tes rivaux!"
 
@@ -507,13 +550,15 @@ msgstr "Souris, axe %d %s"
 msgid "Mouse button %d"
 msgstr "Souris, bouton %d"
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in the audio/video settings submenu
-#: data/po/gui_strings.h:174
+#: data/po/gui_strings.h:237
 msgid "Music"
 msgstr "Musique"
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:145
+#: data/po/gui_strings.h:198
 msgid "Networking"
 msgstr "Jeu en ligne"
 
@@ -573,28 +618,33 @@ msgstr ""
 "'%s'\n"
 "déverrouillée"
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:245
+#: data/po/gui_strings.h:332
 msgid "Nitro"
 msgstr "Nitro"
 
+#. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:302
+#: data/po/gui_strings.h:409
 msgid "Novice"
 msgstr "Débutant"
 
+#. I18N: ./data/gui/racesetup.stkgui
 #. I18N: In race setup menu
-#: data/po/gui_strings.h:299
+#: data/po/gui_strings.h:405
 #, fuzzy
 msgid "Number of AI karts"
 msgstr "Nombre de karts IA"
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
+#: data/po/gui_strings.h:206
 msgid "Options"
 msgstr "Options"
 
-#: data/po/gui_strings.h:85
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:117
 msgid "Parachute - slows down all karts in a better position!"
 msgstr "Parachute - ralentit tous les karts en meilleure position que toi !"
 
@@ -606,25 +656,32 @@ msgstr "Pause"
 msgid "Penalty time!!"
 msgstr "Temps de pénalité !"
 
-#: data/po/gui_strings.h:317
+#. I18N: ./data/gui/tracks.stkgui
+#: data/po/gui_strings.h:430
 msgid "Penguin Playground"
 msgstr "Pour jeunes pingouins"
 
 #. I18N: In kart selection screen (Will read like 'Player 1 (foobartech gamepad)')
-#: src/states_screens/kart_selection.cpp:234
-#: src/states_screens/kart_selection.cpp:347
+#: src/states_screens/kart_selection.cpp:236
+#: src/states_screens/kart_selection.cpp:349
 #, c-format
 msgid "Player %i (%s)"
 msgstr "Joueur %i (%s)"
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in the settings menu
-#: data/po/gui_strings.h:168
-#: data/po/gui_strings.h:206
-#: data/po/gui_strings.h:282
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: Section in the settings menu
+#: data/po/gui_strings.h:229
+#: data/po/gui_strings.h:280
+#: data/po/gui_strings.h:382
 msgid "Players"
 msgstr "Joueurs"
 
-#: data/po/gui_strings.h:81
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:111
 msgid "Plunger - throw straight to pull an opponent back, or throw while looking back to make one lose sight!"
 msgstr "Débouchoir à ventouse - lance-le droit devant pour tirer un opposant vers l'arrière, ou lance-le en regardant vers l'arrière pour lui obstruer la vue !"
 
@@ -636,18 +693,21 @@ msgstr "Appuie sur <ESC> pour annuler"
 msgid "Press a key"
 msgstr "Appuie sur une touche"
 
+#. I18N: ./data/gui/options_players.stkgui
 #. I18N: In players configuration menu
-#: data/po/gui_strings.h:288
+#: data/po/gui_strings.h:390
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Tu peux éditer un joeur avec la touche entrée ou un double-clic"
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:160
+#: data/po/gui_strings.h:218
 msgid "Quit"
 msgstr "Quitter"
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:142
+#: data/po/gui_strings.h:194
 msgid "Race"
 msgstr "Course"
 
@@ -655,7 +715,8 @@ msgstr "Course"
 msgid "Race Results"
 msgstr "Résultats de la course"
 
-#: data/po/gui_strings.h:296
+#. I18N: ./data/gui/racesetup.stkgui
+#: data/po/gui_strings.h:401
 #, fuzzy
 msgid "Race Setup"
 msgstr "Réglages de la course"
@@ -668,9 +729,9 @@ msgstr "Rejouer cette piste"
 msgid "Random Arena"
 msgstr "Arène aléatoire"
 
-#: src/states_screens/kart_selection.cpp:663
-#: src/states_screens/kart_selection.cpp:950
-#: src/states_screens/kart_selection.cpp:1135
+#: src/states_screens/kart_selection.cpp:665
+#: src/states_screens/kart_selection.cpp:953
+#: src/states_screens/kart_selection.cpp:1236
 msgid "Random Kart"
 msgstr "Kart aléatoire"
 
@@ -679,12 +740,13 @@ msgid "Random Track"
 msgstr "Piste aléatoire"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:764
+#: src/states_screens/race_gui.cpp:781
 msgid "Ready!"
 msgstr "À vos marques..."
 
+#. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:106
+#: data/po/gui_strings.h:146
 msgid "Regular Race - all blows allowed, so catch weapons and make clever use of them!"
 msgstr "Course normale - tous les coups sont permis, alors utilise les armes pour t'aider à gagner!"
 
@@ -698,29 +760,29 @@ msgstr "Supprimer"
 msgid "Rename"
 msgstr "Renommer"
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:257
+#: data/po/gui_strings.h:348
 msgid "Rescue"
 msgstr "Sauvetage"
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:233
+#: data/po/gui_strings.h:316
 msgid "Right"
 msgstr "Droite"
 
 #: src/states_screens/race_setup_screen.cpp:182
-#, fuzzy
 msgid "Run for second place, as the last kart will be disqualified every time the counter hits zero. Beware : going in front of the leader will get you eliminated too!"
-msgstr ""
-"Suis le meneur\n"
-"vise la seconde place, car lorsque le compte à rebours atteint zéro, le dernier est éliminé. Attention: dépasser le meneur n'est pas non plus recommendé, car là aussi tu risques l'élimination!"
+msgstr "vise la seconde place, car lorsque le compte à rebours atteint zéro, le dernier est éliminé. Attention: dépasser le meneur n'est pas non plus recommendé, car là aussi tu risques l'élimination!"
 
-#: data/po/gui_strings.h:310
+#. I18N: ./data/gui/racesetup.stkgui
+#: data/po/gui_strings.h:420
 msgid "Select a game mode"
 msgstr "Choisis un mode de jeu"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:775
+#: src/states_screens/race_gui.cpp:792
 msgid "Set!"
 msgstr "Prêts"
 
@@ -728,31 +790,38 @@ msgstr "Prêts"
 msgid "Setup New Race"
 msgstr "Nouvelle course"
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:251
+#: data/po/gui_strings.h:340
 msgid "Sharp Turn"
 msgstr "Virage brusque"
 
-#: data/po/gui_strings.h:319
+#. I18N: ./data/gui/tracks.stkgui
+#: data/po/gui_strings.h:433
 msgid "Snag Drive"
 msgstr "Chemin des Embûches"
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in audio/video settings submenu
-#: data/po/gui_strings.h:180
+#: data/po/gui_strings.h:245
 msgid "Sound Effects"
 msgstr "Effets sonores"
 
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: Kart group
-#: data/po/gui_strings.h:136
+#: data/po/gui_strings.h:186
 msgid "Special"
 msgstr "Spécial"
 
+#. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: Kart group
+#. I18N: ./data/gui/tracks.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:8
-#: data/po/gui_strings.h:130
-#: data/po/gui_strings.h:332
+#: data/po/gui_strings.h:11
+#: data/po/gui_strings.h:178
+#: data/po/gui_strings.h:451
 msgid "Standard"
 msgstr "Standard"
 
@@ -760,24 +829,32 @@ msgstr "Standard"
 msgid "Start Race"
 msgstr "Commencer la course"
 
-#: data/po/gui_strings.h:31
-#: data/po/gui_strings.h:63
-#: data/po/gui_strings.h:92
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/help3.stkgui
+#: data/po/gui_strings.h:43
+#: data/po/gui_strings.h:86
+#: data/po/gui_strings.h:127
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart : Aide"
 
-#: data/po/gui_strings.h:162
-#: data/po/gui_strings.h:200
-#: data/po/gui_strings.h:276
+#. I18N: ./data/gui/options_av.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#: data/po/gui_strings.h:221
+#: data/po/gui_strings.h:272
+#: data/po/gui_strings.h:374
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart : Options"
 
-#: data/po/gui_strings.h:103
+#. I18N: ./data/gui/help3.stkgui
+#: data/po/gui_strings.h:142
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart contient plusieurs modes de jeu"
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:55
+#: data/po/gui_strings.h:75
 msgid "The 'sharp turn' key allows you to do sharp turns and have better control in tight curves"
 msgstr "La touche 'virage brusque' te permet de faire des virages rapides et d'avoir un meilleur contrôle dans les courbes prononcées"
 
@@ -789,8 +866,9 @@ msgstr ""
 "Le fichier des meilleurs scores était\n"
 "trop vieux, il a donc été supprimé."
 
+#. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:109
+#: data/po/gui_strings.h:150
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr "Contre la montre : aucun bonus dans les pistes - seule ton habileté compte !"
 
@@ -805,12 +883,14 @@ msgstr ""
 "\n"
 "Pour ajouter une configuration clavier supplémentaire, tu peux utiliser le bouton ci-dessous. TOUTEFOIS, il est important de noter que la majorité des claviers ne peuvent pas gérer plus de quelques touches enfoncées à la fois, ce serait donc inapproprié pour le jeu multijoueur."
 
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:75
+#: data/po/gui_strings.h:102
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Pour t'aider à gagner, voici certains bonus que tu peux ramasser :"
 
-#: data/po/gui_strings.h:321
+#. I18N: ./data/gui/tracks.stkgui
+#: data/po/gui_strings.h:436
 msgid "To the Moon and Back"
 msgstr "Jusqu'à la lune"
 
@@ -820,8 +900,9 @@ msgstr "Jusqu'à la lune"
 msgid "Track by %s"
 msgstr "Piste par %s"
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in the audio/video settings submenu
-#: data/po/gui_strings.h:186
+#: data/po/gui_strings.h:253
 msgid "Video"
 msgstr "Vidéo"
 
@@ -829,113 +910,74 @@ msgstr "Vidéo"
 msgid "WRONG WAY!"
 msgstr "MAUVAISE DIRECTION !"
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:37
-#: data/po/gui_strings.h:69
-#: data/po/gui_strings.h:98
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#: data/po/gui_strings.h:51
+#: data/po/gui_strings.h:94
+#: data/po/gui_strings.h:135
 msgid "Weapons"
 msgstr "Armes"
 
-#: data/po/gui_strings.h:340
-msgid ""
-"Win Penguin Playground Grand\n"
-"Prix"
-msgstr "Gagne le Grnd Prix'Pour jeunes pingouins'"
+#. I18N: ./data/followtheleader.challenge
+#: data/po/gui_strings.h:462
+msgid "Win Penguin Playground Grand Prix"
+msgstr "Gagne le Grand Prix 'Pour jeunes pingouins'"
 
-#: data/po/gui_strings.h:342
-#, fuzzy
-msgid ""
-"Win Penguin Playground Grand\n"
-"Prix with 3 'Racer' Level AI karts."
-msgstr ""
-"Remporte le grand prix 'Jusqu'à\n"
-"la lune' contre 3 opposants\n"
-"virtuels expérimentés."
+#. I18N: ./data/followtheleader.challenge
+#: data/po/gui_strings.h:465
+msgid "Win Penguin Playground Grand Prix with 3 'Racer' Level AI karts."
+msgstr "Remporte le grand prix 'Jusqu'à la lune' contre 3 opposants virtuels expérimentés."
 
-#: data/po/gui_strings.h:352
-#, fuzzy
-msgid ""
-"Win To the Moon and Back\n"
-"Grand Prix"
-msgstr ""
-"Remporte le grand prix\n"
-"'Jusqu'à la lune'."
+#. I18N: ./data/grandprix/snagdrive.challenge
+#: data/po/gui_strings.h:480
+msgid "Win To the Moon and Back Grand Prix"
+msgstr "Remporte le grand prix 'Jusqu'à la lune'."
 
-#: data/po/gui_strings.h:378
-msgid ""
-"Win a 1 lap Head to Head\n"
-"on Tux Tollway against 1 'Racer'\n"
-"level AI kart."
-msgstr ""
-"Remporte un duel d'un tour\n"
-"sur l'Autoroute de Tux contre\n"
-"un opposant virtuel expérimenté."
+#. I18N: ./data/tracks/fortmagma/fortmagma.challenge
+#: data/po/gui_strings.h:519
+msgid "Win a 1 lap Head to Head on Tux Tollway against 1 'Racer' level AI kart."
+msgstr "Remporte un duel d'un tour sur l'Autoroute de Tux contre un opposant virtuel expérimenté."
 
-#: data/po/gui_strings.h:362
-#, fuzzy
-msgid ""
-"Win a 4 lap race\n"
-"on Snow Mountain against 4 'Racer'\n"
-"level AI kart."
-msgstr ""
-"Remporte un duel d'un tour\n"
-"sur l'Autoroute de Tux contre\n"
-"un opposant virtuel expérimenté."
+#. I18N: ./data/karts/gnu/gnu.challenge
+#: data/po/gui_strings.h:495
+msgid "Win a 4 lap race on Snow Mountain against 4 'Racer' level AI kart."
+msgstr "Remporte un duel d'un tour sur l'Autoroute de Tux contre un opposant virtuel expérimenté."
 
-#: data/po/gui_strings.h:370
-msgid ""
-"Win a Follow the Leader race\n"
-"with 3 AI karts\n"
-"in the Amazonian Jungle."
-msgstr ""
-"Remporte une course de type\n"
-"'Suis le meneur' contre 3\n"
-"opposants dans la jungle."
+#. I18N: ./data/tracks/city/city.challenge
+#: data/po/gui_strings.h:507
+msgid "Win a Follow the Leader race with 3 AI karts in the Amazonian Jungle."
+msgstr "Remporte une course de type 'Suis le meneur' contre 3 opposants dans la jungle."
 
-#: data/po/gui_strings.h:350
-msgid ""
-"Win a Follow the Leader race\n"
-"with 3 AI karts\n"
-"on a Desert Island."
-msgstr ""
-"Remporte une course de type\n"
-"'Suis le meneur' contre 3\n"
-"opposants sur un île déserte."
+#. I18N: ./data/grandprix/atworldsend.challenge
+#: data/po/gui_strings.h:477
+msgid "Win a Follow the Leader race with 3 AI karts on a Desert Island."
+msgstr "Remporte une course de type 'Suis le meneur' contre 3 opposants sur un île déserte."
 
-#: data/po/gui_strings.h:376
-msgid ""
-"Win a Head to Head on\n"
-"Tux Tollway"
-msgstr ""
-"Remporte un duel sur\n"
-"l'Autoroute de Tux."
+#. I18N: ./data/tracks/fortmagma/fortmagma.challenge
+#: data/po/gui_strings.h:516
+msgid "Win a Head to Head on Tux Tollway"
+msgstr "Remporte un duel sur l'Autoroute de Tux."
 
-#: data/po/gui_strings.h:360
-#, fuzzy
-msgid ""
-"Win a race on\n"
-"Snow Mountain"
-msgstr "Sommet enneigé"
+#. I18N: ./data/karts/gnu/gnu.challenge
+#: data/po/gui_strings.h:492
+msgid "Win a race on Snow Mountain"
+msgstr "Remporte une course sur \"Sommet enneigé\""
 
-#: data/po/gui_strings.h:344
-msgid ""
-"Win the At World's End\n"
-"Grand Prix"
-msgstr ""
-"Remporte le grand prix\n"
-"'Au bout du monde'."
+#. I18N: ./data/grandprix/alltracks.challenge
+#: data/po/gui_strings.h:468
+msgid "Win the At World's End Grand Prix"
+msgstr "Remporte le grand prix 'Au bout du monde'."
 
-#: data/po/gui_strings.h:354
-msgid ""
-"Win the To the Moon and Back\n"
-"Grand Prix with 3 'Racer'\n"
-"Level AI karts."
-msgstr ""
-"Remporte le grand prix 'Jusqu'à\n"
-"la lune' contre 3 opposants\n"
-"virtuels expérimentés."
+#. I18N: ./data/grandprix/snagdrive.challenge
+#: data/po/gui_strings.h:483
+msgid "Win the To the Moon and Back Grand Prix with 3 'Racer' Level AI karts."
+msgstr "Remporte le grand prix 'Jusqu'à la lune' contre 3 opposants virtuels expérimentés."
 
-#: src/karts/player_kart.cpp:346
+#: src/karts/player_kart.cpp:354
 msgid "You finished the race!"
 msgstr "Tu as fini la course !"
 
@@ -947,35 +989,46 @@ msgstr ""
 "Tu as été\n"
 "éliminé !"
 
-#: src/karts/player_kart.cpp:345
+#: src/karts/player_kart.cpp:353
 msgid "You won the race!"
 msgstr "Tu as gagné la course !"
 
+#. I18N: Unbound key binding
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Unbound key binding
 #: src/input/input.cpp:39
-#: data/po/gui_strings.h:218
-#: data/po/gui_strings.h:224
-#: data/po/gui_strings.h:230
-#: data/po/gui_strings.h:236
-#: data/po/gui_strings.h:242
-#: data/po/gui_strings.h:248
-#: data/po/gui_strings.h:254
-#: data/po/gui_strings.h:260
-#: data/po/gui_strings.h:266
+#: data/po/gui_strings.h:296
+#: data/po/gui_strings.h:304
+#: data/po/gui_strings.h:312
+#: data/po/gui_strings.h:320
+#: data/po/gui_strings.h:328
+#: data/po/gui_strings.h:336
+#: data/po/gui_strings.h:344
+#: data/po/gui_strings.h:352
+#: data/po/gui_strings.h:360
 msgid "[none]"
 msgstr "[aucun]"
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Ignore
-#: data/po/gui_strings.h:192
-#: data/po/gui_strings.h:212
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Ignore
+#: data/po/gui_strings.h:261
+#: data/po/gui_strings.h:288
 msgid "all"
 msgstr ""
 
+#. I18N: ./data/gui/arenas.stkgui
 #. I18N: Ignore
-#: data/po/gui_strings.h:5
-#: data/po/gui_strings.h:20
-#: data/po/gui_strings.h:312
-#: data/po/gui_strings.h:329
+#. I18N: ./data/gui/challenges.stkgui
+#. I18N: Ignore
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: Ignore
+#: data/po/gui_strings.h:7
+#: data/po/gui_strings.h:27
+#: data/po/gui_strings.h:423
+#: data/po/gui_strings.h:447
 msgid "bottom"
 msgstr ""
 
diff --git a/data/po/fr/LC_MESSAGES/supertuxkart.mo b/data/po/fr/LC_MESSAGES/supertuxkart.mo
index faa64af1f853fa6168779c1a59b85f05d606965d..685e3ce17db50754bf660fd079a9a3e85a5af618 100644
GIT binary patch
delta 4368
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
LgXi<1>fnC>3cG#!

delta 3756
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
KdG4{=_5T5A9k^To

diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index d7e7dc884..31ac4533a 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 21:08-0500\n"
+"POT-Creation-Date: 2010-01-07 18:18-0500\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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "%i laps"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:415
+#: src/states_screens/kart_selection.cpp:417
 #, c-format
 msgid "%s is ready"
 msgstr ""
@@ -39,18 +39,21 @@ msgstr ""
 msgid "(Empty)"
 msgstr ""
 
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:127
+#: data/po/gui_strings.h:174
 msgid "(more players can join by pressing 'fire' now)"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:58
+#: data/po/gui_strings.h:79
 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:118
+#: data/po/gui_strings.h:162
 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 "
@@ -58,14 +61,16 @@ msgid ""
 "wins the cup."
 msgstr ""
 
-#: data/po/gui_strings.h:271
+#. I18N: ./data/gui/options_input.stkgui
+#: data/po/gui_strings.h:367
 msgid ""
 "* Which config to use will be inferred from which 'fire' key is pressed to "
 "join the game."
 msgstr ""
 
+#. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:115
+#: data/po/gui_strings.h:158
 msgid ""
 "3 Strikes Battle : only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -75,13 +80,15 @@ msgstr ""
 msgid "= Highscores ="
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:157
+#: data/po/gui_strings.h:214
 msgid "About"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:215
+#: data/po/gui_strings.h:292
 msgid "Accelerate"
 msgstr ""
 
@@ -90,34 +97,43 @@ msgstr ""
 msgid "Add Keyboard Configuration"
 msgstr ""
 
+#. I18N: ./data/gui/options_players.stkgui
 #. I18N: In players configuration menu
-#: data/po/gui_strings.h:291
+#: data/po/gui_strings.h:394
 msgid "Add Player"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:269
+#: data/po/gui_strings.h:364
 msgid "Add a device"
 msgstr ""
 
+#. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: Kart group
+#. I18N: ./data/gui/tracks.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:11 data/po/gui_strings.h:133
-#: data/po/gui_strings.h:335
+#: data/po/gui_strings.h:15 data/po/gui_strings.h:182
+#: data/po/gui_strings.h:455
 msgid "Add-Ons"
 msgstr ""
 
+#. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: Kart group
+#. I18N: ./data/gui/tracks.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:14 data/po/gui_strings.h:139
-#: data/po/gui_strings.h:338
+#: data/po/gui_strings.h:19 data/po/gui_strings.h:190
+#: data/po/gui_strings.h:459
 msgid "All"
 msgstr ""
 
+#. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
-#: data/po/gui_strings.h:326
+#: data/po/gui_strings.h:443
 msgid "All Tracks"
 msgstr ""
 
@@ -125,27 +141,36 @@ msgstr ""
 msgid "All blows allowed, so catch weapons and make clever use of them!"
 msgstr ""
 
-#: data/po/gui_strings.h:87
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:120
 msgid "Anchor - slows down greatly the kart in the first position"
 msgstr ""
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: In the video settings menu
-#: data/po/gui_strings.h:195
+#: data/po/gui_strings.h:265
 msgid "Apply video changes"
 msgstr ""
 
+#. I18N: ./data/gui/arenas.stkgui
 #. I18N: Section in arena tracks selection screen
-#: data/po/gui_strings.h:2
+#: data/po/gui_strings.h:3
 msgid "Arenas"
 msgstr ""
 
-#: data/po/gui_strings.h:323
+#. I18N: ./data/gui/tracks.stkgui
+#: data/po/gui_strings.h:439
 msgid "At World's End"
 msgstr ""
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in the settings menu
-#: data/po/gui_strings.h:165 data/po/gui_strings.h:203
-#: data/po/gui_strings.h:279
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: Section in the settings menu
+#: data/po/gui_strings.h:225 data/po/gui_strings.h:276
+#: data/po/gui_strings.h:378
 msgid "Audio/Video"
 msgstr ""
 
@@ -155,15 +180,27 @@ msgstr ""
 msgid "Axis %d %s"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu, to return to the previous screen
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: In the help menu, to return to the previous screen
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu, to return to the previous screen
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: In the options menu, to go back to the main menu or game
-#: data/po/gui_strings.h:61 data/po/gui_strings.h:90 data/po/gui_strings.h:121
-#: data/po/gui_strings.h:198 data/po/gui_strings.h:274
-#: data/po/gui_strings.h:294
+#. 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
+#: data/po/gui_strings.h:83 data/po/gui_strings.h:124
+#: data/po/gui_strings.h:166 data/po/gui_strings.h:269
+#: data/po/gui_strings.h:371 data/po/gui_strings.h:398
 msgid "Back"
 msgstr ""
 
-#: data/po/gui_strings.h:22 data/po/gui_strings.h:27
+#. I18N: ./data/gui/challenges.stkgui
+#. I18N: ./data/gui/credits.stkgui
+#: data/po/gui_strings.h:30 data/po/gui_strings.h:37
 msgid "Back to main menu"
 msgstr ""
 
@@ -171,22 +208,26 @@ msgstr ""
 msgid "Back to the main menu"
 msgstr ""
 
-#: data/po/gui_strings.h:83
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:114
 msgid ""
 "Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
 "backwards."
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:221
+#: data/po/gui_strings.h:300
 msgid "Brake"
 msgstr ""
 
-#: data/po/gui_strings.h:77
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:105
 msgid "BubbleGum - leave a sticky pink puddle behind you"
 msgstr ""
 
-#: data/po/gui_strings.h:79
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:108
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights"
 msgstr ""
@@ -202,47 +243,53 @@ msgstr ""
 msgid "Cancel Remove"
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:148
+#: data/po/gui_strings.h:202
 msgid "Challenges"
 msgstr ""
 
+#. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:17
+#: data/po/gui_strings.h:23
 msgid "Challenges : Trophy Room"
 msgstr ""
 
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:124
+#: data/po/gui_strings.h:170
 msgid "Choose a Kart"
 msgstr ""
 
-#: data/po/gui_strings.h:372
+#. I18N: ./data/tracks/crescentcrossing/crescentcrossing.challenge
+#: data/po/gui_strings.h:510
 msgid "Collect Nitro in Math Class"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:46
+#: data/po/gui_strings.h:63
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: data/po/gui_strings.h:356
+#. I18N: ./data/grandprix/tothemoonandback.challenge
+#: data/po/gui_strings.h:486
 msgid "Collect the Pharaohs Treasure"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:49
+#: data/po/gui_strings.h:67
 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 ""
 
-#: data/po/gui_strings.h:346
+#. I18N: ./data/grandprix/alltracks.challenge
+#: data/po/gui_strings.h:471
 msgid ""
-"Come first in the At World's End\n"
-"Grand Prix with 3 'Racer'\n"
-"Level AI karts."
+"Come first in the At World's End Grand Prix with 3 'Racer' Level AI karts."
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
@@ -254,7 +301,8 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
-#: data/po/gui_strings.h:29
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#: data/po/gui_strings.h:40
 msgid "Continue"
 msgstr ""
 
@@ -262,14 +310,20 @@ msgstr ""
 msgid "Continue Grand Prix"
 msgstr ""
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in the settings menu
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:209
-#: data/po/gui_strings.h:285
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: Section in the settings menu
+#: data/po/gui_strings.h:233 data/po/gui_strings.h:284
+#: data/po/gui_strings.h:386
 msgid "Controls"
 msgstr ""
 
+#. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:25
+#: data/po/gui_strings.h:34
 msgid "Credits"
 msgstr ""
 
@@ -279,8 +333,9 @@ msgstr ""
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Next to checkbox in settings menu
-#: data/po/gui_strings.h:177 data/po/gui_strings.h:183
+#: data/po/gui_strings.h:241 data/po/gui_strings.h:249
 msgid "Enabled"
 msgstr ""
 
@@ -289,8 +344,9 @@ msgstr ""
 msgid "Enter the new player's name"
 msgstr ""
 
+#. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:308
+#: data/po/gui_strings.h:417
 msgid "Expert"
 msgstr ""
 
@@ -302,89 +358,94 @@ msgstr ""
 msgid "Final lap!"
 msgstr ""
 
-#: data/po/gui_strings.h:382
-msgid ""
-"Finish 3 laps in Racetrack\n"
-"with 3 easy AI karts\n"
-"in under 2:40 minutes."
+#. I18N: ./data/tracks/jungle/jungle.challenge
+#: data/po/gui_strings.h:525
+msgid "Finish 3 laps in Racetrack with 3 easy AI karts in under 2:40 minutes."
 msgstr ""
 
-#: data/po/gui_strings.h:386
-msgid ""
-"Finish 3 laps on the City track\n"
-"with 3 AI karts\n"
-"in under 4:20 minutes."
+#. I18N: ./data/tracks/snowtuxpeak/snowtuxpeak.challenge
+#: data/po/gui_strings.h:531
+msgid "Finish 3 laps on the City track with 3 AI karts in under 4:20 minutes."
 msgstr ""
 
-#: data/po/gui_strings.h:366
+#. I18N: ./data/tracks/canyon/canyon.challenge
+#: data/po/gui_strings.h:501
 msgid ""
-"Finish 3 laps on the Tux Tollway\n"
-"track with 3 AI karts\n"
-"in under 3:35 minutes."
+"Finish 3 laps on the Tux Tollway track with 3 AI karts in under 3:35 minutes."
 msgstr ""
 
-#: data/po/gui_strings.h:380
+#. I18N: ./data/tracks/jungle/jungle.challenge
+#: data/po/gui_strings.h:522
 msgid "Finish Race track in 2:40"
 msgstr ""
 
-#: data/po/gui_strings.h:364
+#. I18N: ./data/tracks/canyon/canyon.challenge
+#: data/po/gui_strings.h:498
 msgid "Finish Tux Tollway track in 3:35"
 msgstr ""
 
-#: data/po/gui_strings.h:384
+#. I18N: ./data/tracks/snowtuxpeak/snowtuxpeak.challenge
+#: data/po/gui_strings.h:528
 msgid "Finish the City track in 4:20"
 msgstr ""
 
-#: data/po/gui_strings.h:374
+#. I18N: ./data/tracks/crescentcrossing/crescentcrossing.challenge
+#: data/po/gui_strings.h:513
 msgid ""
-"Finish with at least 6 points\n"
-" of intro on three laps of\n"
-"Oliver's Math Class\n"
+"Finish with at least 6 points of intro on three laps of Oliver's Math Class "
 "in under 52 seconds."
 msgstr ""
 
-#: data/po/gui_strings.h:358
+#. I18N: ./data/grandprix/tothemoonandback.challenge
+#: data/po/gui_strings.h:489
 msgid ""
-"Finish with at least 9 nitro \n"
-"points on 3 laps of Shifting Sands\n"
-"in under 2:20 minutes."
+"Finish with at least 9 nitro points on 3 laps of Shifting Sands in under "
+"2:20 minutes."
 msgstr ""
 
 #. I18N: Shown at the end of a race
-#: src/states_screens/race_gui.cpp:593
+#: src/states_screens/race_gui.cpp:591
 msgid "Finished"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:239
+#: data/po/gui_strings.h:324
 msgid "Fire"
 msgstr ""
 
-#: data/po/gui_strings.h:368
+#. I18N: ./data/tracks/city/city.challenge
+#: data/po/gui_strings.h:504
 msgid "Follow the Leader in the Jungle"
 msgstr ""
 
-#: data/po/gui_strings.h:348
-msgid ""
-"Follow the Leader on a\n"
-"Desert Island"
+#. I18N: ./data/grandprix/atworldsend.challenge
+#: data/po/gui_strings.h:474
+msgid "Follow the Leader on a Desert Island"
 msgstr ""
 
+#. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:112
+#: data/po/gui_strings.h:154
 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/gui/options_av.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:189
+#: data/po/gui_strings.h:257
 msgid "Fullscreen"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:40 data/po/gui_strings.h:72 data/po/gui_strings.h:101
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#: data/po/gui_strings.h:55 data/po/gui_strings.h:98 data/po/gui_strings.h:139
 msgid "Game Modes"
 msgstr ""
 
@@ -400,23 +461,30 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:34 data/po/gui_strings.h:66 data/po/gui_strings.h:95
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#: data/po/gui_strings.h:47 data/po/gui_strings.h:90 data/po/gui_strings.h:131
 msgid "General"
 msgstr ""
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:786
+#: src/states_screens/race_gui.cpp:803
 msgid "Go!"
 msgstr ""
 
+#. I18N: ./data/gui/tracks.stkgui
 #. I18N: Section in track selection screen
-#: data/po/gui_strings.h:315
+#: data/po/gui_strings.h:427
 msgid "Grand Prix"
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:154
+#: data/po/gui_strings.h:210
 msgid "Help"
 msgstr ""
 
@@ -430,15 +498,17 @@ msgid ""
 "multiplayer games)"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:52
+#: data/po/gui_strings.h:71
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
+#. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:305
+#: data/po/gui_strings.h:413
 msgid "Intermediate"
 msgstr ""
 
@@ -447,7 +517,7 @@ msgstr ""
 msgid "Keyboard %i"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:601 src/states_screens/race_gui.cpp:604
+#: src/states_screens/race_gui.cpp:599 src/states_screens/race_gui.cpp:602
 msgid "Lap"
 msgstr ""
 
@@ -455,8 +525,9 @@ msgstr ""
 msgid "Leader"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:227
+#: data/po/gui_strings.h:308
 msgid "Left"
 msgstr ""
 
@@ -467,13 +538,15 @@ msgstr ""
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:263
+#: data/po/gui_strings.h:356
 msgid "Look Back"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:43
+#: data/po/gui_strings.h:59
 msgid "Make your rivals bite dust!"
 msgstr ""
 
@@ -489,13 +562,15 @@ msgstr ""
 msgid "Mouse button %d"
 msgstr ""
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in the audio/video settings submenu
-#: data/po/gui_strings.h:174
+#: data/po/gui_strings.h:237
 msgid "Music"
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:145
+#: data/po/gui_strings.h:198
 msgid "Networking"
 msgstr ""
 
@@ -541,27 +616,32 @@ msgid ""
 "now available"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:245
+#: data/po/gui_strings.h:332
 msgid "Nitro"
 msgstr ""
 
+#. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:302
+#: data/po/gui_strings.h:409
 msgid "Novice"
 msgstr ""
 
+#. I18N: ./data/gui/racesetup.stkgui
 #. I18N: In race setup menu
-#: data/po/gui_strings.h:299
+#: data/po/gui_strings.h:405
 msgid "Number of AI karts"
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
+#: data/po/gui_strings.h:206
 msgid "Options"
 msgstr ""
 
-#: data/po/gui_strings.h:85
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:117
 msgid "Parachute - slows down all karts in a better position!"
 msgstr ""
 
@@ -573,24 +653,31 @@ msgstr ""
 msgid "Penalty time!!"
 msgstr ""
 
-#: data/po/gui_strings.h:317
+#. I18N: ./data/gui/tracks.stkgui
+#: data/po/gui_strings.h:430
 msgid "Penguin Playground"
 msgstr ""
 
 #. I18N: In kart selection screen (Will read like 'Player 1 (foobartech gamepad)')
-#: src/states_screens/kart_selection.cpp:234
-#: src/states_screens/kart_selection.cpp:347
+#: src/states_screens/kart_selection.cpp:236
+#: src/states_screens/kart_selection.cpp:349
 #, c-format
 msgid "Player %i (%s)"
 msgstr ""
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in the settings menu
-#: data/po/gui_strings.h:168 data/po/gui_strings.h:206
-#: data/po/gui_strings.h:282
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: Section in the settings menu
+#: data/po/gui_strings.h:229 data/po/gui_strings.h:280
+#: data/po/gui_strings.h:382
 msgid "Players"
 msgstr ""
 
-#: data/po/gui_strings.h:81
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:111
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight!"
@@ -604,18 +691,21 @@ msgstr ""
 msgid "Press a key"
 msgstr ""
 
+#. I18N: ./data/gui/options_players.stkgui
 #. I18N: In players configuration menu
-#: data/po/gui_strings.h:288
+#: data/po/gui_strings.h:390
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:160
+#: data/po/gui_strings.h:218
 msgid "Quit"
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:142
+#: data/po/gui_strings.h:194
 msgid "Race"
 msgstr ""
 
@@ -623,7 +713,8 @@ msgstr ""
 msgid "Race Results"
 msgstr ""
 
-#: data/po/gui_strings.h:296
+#. I18N: ./data/gui/racesetup.stkgui
+#: data/po/gui_strings.h:401
 msgid "Race Setup"
 msgstr ""
 
@@ -635,9 +726,9 @@ msgstr ""
 msgid "Random Arena"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:663
-#: src/states_screens/kart_selection.cpp:950
-#: src/states_screens/kart_selection.cpp:1135
+#: src/states_screens/kart_selection.cpp:665
+#: src/states_screens/kart_selection.cpp:953
+#: src/states_screens/kart_selection.cpp:1236
 msgid "Random Kart"
 msgstr ""
 
@@ -646,12 +737,13 @@ msgid "Random Track"
 msgstr ""
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:764
+#: src/states_screens/race_gui.cpp:781
 msgid "Ready!"
 msgstr ""
 
+#. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:106
+#: data/po/gui_strings.h:146
 msgid ""
 "Regular Race - all blows allowed, so catch weapons and make clever use of "
 "them!"
@@ -667,13 +759,15 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:257
+#: data/po/gui_strings.h:348
 msgid "Rescue"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:233
+#: data/po/gui_strings.h:316
 msgid "Right"
 msgstr ""
 
@@ -684,12 +778,13 @@ msgid ""
 "eliminated too!"
 msgstr ""
 
-#: data/po/gui_strings.h:310
+#. I18N: ./data/gui/racesetup.stkgui
+#: data/po/gui_strings.h:420
 msgid "Select a game mode"
 msgstr ""
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:775
+#: src/states_screens/race_gui.cpp:792
 msgid "Set!"
 msgstr ""
 
@@ -697,29 +792,37 @@ msgstr ""
 msgid "Setup New Race"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:251
+#: data/po/gui_strings.h:340
 msgid "Sharp Turn"
 msgstr ""
 
-#: data/po/gui_strings.h:319
+#. I18N: ./data/gui/tracks.stkgui
+#: data/po/gui_strings.h:433
 msgid "Snag Drive"
 msgstr ""
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in audio/video settings submenu
-#: data/po/gui_strings.h:180
+#: data/po/gui_strings.h:245
 msgid "Sound Effects"
 msgstr ""
 
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: Kart group
-#: data/po/gui_strings.h:136
+#: data/po/gui_strings.h:186
 msgid "Special"
 msgstr ""
 
+#. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: Kart group
+#. I18N: ./data/gui/tracks.stkgui
 #. I18N: track group
-#: data/po/gui_strings.h:8 data/po/gui_strings.h:130 data/po/gui_strings.h:332
+#: data/po/gui_strings.h:11 data/po/gui_strings.h:178
+#: data/po/gui_strings.h:451
 msgid "Standard"
 msgstr ""
 
@@ -727,21 +830,29 @@ msgstr ""
 msgid "Start Race"
 msgstr ""
 
-#: data/po/gui_strings.h:31 data/po/gui_strings.h:63 data/po/gui_strings.h:92
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/help3.stkgui
+#: data/po/gui_strings.h:43 data/po/gui_strings.h:86 data/po/gui_strings.h:127
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#: data/po/gui_strings.h:162 data/po/gui_strings.h:200
-#: data/po/gui_strings.h:276
+#. I18N: ./data/gui/options_av.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#: data/po/gui_strings.h:221 data/po/gui_strings.h:272
+#: data/po/gui_strings.h:374
 msgid "SuperTuxKart Options"
 msgstr ""
 
-#: data/po/gui_strings.h:103
+#. I18N: ./data/gui/help3.stkgui
+#: data/po/gui_strings.h:142
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:55
+#: data/po/gui_strings.h:75
 msgid ""
 "The 'sharp turn' key allows you to do sharp turns and have better control in "
 "tight curves"
@@ -753,8 +864,9 @@ msgid ""
 "all highscores have been erased."
 msgstr ""
 
+#. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:109
+#: data/po/gui_strings.h:150
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
@@ -770,12 +882,14 @@ msgid ""
 "needs different keybindings in this case.)"
 msgstr ""
 
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:75
+#: data/po/gui_strings.h:102
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
-#: data/po/gui_strings.h:321
+#. I18N: ./data/gui/tracks.stkgui
+#: data/po/gui_strings.h:436
 msgid "To the Moon and Back"
 msgstr ""
 
@@ -785,8 +899,9 @@ msgstr ""
 msgid "Track by %s"
 msgstr ""
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Section in the audio/video settings submenu
-#: data/po/gui_strings.h:186
+#: data/po/gui_strings.h:253
 msgid "Video"
 msgstr ""
 
@@ -794,83 +909,73 @@ msgstr ""
 msgid "WRONG WAY!"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:37 data/po/gui_strings.h:69 data/po/gui_strings.h:98
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#: data/po/gui_strings.h:51 data/po/gui_strings.h:94 data/po/gui_strings.h:135
 msgid "Weapons"
 msgstr ""
 
-#: data/po/gui_strings.h:340
-msgid ""
-"Win Penguin Playground Grand\n"
-"Prix"
+#. I18N: ./data/followtheleader.challenge
+#: data/po/gui_strings.h:462
+msgid "Win Penguin Playground Grand Prix"
 msgstr ""
 
-#: data/po/gui_strings.h:342
-msgid ""
-"Win Penguin Playground Grand\n"
-"Prix with 3 'Racer' Level AI karts."
+#. I18N: ./data/followtheleader.challenge
+#: data/po/gui_strings.h:465
+msgid "Win Penguin Playground Grand Prix with 3 'Racer' Level AI karts."
 msgstr ""
 
-#: data/po/gui_strings.h:352
-msgid ""
-"Win To the Moon and Back\n"
-"Grand Prix"
+#. I18N: ./data/grandprix/snagdrive.challenge
+#: data/po/gui_strings.h:480
+msgid "Win To the Moon and Back Grand Prix"
 msgstr ""
 
-#: data/po/gui_strings.h:378
+#. I18N: ./data/tracks/fortmagma/fortmagma.challenge
+#: data/po/gui_strings.h:519
 msgid ""
-"Win a 1 lap Head to Head\n"
-"on Tux Tollway against 1 'Racer'\n"
-"level AI kart."
+"Win a 1 lap Head to Head on Tux Tollway against 1 'Racer' level AI kart."
 msgstr ""
 
-#: data/po/gui_strings.h:362
-msgid ""
-"Win a 4 lap race\n"
-"on Snow Mountain against 4 'Racer'\n"
-"level AI kart."
+#. I18N: ./data/karts/gnu/gnu.challenge
+#: data/po/gui_strings.h:495
+msgid "Win a 4 lap race on Snow Mountain against 4 'Racer' level AI kart."
 msgstr ""
 
-#: data/po/gui_strings.h:370
-msgid ""
-"Win a Follow the Leader race\n"
-"with 3 AI karts\n"
-"in the Amazonian Jungle."
+#. I18N: ./data/tracks/city/city.challenge
+#: data/po/gui_strings.h:507
+msgid "Win a Follow the Leader race with 3 AI karts in the Amazonian Jungle."
 msgstr ""
 
-#: data/po/gui_strings.h:350
-msgid ""
-"Win a Follow the Leader race\n"
-"with 3 AI karts\n"
-"on a Desert Island."
+#. I18N: ./data/grandprix/atworldsend.challenge
+#: data/po/gui_strings.h:477
+msgid "Win a Follow the Leader race with 3 AI karts on a Desert Island."
 msgstr ""
 
-#: data/po/gui_strings.h:376
-msgid ""
-"Win a Head to Head on\n"
-"Tux Tollway"
+#. I18N: ./data/tracks/fortmagma/fortmagma.challenge
+#: data/po/gui_strings.h:516
+msgid "Win a Head to Head on Tux Tollway"
 msgstr ""
 
-#: data/po/gui_strings.h:360
-msgid ""
-"Win a race on\n"
-"Snow Mountain"
+#. I18N: ./data/karts/gnu/gnu.challenge
+#: data/po/gui_strings.h:492
+msgid "Win a race on Snow Mountain"
 msgstr ""
 
-#: data/po/gui_strings.h:344
-msgid ""
-"Win the At World's End\n"
-"Grand Prix"
+#. I18N: ./data/grandprix/alltracks.challenge
+#: data/po/gui_strings.h:468
+msgid "Win the At World's End Grand Prix"
 msgstr ""
 
-#: data/po/gui_strings.h:354
-msgid ""
-"Win the To the Moon and Back\n"
-"Grand Prix with 3 'Racer'\n"
-"Level AI karts."
+#. I18N: ./data/grandprix/snagdrive.challenge
+#: data/po/gui_strings.h:483
+msgid "Win the To the Moon and Back Grand Prix with 3 'Racer' Level AI karts."
 msgstr ""
 
-#: src/karts/player_kart.cpp:346
+#: src/karts/player_kart.cpp:354
 msgid "You finished the race!"
 msgstr ""
 
@@ -880,26 +985,37 @@ msgid ""
 "eliminated!"
 msgstr ""
 
-#: src/karts/player_kart.cpp:345
+#: src/karts/player_kart.cpp:353
 msgid "You won the race!"
 msgstr ""
 
 #. I18N: Unbound key binding
-#: src/input/input.cpp:39 data/po/gui_strings.h:218 data/po/gui_strings.h:224
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:236
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:248
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:260
-#: data/po/gui_strings.h:266
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Unbound key binding
+#: src/input/input.cpp:39 data/po/gui_strings.h:296 data/po/gui_strings.h:304
+#: data/po/gui_strings.h:312 data/po/gui_strings.h:320
+#: data/po/gui_strings.h:328 data/po/gui_strings.h:336
+#: data/po/gui_strings.h:344 data/po/gui_strings.h:352
+#: data/po/gui_strings.h:360
 msgid "[none]"
 msgstr ""
 
+#. I18N: ./data/gui/options_av.stkgui
 #. I18N: Ignore
-#: data/po/gui_strings.h:192 data/po/gui_strings.h:212
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Ignore
+#: data/po/gui_strings.h:261 data/po/gui_strings.h:288
 msgid "all"
 msgstr ""
 
+#. I18N: ./data/gui/arenas.stkgui
 #. I18N: Ignore
-#: data/po/gui_strings.h:5 data/po/gui_strings.h:20 data/po/gui_strings.h:312
-#: data/po/gui_strings.h:329
+#. I18N: ./data/gui/challenges.stkgui
+#. I18N: Ignore
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: Ignore
+#: data/po/gui_strings.h:7 data/po/gui_strings.h:27 data/po/gui_strings.h:423
+#: data/po/gui_strings.h:447
 msgid "bottom"
 msgstr ""