From 0b5ae5e4f55f54bd2b1d997bfbf5af02710b66c7 Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 31 Jan 2010 16:59:24 +0000
Subject: [PATCH] Minor update to french translation

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4575 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/po/fr.po                             |  17 +-
 data/po/fr/LC_MESSAGES/supertuxkart.mo    | Bin 15063 -> 16104 bytes
 data/po/fr_CA.po                          | 592 +++++++++++++---------
 data/po/fr_CA/LC_MESSAGES/supertuxkart.mo | Bin 530 -> 1028 bytes
 data/po/supertuxkart.pot                  |  12 +-
 5 files changed, 361 insertions(+), 260 deletions(-)

diff --git a/data/po/fr.po b/data/po/fr.po
index 59079a462..9039884e9 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-24 10:33-0500\n"
-"PO-Revision-Date: 2010-01-24 10:35-0500\n"
+"POT-Creation-Date: 2010-01-31 11:54-0500\n"
+"PO-Revision-Date: 2010-01-31 11:57-0500\n"
 "Last-Translator: Marianne Gagnon (Auria) <auria.mg@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -408,7 +408,7 @@ msgid "Finish with at least 9 nitro points on 3 laps of Shifting Sands in under
 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:75
+#: src/states_screens/race_gui.cpp:76
 msgid "Finished"
 msgstr "Fini"
 
@@ -476,7 +476,7 @@ msgstr ""
 msgid "General"
 msgstr "Général"
 
-#: src/states_screens/race_gui.cpp:80
+#: src/states_screens/race_gui.cpp:81
 msgid "Go!"
 msgstr "Partez!"
 
@@ -521,7 +521,7 @@ msgstr "Intermédiaire"
 msgid "Keyboard %i"
 msgstr "Clavier %i"
 
-#: src/states_screens/race_gui.cpp:76
+#: src/states_screens/race_gui.cpp:77
 msgid "Lap"
 msgstr "Tour"
 
@@ -758,7 +758,7 @@ 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:78
+#: src/states_screens/race_gui.cpp:79
 msgid "Ready!"
 msgstr "À vos marques..."
 
@@ -804,7 +804,7 @@ msgstr "vise la seconde place, car lorsque le compte à rebours atteint zéro, l
 msgid "Select a game mode"
 msgstr "Choisis un mode de jeu"
 
-#: src/states_screens/race_gui.cpp:79
+#: src/states_screens/race_gui.cpp:80
 msgid "Set!"
 msgstr "Prêts"
 
@@ -897,7 +897,6 @@ 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 !"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:45
-#, fuzzy
 msgid ""
 "To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
@@ -905,7 +904,7 @@ msgid ""
 msgstr ""
 "Pour ajouter un nouveau Gamepad ou Joystick, assure-toi simplement qu'il est connecté avant d'ouvrir SuperTuxKart, il apparaitra automatiquement dans la liste.\n"
 "\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."
+"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. (Il demeure possible de connected plusieurs claviers, mais chaque joueur doit tout de même avoir des touches distinctes)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
diff --git a/data/po/fr/LC_MESSAGES/supertuxkart.mo b/data/po/fr/LC_MESSAGES/supertuxkart.mo
index 59af667b2a6235c275c3cdb5e9ace74bc36b65b4..d2e9e7d37f6c8facc78f35912a832fbed0862675 100644
GIT binary patch
delta 3918
zcmY+_4{TLe9l-JP<Zu7e(eg(G4$uO{Qda(0=wMKmb_|9f6p#R>_q})8UU=``$Nke%
z8NP&M3v&_BCmXmiJIIX8uq~;g%ory{VGAxXQ=CQ^x=e@8#U;*>Y(u}l-rF#nTt4TV
zd+#~F^E<!$_<i`!f&BHmMjliAo#y%+*Wyu1y@?MN^ACTQ%aj^}ui#kx4VK^^aWeij
zzOTxaYM?(Bo3RORqKDgYXN6Locn%p-Q^zUAQh8NRL)Kb|pT!k%|I1iPKZPSO7mo+H
zihdqtp_g$yeuSg3qB2@w0!pB@DDyYsNL-FGZwpqkzWO4KY6d!R8}=ZPsn@U(e~asI
z^j*;cn~+Vb?I;s>;Ux6p@yBoq{S(-NKf<Z_A)do(qFswuu$=YP#44qh;cS!?ccARZ
zj{65tj^GiThlk_-d6b2Ifkk)?B?Es$lA+#13GlzzhQ;hs{1UFm<Cq^hLmHX^H6e<0
z26oV0iCeKBC9n@sQm7^>H62D_4c6iSu0>h!c5D%8A$h6_WdpNOj<NyexrLL+zf8Cy
z9$1a-^w;AqJcV*rQfYFQWhfI&M%n39l=o|JDb}H6B8ifj3`!;rA$6xtpd9TPlmK3s
zO#Wxkc!>e=Pw|7dQPVG{B4wflC|}1qlnJ^~0&q}v7UCE1Ks^3Klq&xza_s8WxPJ}h
z`FF7s|DC5HXT5_}WQQ&`;eM2z4aEKgB@;hGlA>OX`){GV_piABF-l-XM7sgUq4Yaq
zyJ8)b`SKwR+0jAl$3rL)*HN+(z;cwGw4kJHW9$x;ub>lUM*&KWJQUx580GAbBK4<E
z;avPNZpRzAO1}T*X-c&+upciasAg=Y|EP{$yoj>HKcEEqHcBA>Kw0=dC`Wf2SD~ge
z3oTrO594Zl4P~9mnbC9GaE5&U$7zr?_0rIQQdhB!{w<{7)k<cg9Mo2n9pz9`dJxwo
z2oz=KzpIIg?>b6q-$6bE^#RKBWwlD(gH?DhZp5NI6C9zjpMevzmD-2ZbE2IeMycl0
zC>c15ax~{r0=a?`*mWF<x8m_na5Mc1@?D21l$!Ylj=}Gtd=<}QULyTD4O!?4N~Bj&
zit-xDi|@x4GuuP-XQ52gkFEH9Oyhg;_~v=hFX|4I`Sv1ZrS_qGhR0BTKc1aO{@2j>
zB?J5hsq)V&brEYYg*Q=BxV}EB34=xS`%%W9!(zOEWAWFx0I#A1IC{QPl#?n)$=H09
zfL6xiZSy(*G6oC-k}@A9piB55j%$b(+J$_nDn!}IQTz&?#VuIMs&WKL9EDv-fvYUm
z;A8j(zKEsx=-rWz=V{29o<`Z(Ih4p>M%meAl!;%*arg%I;!RAV)fj!A7g3&n9p(A!
zC_8;C_V2im{`)AOV+|cnRppn_sHBmM4NwAj1SQhLI2)ftj#pj4a(p-Le}tNT?V{+j
zYeUJvZj=q>Q0Dt8-iHU{`@cf@|3_Vk8tN}76W>C4Va#F{#R`;E{s5&$UcnZ86Xm%X
zOQN0Dq143PI3CxaY-}f1po5aZuf^j>aHo9#&(M%aZ=)2^SboT*Uy0Q?1tpb@co~=C
z1WYtV<C9Ppn2xf61z3gm#{JDG^Cn~Wpad9*tgjBykO`kc3RexFjNicZ*s(P7d0hG#
zr9MVU<r02PWJi4{NA-1-K%YPf;Axbj7(hNGbso3i+sFr}?paRZ@1W61L%e_+aN3IK
zK?kKsE~1?MKT%$s$j_Hdv>GMw<2Vstz)5%s<!Ejozi;Z>g_hzyiEkCo7EfPtg#Pf~
z0UEVjPjC^F;s8`Xm;6oPvWHqqeW#EpnU(lvp|)hvr~+f(E$k{;nRvQzvgE$RQ-wd5
zjITZ#KiLs0>3F74RJy3>1g#NV#|o{bO^MTm1Eu-IlZ8)8=OhjnYRkGNpXA;tF8O<$
ztD8$ctm6aEmQ_^dt#n#j+A+QQek*HoR(io&x6cpk)E=ESJ$A~}Yv0c1GJV<)EHBWT
z!<_Nj!+q<d(`yIa+75KebsUol3{yF28R)e$8Exfq#`3i7=%Cx^jO_;v#l`Kej+WeG
z`jW1d_tNrqr`=Vr``l2cEJugF8G0ib27&A7q{+Cw^?J>QZLM2dH|bo)SUljkfjnge
zI_vs@j%M@HzIGjnHO%E)0<>5*YYzpMbwel6Zl`P~%mkKW+|bu~Ud(yM_l-XkyXDEO
z+^`+O_uQOkTP)P+dRpGHa~Z48c)Ck+MYBQA-5y0<ue;q|(__5);cN`QU_KRG;12C9
z<z{nXV7vx>|0a_)*(6gA?L{W&a~(snC4-JJ>?mz_b{fwRz3kF<(zeqj0rHCNlQG{k
z)D65it$oDUMUA?#v3bejLg`FB+-VwEJoAI9ytUhv6?N#4y0FJs;qZZLHZXkV_1g0N
z&@=M`*N)De@K|_nILFRtL!#rO9z3J19*aBaIn3tS-v1Rwz2<51XL*(#c$T)peBfrS
zz}_21^QA4v*BLn-KQL6qMmO~Ioe)i26QRdDlt3zD_1FY2$C?>DBOzI~M`;G3&Y5tZ
z4oR2o^F+qzBpa1??D=WVl|ydO?Hlr2+FRQ;Jg|8vGT8?;O@R#UASx!0O;V+n&Ju@b
z2kemdhnMy_3t6g1vXQfV-8Fc|W4&C4T1gvuH^b%YzztK~Xq-;hNe!N%IoPi=d5apd
zeTsv#HIf#c=KiP3jP-Jo1$MC8gi-NuW+tRc=01>Nkt}V3aDCrS@)WDy`R*hRoBMYH
zu4f}s9^IDgYgsfEi?T8?vb@pR!RNAub96aA+3RrZX->s<_@4bbwXsmKxO$+u>Eww2
E0gZXMy#N3J

delta 2872
zcmXxld2EzL7{~G1wA~)t1(qJLaxFbLN}=?k2Zsd$7F$9QOKAi|ECqw0F+po8tce#z
zE7;c}$W^N%Vjwgd3KAg_`2$6ih#ZNe9w7k{p(H>=LiPLO9X5IUnVEgxcb<9XneFA(
z=T?Qg`bM`JKJ8osxw2!7`4uN5@Q2SqzcI1+CC1@V^x=0H#IyGMZX84ZA1uY;y^Q%2
z7h^3}_BN&-cOpZ^-^UoH3Y&p6G*=ovgrjZ0924o!!6;m0$Lp|+{&T2__F)qKg<kv*
zHGwza2AYC;|4@v^Y}9*mF~Iz05{(oFs;~y@k;u#u%*A6^fwxf;OzBJXI0N<K8tjjY
z?RX;&px=a(@lzaxm#`CKi1tzZ3VSiXiA^@91XEEdu0pM-*7jGRw%|p~!Zo)4IclN~
zjK`Cx0M8*wFkPqsuj6$5*E*Ti&ZNH<!}s@)Mu>rKRHT7a(v3Md7dM~+yM#(%Hx9vD
zn1Lz%jEP_=YQk&QJ4n(@H0jX-Qc+tu7<FG-fAX&vj<y4N_&EKExBy#Fd)199x_hV>
z#1pkv>PJ1FjKvs4W#TbZX6B<Z(SX#QX+mx7W>f$>g5-ZFjol2$@9mA(Fhsux^`aqE
zrcTFr)C=aJ0$7Mz*%BOwEA03us3QCV*>-ct_D`bjzkv04F-${yUBN6`;geW|%TX))
z*t!dqi9JXX%pu!9je71k+rNqm><-RCMXi37wZ^&-^}g^D8d}i{*oF<Lh=UY@0?0<K
zBo~#kGHV6u6wF1fs18*l&)V--q4xe&r0z@$j=;~b7EfWB&VSZmW2P~%980kS^}tos
z$~;t>0`#K-NJ33G7`0`?unfyF9h<Nm_uv$~je37c$h|L&dhTl+p!5HS9q7U7d=cVX
z3fnA2w%@Eltz;7_mAkRRL!hV?-%E3g&dcmdX&<EU%^=kMg*YB3;3RCoc%DCijm&S3
zW-y2oGu@SUqN?}=Dg$RwTk<<9kejH$yu;ir3Zcd`aSj&YNPHVrEBjFy`vG+t&Y}Xn
zgkeo|lZF?2P{kNC+<h=;&BIq1ufSM5j??fI)?q3etMNwUC&avldf#TGoJ<?)_#H-e
z!<@u&{CfoX*8}4S_ZU{<(-_EdQ@9FM6V0eVkK6H|FoFIRjKf=)gFUD~#*Csqa2zT#
z)u@1$+VPdB;%y#9{*|&V3@D=OSc%2iZUAo}C)8|1t>hps#4}ip1*6?9Scft6*CT~(
zT9I8f5j>CQF%dh)xE?`m>4`86t*i?b`DN6~x-lB>qV`P7dkF%#7@M#cUPax17j?gP
zth-X5wJ+u|9z>n0N+kQ{DO6^{>uh5yDuBJHNIQ{oFyA1%Vy>VjOwM)t=@_Cv6Dee~
z5|x1#)Pgpl-q(&(aku^c8fwdLx`s^x;pxR8)B`!V1&dIrJdJwb22RG<eD}T?s6CyH
zI&SkY37^LRzK*?dBlf|acKiU&r~fU+>--NZaEoXxD)JK4gi}!y)Z%emg!)|=S?G?J
zp(c0)wSXE-#(LXtL>1>ctAk1Ow_5jMs?Ps08q|~d1=Ww^Kgmp7YdwofVFv#gw3210
zEqWOh;G3w4n^9ZPj?}T)h1K{oaxhF*u`y3zwY3AQXEER}ac^9JDvk(h&o7`J^l}FE
zqFhu4-ok#k9s6S^YU_SPe%OrT%uZPDdCxhVFr@HZ`VT&<X=HM3<kBx9>oq&L^cleQ
z%>5R>8&1HN?%CiJ`toC17~Afw@ICC==IrrJ^=xr&_>xlA+dCIom5w$in3x~GiB=TX
z`%ZOYk*D2hP7HfKbo~C|9^(}Hmj<`;-A7#dv~n%u(t-LQvftl35P2t56&06P5Xv1}
YnxF4nOb<Qi6h;y=ZY4)b$M22$A3drw8UO$Q

diff --git a/data/po/fr_CA.po b/data/po/fr_CA.po
index 09ca4827f..3260008a7 100644
--- a/data/po/fr_CA.po
+++ b/data/po/fr_CA.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 21:08-0500\n"
+"POT-Creation-Date: 2010-01-31 11:54-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Marianne Gagnon (Auria) <auria.mg@gmail.com>\n"
 "Language-Team: \n"
@@ -18,12 +18,18 @@ msgstr ""
 msgid "%i laps"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:415
+#. I18N: as in "fastest lap: 60 seconds by Wilber"
+#: src/modes/linear_world.cpp:263
+#, c-format
+msgid "%s by %s"
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:417
 #, c-format
 msgid "%s is ready"
 msgstr ""
 
-#: src/modes/world.cpp:458
+#: src/modes/world.cpp:461
 #, c-format
 msgid ""
 "'%s' has\n"
@@ -35,27 +41,32 @@ 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:166
 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:71
 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:154
 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 ""
 
-#: data/po/gui_strings.h:271
+#. I18N: ./data/gui/options_input.stkgui
+#: data/po/gui_strings.h:351
 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:150
 msgid "3 Strikes Battle : only in multiplayer games. Hit others with weapons until they lose all their lives."
 msgstr ""
 
@@ -63,13 +74,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:206
 msgid "About"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:215
+#: data/po/gui_strings.h:276
 msgid "Accelerate"
 msgstr ""
 
@@ -78,36 +91,45 @@ 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:378
 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:348
 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:174
+#: data/po/gui_strings.h:432
 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:15
+#: data/po/gui_strings.h:182
+#: data/po/gui_strings.h:436
 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:424
 msgid "All Tracks"
 msgstr ""
 
@@ -115,28 +137,37 @@ 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:112
 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:253
 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:420
 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:217
+#: data/po/gui_strings.h:264
+#: data/po/gui_strings.h:362
 msgid "Audio/Video"
 msgstr ""
 
@@ -146,19 +177,36 @@ 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:75
+#: data/po/gui_strings.h:116
+#: data/po/gui_strings.h:158
+#: data/po/gui_strings.h:257
+#: data/po/gui_strings.h:355
+#: data/po/gui_strings.h:382
 msgid "Back"
 msgstr ""
 
+#. I18N: In the 'paused' screen
+#: src/states_screens/dialogs/race_paused_dialog.cpp:67
+msgid "Back to Race"
+msgstr ""
+
+#. I18N: ./data/gui/challenges.stkgui
+#. I18N: ./data/gui/credits.stkgui
 #: data/po/gui_strings.h:22
-#: data/po/gui_strings.h:27
+#: data/po/gui_strings.h:29
 msgid "Back to main menu"
 msgstr ""
 
@@ -166,25 +214,26 @@ msgstr ""
 msgid "Back to the main menu"
 msgstr ""
 
-#: data/po/gui_strings.h:83
-#, fuzzy
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:106
 msgid "Bowling Ball - bounces off walls. If you are looking back, it will be thrown backwards."
-msgstr ""
-"Boule de Quilles - rebondit sur les murs. Tu peux aussi la\n"
-"lancer derrière toi en utilisant la touche 'regarder derrière'."
+msgstr "Boule de Quilles - 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:284
 msgid "Brake"
 msgstr ""
 
-#: data/po/gui_strings.h:77
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:97
 msgid "BubbleGum - leave a sticky pink puddle behind you"
 msgstr ""
 "Gomme \"balloune\" - laisse une mare de gomme\n"
 "rose et collante derrière toi"
 
-#: data/po/gui_strings.h:79
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:100
 msgid "Cake - thrown at the closest rival, best on short ranges and long straights"
 msgstr ""
 
@@ -199,44 +248,49 @@ 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:194
 msgid "Challenges"
 msgstr ""
 
+#. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:17
+#: data/po/gui_strings.h:19
 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:162
 msgid "Choose a Kart"
 msgstr ""
 
-#: data/po/gui_strings.h:372
+#. I18N: ./data/tracks/crescentcrossing/crescentcrossing.challenge
+#: data/po/gui_strings.h:487
 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:55
 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:463
 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:59
 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
-msgid ""
-"Come first in the At World's End\n"
-"Grand Prix with 3 'Racer'\n"
-"Level AI karts."
+#. I18N: ./data/grandprix/alltracks.challenge
+#: data/po/gui_strings.h:448
+msgid "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)
@@ -248,7 +302,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:32
 msgid "Continue"
 msgstr ""
 
@@ -256,15 +311,21 @@ 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:225
+#: data/po/gui_strings.h:272
+#: data/po/gui_strings.h:370
 msgid "Controls"
 msgstr ""
 
+#. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:25
+#: data/po/gui_strings.h:26
 msgid "Credits"
 msgstr ""
 
@@ -274,9 +335,10 @@ 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:233
+#: data/po/gui_strings.h:241
 msgid "Enabled"
 msgstr ""
 
@@ -285,8 +347,14 @@ msgstr ""
 msgid "Enter the new player's name"
 msgstr ""
 
+#. I18N: In the 'paused' screen
+#: src/states_screens/dialogs/race_paused_dialog.cpp:136
+msgid "Exit Race"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:308
+#: data/po/gui_strings.h:401
 msgid "Expert"
 msgstr ""
 
@@ -298,88 +366,88 @@ 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:502
+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:508
+msgid "Finish 3 laps on the City track with 3 AI karts in under 4:20 minutes."
 msgstr ""
 
-#: 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."
+#. I18N: ./data/tracks/canyon/canyon.challenge
+#: data/po/gui_strings.h:478
+msgid "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:499
 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:475
 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:505
 msgid "Finish the City track in 4:20"
 msgstr ""
 
-#: data/po/gui_strings.h:374
-msgid ""
-"Finish with at least 6 points\n"
-" of intro on three laps of\n"
-"Oliver's Math Class\n"
-"in under 52 seconds."
+#. I18N: ./data/tracks/crescentcrossing/crescentcrossing.challenge
+#: data/po/gui_strings.h:490
+msgid "Finish with at least 6 points of nitro on three laps of Oliver's Math Class in under 52 seconds."
 msgstr ""
 
-#: 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."
+#. I18N: ./data/grandprix/tothemoonandback.challenge
+#: data/po/gui_strings.h:466
+msgid "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:76
 msgid "Finished"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:239
+#: data/po/gui_strings.h:308
 msgid "Fire"
 msgstr ""
 
-#: data/po/gui_strings.h:368
+#. I18N: ./data/tracks/city/city.challenge
+#: data/po/gui_strings.h:481
 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:451
+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:146
 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:249
 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:47
+#: data/po/gui_strings.h:90
+#: data/po/gui_strings.h:131
 msgid "Game Modes"
 msgstr ""
 
@@ -395,25 +463,33 @@ 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:39
+#: data/po/gui_strings.h:82
+#: data/po/gui_strings.h:123
 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:81
 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:408
 msgid "Grand Prix"
 msgstr ""
 
+#. I18N: In the 'paused' screen
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:154
+#: src/states_screens/dialogs/race_paused_dialog.cpp:126
+#: data/po/gui_strings.h:202
 msgid "Help"
 msgstr ""
 
@@ -425,13 +501,15 @@ msgstr ""
 msgid "Hit others with weapons until they lose all their lives. (Only in multiplayer games)"
 msgstr ""
 
+#. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:52
+#: data/po/gui_strings.h:63
 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:397
 msgid "Intermediate"
 msgstr ""
 
@@ -440,8 +518,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:77
 msgid "Lap"
 msgstr ""
 
@@ -449,8 +526,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:292
 msgid "Left"
 msgstr ""
 
@@ -461,13 +539,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:340
 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:51
 msgid "Make your rivals bite dust!"
 msgstr ""
 
@@ -483,13 +563,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:229
 msgid "Music"
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:145
+#: data/po/gui_strings.h:190
 msgid "Networking"
 msgstr ""
 
@@ -535,27 +617,34 @@ msgid ""
 "now available"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:245
+#: data/po/gui_strings.h:316
 msgid "Nitro"
 msgstr ""
 
+#. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:302
+#: data/po/gui_strings.h:393
 msgid "Novice"
 msgstr ""
 
+#. I18N: ./data/gui/racesetup.stkgui
 #. I18N: In race setup menu
-#: data/po/gui_strings.h:299
+#: data/po/gui_strings.h:389
 msgid "Number of AI karts"
 msgstr ""
 
+#. I18N: In the 'paused' screen
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
+#: src/states_screens/dialogs/race_paused_dialog.cpp:116
+#: data/po/gui_strings.h:198
 msgid "Options"
 msgstr ""
 
-#: data/po/gui_strings.h:85
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:109
 msgid "Parachute - slows down all karts in a better position!"
 msgstr ""
 
@@ -567,31 +656,34 @@ msgstr ""
 msgid "Penalty time!!"
 msgstr ""
 
-#: data/po/gui_strings.h:317
+#. I18N: ./data/gui/tracks.stkgui
+#: data/po/gui_strings.h:411
 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:221
+#: data/po/gui_strings.h:268
+#: data/po/gui_strings.h:366
 msgid "Players"
 msgstr ""
 
-#: data/po/gui_strings.h:81
-#, fuzzy
+#. I18N: ./data/gui/help2.stkgui
+#: data/po/gui_strings.h:103
 msgid "Plunger - throw straight to pull an opponent back, or throw while looking back to make one lose sight!"
-msgstr ""
-"Suce à toilettes - lance-la droit devant pour tirer un \n"
-"opposant vers l'arrière, ou lance-la en regardant vers\n"
-"l'arrière pour lui obstruer la vue !"
+msgstr "Suce à toilettes - lance-la droit devant pour tirer un opposant vers l'arrière, ou lance-la en regardant vers l'arrière pour lui obstruer la vue !"
 
 #: src/states_screens/dialogs/press_a_key_dialog.cpp:49
 msgid "Press ESC to cancel"
@@ -601,18 +693,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:374
 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:210
 msgid "Quit"
 msgstr ""
 
+#. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:142
+#: data/po/gui_strings.h:186
 msgid "Race"
 msgstr ""
 
@@ -620,7 +715,8 @@ msgstr ""
 msgid "Race Results"
 msgstr ""
 
-#: data/po/gui_strings.h:296
+#. I18N: ./data/gui/racesetup.stkgui
+#: data/po/gui_strings.h:385
 msgid "Race Setup"
 msgstr ""
 
@@ -632,9 +728,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 ""
 
@@ -643,12 +739,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:79
 msgid "Ready!"
 msgstr ""
 
+#. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:106
+#: data/po/gui_strings.h:138
 msgid "Regular Race - all blows allowed, so catch weapons and make clever use of them!"
 msgstr ""
 
@@ -662,13 +759,20 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:257
+#: data/po/gui_strings.h:332
 msgid "Rescue"
 msgstr ""
 
+#. I18N: In the 'paused' screen
+#: src/states_screens/dialogs/race_paused_dialog.cpp:106
+msgid "Restart Race"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: Key binding
-#: data/po/gui_strings.h:233
+#: data/po/gui_strings.h:300
 msgid "Right"
 msgstr ""
 
@@ -676,44 +780,53 @@ msgstr ""
 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 ""
 
-#: data/po/gui_strings.h:310
+#. I18N: ./data/gui/racesetup.stkgui
+#: data/po/gui_strings.h:404
 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:80
 msgid "Set!"
 msgstr ""
 
+#. I18N: In the 'paused' screen
 #: src/states_screens/dialogs/race_over_dialog.cpp:201
+#: src/states_screens/dialogs/race_paused_dialog.cpp:96
 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:324
 msgid "Sharp Turn"
 msgstr ""
 
-#: data/po/gui_strings.h:319
+#. I18N: ./data/gui/tracks.stkgui
+#: data/po/gui_strings.h:414
 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:237
 msgid "Sound Effects"
 msgstr ""
 
+#. I18N: ./data/gui/karts.stkgui
 #. I18N: Kart group
-#: data/po/gui_strings.h:136
+#: data/po/gui_strings.h:178
 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:7
+#: data/po/gui_strings.h:170
+#: data/po/gui_strings.h:428
 msgid "Standard"
 msgstr ""
 
@@ -721,24 +834,32 @@ 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:35
+#: data/po/gui_strings.h:78
+#: data/po/gui_strings.h:119
 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:213
+#: data/po/gui_strings.h:260
+#: data/po/gui_strings.h:358
 msgid "SuperTuxKart Options"
 msgstr ""
 
-#: data/po/gui_strings.h:103
+#. I18N: ./data/gui/help3.stkgui
+#: data/po/gui_strings.h:134
 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:67
 msgid "The 'sharp turn' key allows you to do sharp turns and have better control in tight curves"
 msgstr ""
 
@@ -748,8 +869,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:142
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
@@ -760,12 +882,14 @@ msgid ""
 "To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still 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:94
 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:417
 msgid "To the Moon and Back"
 msgstr ""
 
@@ -775,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:245
 msgid "Video"
 msgstr ""
 
@@ -784,123 +909,100 @@ 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:43
+#: data/po/gui_strings.h:86
+#: data/po/gui_strings.h:127
 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:439
+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:442
+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:457
+msgid "Win To the Moon and Back Grand Prix"
 msgstr ""
 
-#: 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."
+#. I18N: ./data/tracks/fortmagma/fortmagma.challenge
+#: data/po/gui_strings.h:496
+msgid "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:472
+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:484
+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:454
+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:493
+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:469
+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:445
+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:460
+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 ""
 
-#: src/modes/world.cpp:454
+#: src/modes/world.cpp:457
 msgid ""
 "You have been\n"
 "eliminated!"
 msgstr ""
 
-#: src/karts/player_kart.cpp:345
+#: src/karts/player_kart.cpp:353
 msgid "You won the race!"
 msgstr ""
 
+#. 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:280
+#: data/po/gui_strings.h:288
+#: 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
 msgid "[none]"
 msgstr ""
 
-#. I18N: Ignore
-#: data/po/gui_strings.h:192
-#: data/po/gui_strings.h:212
-msgid "all"
-msgstr ""
-
-#. 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
-msgid "bottom"
-msgstr ""
-
diff --git a/data/po/fr_CA/LC_MESSAGES/supertuxkart.mo b/data/po/fr_CA/LC_MESSAGES/supertuxkart.mo
index 6e4ea9d9a62130615b54b0a6a139b0b270f0912a..3cf8eda27aca0c0b90b8073038981ae4856daa5f 100644
GIT binary patch
delta 636
zcmZ9Jzityj5XLuPq==G+hGHTLH#tidp^2zWflL+t2pXEbyRp4^vvch3_&`E(lNT_E
zj)E%6d!$O62gqAc(eT~bLcr>Ny1U((Z@!uRGC12`-`pE~Ggt%g06YPAz&p^b2D}9y
zz!+SC8TbXB?io{p&-gySWz2KDAKo^m6AXCcs9!iT`0Z<$iL~B@IZdqhR7|N94HYMn
z*^FB3r4dbM^huO#Wbz`*F1obU@{nAn)*-EA%8Mv%==WP2>onS&9Id^EIY%nCr<8KE
zZobHrg&IYk4J1t?fkWOYO5DY^3+MkW*JYjBB@^P|BQd2;?7*BvdCyfYrgia#V{#IX
z>F!HzWb=Kr|7c9(@$uuM&GpaqL=>7e(+h=b^jJ{jQbLVBl1A#bPBo(A*GdiRN3xod
zBX99wC=t0ay2}d;B8wvqq}h3wEc_!Vi&hJ!VdObR@OSudWS+^_tG(&^l~zobKe~L+
zIrk=d@d5&M6j-Tw)d@BNOW8%}=ypzhofTRnKeRg|hlHE?BLGL+;+?>Mk-gx3^6E%R
OT!lgyHCM`XV15Jf;>QdC

delta 109
zcmZqSn8XrrPl#nI0}wC)u?!IF05K~N+W;{L1OTxi5C;OWGa~~-Gm!QI;^ROz5P<<m
fFAPjPVKO<H(T&5vP{GL1%D`gsM#is`m6^Q(Vt)<G

diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index ddc7f24af..1c59d2d49 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-24 10:33-0500\n"
+"POT-Creation-Date: 2010-01-31 11:54-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"
@@ -420,7 +420,7 @@ msgid ""
 msgstr ""
 
 #. I18N: Shown at the end of a race
-#: src/states_screens/race_gui.cpp:75
+#: src/states_screens/race_gui.cpp:76
 msgid "Finished"
 msgstr ""
 
@@ -487,7 +487,7 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:80
+#: src/states_screens/race_gui.cpp:81
 msgid "Go!"
 msgstr ""
 
@@ -534,7 +534,7 @@ msgstr ""
 msgid "Keyboard %i"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:76
+#: src/states_screens/race_gui.cpp:77
 msgid "Lap"
 msgstr ""
 
@@ -756,7 +756,7 @@ msgid "Random Track"
 msgstr ""
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:78
+#: src/states_screens/race_gui.cpp:79
 msgid "Ready!"
 msgstr ""
 
@@ -807,7 +807,7 @@ msgstr ""
 msgid "Select a game mode"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:79
+#: src/states_screens/race_gui.cpp:80
 msgid "Set!"
 msgstr ""