Merged pull requests #2191.

data/achievements.xml

@@ -40,7 +40,7 @@
     <skidding goal="5"/>
   </achievement>
   <achievement id="6" check-type="all-at-least" reset-type="never"
-               name="Gold driver" description="Win in all single player modes, against at least 3 opponents.">
+               name="Gold driver" description="Win against at least 3 opponents in all single player modes.">
     <standard goal="1"/>
     <std_timetrial goal="1"/>
     <follow_leader goal="1"/>

data/gui/challenges.stkgui

@@ -4,7 +4,7 @@
 
     <div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
 
-        <header I18N="Title for challenges screen" text="Challenges : Trophy Room" text_align="center" align="center" width="80%" />
+        <header I18N="Title for challenges screen" text="Challenges - Trophy Room" text_align="center" align="center" width="80%" />
 
         <spacer height="5" width="100%"/>
 

data/gui/online/lobby.stkgui

@@ -7,7 +7,7 @@
             <div width="100%" proportion="2" layout="horizontal-row">
                 <box id="info" proportion="2" height="100%" layout="vertical-row">
                     <div width="100%" height="fit" layout="horizontal-row" >
-                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Server name :"/>
+                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Server name:"/>
                         <label proportion="2" text_align="left" id="server_name" text=""/>
                     </div>
                 </box>

data/gui/online/profile_settings.stkgui

@@ -17,7 +17,7 @@
         <box proportion="1" width="100%" layout="vertical-row">
             <div x="1%" y="2%" width="98%" height="96%" layout="vertical-row" >
                 <div width="fit" height="fit" layout="horizontal-row" >
-                    <label proportion="1" height="fit" text_align="left" I18N="In the online account settings screen" text="Password :"/>
+                    <label proportion="1" height="fit" text_align="left" I18N="In the online account settings screen" text="Password:"/>
                     <spacer width="20" height="1"/>
                     <button id="change_password_button" height="100%" width="fit" text="Change" />
                 </div>

data/gui/select_challenge.stkgui

@@ -7,7 +7,7 @@
         <spacer height="2%" width="1"/>
 
         <div width="100%" layout="horizontal-row" height="fit">
-            <label id="race_type" text="Type :" I18N="Type of race, in a challenge"/>
+            <label id="race_type" text="Type:" I18N="Type of race, in a challenge"/>
             <spacer width="5" height="1"/>
             <label id="race_type_val" proportion="1"/>
         </div>

data/gui/tutorial.stkgui

@@ -4,7 +4,7 @@
 
     <div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
 
-        <header I18N="Title for tutorials screen" text="Tutorial : Selection Room" text_align="center" width="100%" />
+        <header I18N="Title for tutorials screen" text="Tutorial - Selection Room" text_align="center" width="100%" />
 
         <spacer proportion="1" width="100%"/>
 

data/po/gui_strings.h

@@ -1,70 +1,4 @@
-//I18N: ./data/achievements.xml
-_("Christoffel Columbus")
-
-//I18N: ./data/achievements.xml
-_("Play every official track at least once.")
-
-//I18N: ./data/achievements.xml
-_("Strike!")
-
-//I18N: ./data/achievements.xml
-_("Hit 10 karts with a bowling-ball.")
-
-//I18N: ./data/achievements.xml
-_("Arch Enemy")
-
-//I18N: ./data/achievements.xml
-_("Hit the same kart at least 5 times in one race.")
-
-//I18N: ./data/achievements.xml
-_("Marathoner")
-
-//I18N: ./data/achievements.xml
-_("Make a race with 5 laps or more.")
-
-//I18N: ./data/achievements.xml
-_("Skid-row")
-
-//I18N: ./data/achievements.xml
-_("Make 5 skidding in a single lap.")
-
-//I18N: ./data/achievements.xml
-_("Gold driver")
-
-//I18N: ./data/achievements.xml
-_("Win in all single player modes, against at least 3 opponents.")
-
-//I18N: ./data/achievements.xml
-_("Powerup Love")
-
-//I18N: ./data/achievements.xml
-_("Use 10 or more powerups in a race.")
-
-//I18N: ./data/achievements.xml
-_("Unstoppable")
-
-//I18N: ./data/achievements.xml
-_("Win 5 single races in a row.")
-
-//I18N: ./data/achievements.xml
-_("Banana Lover")
-
-//I18N: ./data/achievements.xml
-_("Collect at least 5 bananas in one race.")
-
-//I18N: ./data/achievements.xml
-_("It's secret")
-
-//I18N: ./data/achievements.xml
-_("Really ... a secret.")
-
-//I18N: ./data/achievements.xml
-_("Mosquito Hunter")
-
-//I18N: ./data/achievements.xml
-_("Take your opponents for mosquitos! With the swatter, squash at least 5 of them in a race.")
-
-//I18N: ./data/grandprix/1_penguinplayground.grandprix
+//I18N: ./data/grandprix/1_penguinplayground.grandprix
 _("Penguin Playground")
 
 //I18N: ./data/grandprix/2_offthebeatentrack.grandprix
@@ -127,10 +61,6 @@ _("Add-Ons");
 //I18N: track group
 _("All");
 
-//I18N: ./data/gui/challenges.stkgui
-//I18N: Title for challenges screen
-_("Challenges : Trophy Room");
-
 //I18N: ./data/gui/confirm_dialog.stkgui
 //I18N: In a 'are you sure?' dialog
 _("Yes");
@@ -286,6 +216,30 @@ _("Cancel");
 //I18N: ./data/gui/feature_unlocked.stkgui
 _("Continue")
 
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("AI karts");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Reverse");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Tracks");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Track group");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Start Race");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Continue saved GP");
+
 //I18N: ./data/gui/gpedit.stkgui
 //I18N: Title in edit grand prix screen
 _("Edit Grand Prix");
@@ -338,30 +292,6 @@ _("Remove");
 //I18N: Menu item
 _("Rename");
 
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("AI karts");
-
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("Reverse");
-
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("Tracks");
-
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("Track group");
-
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("Start Race");
-
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("Continue saved GP");
-
 //I18N: ./data/gui/grand_prix_lose.stkgui
 _("Continue")
 
@@ -374,152 +304,6 @@ _("Continue")
 //I18N: ./data/gui/grand_prix_win.stkgui
 _("Save Grand Prix")
 
-//I18N: ./data/gui/help1.stkgui
-_("SuperTuxKart Help")
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: Tab in help menu
-_("General");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: Tab in help menu
-_("Weapons");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: Tab in help menu
-_("Game Modes");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: Tab in help menu
-_("Multi­player");
-
-//I18N: ./data/gui/help1.stkgui
-_("Click here to play the tutorial")
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: In the help menu
-_("Collect blue boxes : they will give you weapons or other powerups");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: In the help menu
-_("Avoid bananas!");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: In the help menu
-_("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.");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: In the help menu
-_("If you see a button with a lock like this one, you need to complete a challenge to unlock it.");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: in the help menu
-_("The 'skidding' key allows you to skid in sharp turns and get a boost.");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: in the help screen
-_("* Current key bindings can be seen/changed in menu Options");
-
-//I18N: ./data/gui/help2.stkgui
-_("SuperTuxKart Help")
-
-//I18N: ./data/gui/help2.stkgui
-//I18N: Tab in help menu
-_("General");
-
-//I18N: ./data/gui/help2.stkgui
-//I18N: Tab in help menu
-_("Weapons");
-
-//I18N: ./data/gui/help2.stkgui
-//I18N: Tab in help menu
-_("Game Modes");
-
-//I18N: ./data/gui/help2.stkgui
-//I18N: Tab in help menu
-_("Multi­player");
-
-//I18N: ./data/gui/help2.stkgui
-//I18N: In the help menu
-_("To help you win, there are some powerups you can collect :");
-
-//I18N: ./data/gui/help2.stkgui
-_("BubbleGum - protect yourself with a shield, or use while looking back to leave a sticky pink puddle behind you.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Cake - thrown at the closest rival, best on short ranges and long straights.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Plunger - throw straight to pull an opponent back, or throw while looking back to make one lose sight.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Bowling Ball - bounces off walls. If you are looking back, it will be thrown backwards.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Parachute - slows down all karts in a better position.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Anchor - slows down greatly the kart in the first position.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Swapper - gift boxes are transformed into bananas and vice versa for a short time.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Basket Ball - bounces after the leader, and might squash and slow down karts down on the way.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Swatter - will squash karts close by, slowing them down.")
-
-//I18N: ./data/gui/help3.stkgui
-_("SuperTuxKart Help")
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: Tab in help menu
-_("General");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: Tab in help menu
-_("Weapons");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: Tab in help menu
-_("Game Modes");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: Tab in help menu
-_("Multi­player");
-
-//I18N: ./data/gui/help3.stkgui
-_("SuperTuxKart features several game modes")
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("Regular Race: All blows allowed, so catch weapons and make clever use of them!");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("Time Trial: Contains no powerups, so only your driving skills matter!");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("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!");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("3 Strikes Battle: Only in multiplayer games. Hit others with weapons until they lose all their lives.");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("Soccer: Only in multiplayer games. Use your kart to push the ball into the goal.");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("Egg hunt: Explore tracks to find all hidden eggs.");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("* 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.");
-
 //I18N: ./data/gui/help4.stkgui
 _("SuperTuxKart Help")
 
@@ -684,22 +468,6 @@ _("Log In");
 //I18N: In the login dialog
 _("Close");
 
-//I18N: ./data/gui/online/lobby.stkgui
-//I18N: In networking lobby
-_("Lobby");
-
-//I18N: ./data/gui/online/lobby.stkgui
-//I18N: In the networking lobby
-_("Server name :");
-
-//I18N: ./data/gui/online/lobby.stkgui
-//I18N: In networking lobby
-_("actions");
-
-//I18N: ./data/gui/online/lobby.stkgui
-//I18N: In the networking lobby
-_("Exit");
-
 //I18N: ./data/gui/online/lobby_settings.stkgui
 //I18N: In the lobby settings screen
 _("Lobby Settings");
@@ -775,20 +543,6 @@ _("...")
 //I18N: Section in the profile screen
 _("Overview");
 
-//I18N: ./data/gui/online/profile_settings.stkgui
-_("...")
-
-//I18N: ./data/gui/online/profile_settings.stkgui
-//I18N: Section in the profile screen
-_("Account Settings");
-
-//I18N: ./data/gui/online/profile_settings.stkgui
-//I18N: In the online account settings screen
-_("Password :");
-
-//I18N: ./data/gui/online/profile_settings.stkgui
-_("Change")
-
 //I18N: ./data/gui/online/recovery_info.stkgui
 //I18N: In the recovery dialog
 _("Account Recovery");
@@ -953,6 +707,36 @@ _("Vote");
 //I18N: Vote dialog
 _("Close");
 
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In networking lobby
+_("Lobby");
+
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In the networking lobby
+_("Server name:");
+
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In networking lobby
+_("actions");
+
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In the networking lobby
+_("Exit");
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+_("...")
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+//I18N: Section in the profile screen
+_("Account Settings");
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+//I18N: In the online account settings screen
+_("Password:");
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+_("Change")
+
 //I18N: ./data/gui/options_audio.stkgui
 _("SuperTuxKart Options")
 
@@ -1015,7 +799,8 @@ _("Press enter or double-click on a device to configure it");
 _("Add a device");
 
 //I18N: ./data/gui/options_input.stkgui
-_("* Which config to use will be inferred from which 'Select' key is pressed to join the game.")
+//I18N: In the input configuration screen
+_("* Which config to use will be inferred from which 'Select' key is pressed to join the game.");
 
 //I18N: ./data/gui/options_players.stkgui
 _("SuperTuxKart Options")
@@ -1139,31 +924,6 @@ _("Assign nothing");
 //I18N: When configuring input
 _("Press ESC to cancel");
 
-//I18N: ./data/gui/racesetup.stkgui
-_("Race Setup")
-
-//I18N: ./data/gui/racesetup.stkgui
-_("Select a difficulty")
-
-//I18N: ./data/gui/racesetup.stkgui
-//I18N: Difficulty
-_("Novice");
-
-//I18N: ./data/gui/racesetup.stkgui
-//I18N: Difficulty
-_("Intermediate");
-
-//I18N: ./data/gui/racesetup.stkgui
-//I18N: Difficulty
-_("Expert");
-
-//I18N: ./data/gui/racesetup.stkgui
-//I18N: Difficulty
-_("SuperTux");
-
-//I18N: ./data/gui/racesetup.stkgui
-_("Select a game mode")
-
 //I18N: ./data/gui/race_paused_dialog.stkgui
 _("Paused")
 
@@ -1195,25 +955,31 @@ _("Help");
 //I18N: Race paused button
 _("Exit Race");
 
-//I18N: ./data/gui/select_challenge.stkgui
+//I18N: ./data/gui/racesetup.stkgui
 _("Race Setup")
 
-//I18N: ./data/gui/select_challenge.stkgui
-//I18N: Type of race, in a challenge
-_("Type :");
+//I18N: ./data/gui/racesetup.stkgui
+_("Select a difficulty")
 
-//I18N: ./data/gui/select_challenge.stkgui
+//I18N: ./data/gui/racesetup.stkgui
 //I18N: Difficulty
 _("Novice");
 
-//I18N: ./data/gui/select_challenge.stkgui
+//I18N: ./data/gui/racesetup.stkgui
 //I18N: Difficulty
 _("Intermediate");
 
-//I18N: ./data/gui/select_challenge.stkgui
+//I18N: ./data/gui/racesetup.stkgui
 //I18N: Difficulty
 _("Expert");
 
+//I18N: ./data/gui/racesetup.stkgui
+//I18N: Difficulty
+_("SuperTux");
+
+//I18N: ./data/gui/racesetup.stkgui
+_("Select a game mode")
+
 //I18N: ./data/gui/soccer_setup.stkgui
 _("Race Setup")
 
@@ -1240,14 +1006,6 @@ _("VS")
 //I18N: In soccer setup screen
 _("Continue");
 
-//I18N: ./data/gui/tracks.stkgui
-//I18N: In the track selection screen
-_("Grand Prix");
-
-//I18N: ./data/gui/tracks.stkgui
-//I18N: In the track selection screen
-_("All Tracks");
-
 //I18N: ./data/gui/track_info.stkgui
 _("= Highscores =")
 
@@ -1276,12 +1034,13 @@ _("Drive in reverse");
 //I18N: In the track info screen
 _("Start Race");
 
-//I18N: ./data/gui/tutorial.stkgui
-//I18N: Title for tutorials screen
-_("Tutorial : Selection Room");
+//I18N: ./data/gui/tracks.stkgui
+//I18N: In the track selection screen
+_("Grand Prix");
 
-//I18N: ./data/gui/tutorial.stkgui
-_("Play all")
+//I18N: ./data/gui/tracks.stkgui
+//I18N: In the track selection screen
+_("All Tracks");
 
 //I18N: ./data/gui/tutorial_message_dialog.stkgui
 //I18N: Button in tutorial
@@ -1369,74 +1128,343 @@ _("Rename");
 //I18N: In the user screen
 _("Cancel");
 
-//I18N: ../stk-assets/tracks/battleisland/track.xml
-_("Battle Island")
+//I18N: ./data/gui/challenges.stkgui
+//I18N: Title for challenges screen
+_("Challenges - Trophy Room");
 
-//I18N: ../stk-assets/tracks/cave/track.xml
-_("Cave X")
+//I18N: ./data/gui/tutorial.stkgui
+//I18N: Title for tutorials screen
+_("Tutorial - Selection Room");
 
-//I18N: ../stk-assets/tracks/city/track.xml
-_("Shiny Suburbs")
+//I18N: ./data/gui/tutorial.stkgui
+_("Play all")
 
-//I18N: ../stk-assets/tracks/cocoa_temple/track.xml
-_("Cocoa Temple")
+//I18N: ./data/gui/help1.stkgui
+_("SuperTuxKart Help")
 
-//I18N: ../stk-assets/tracks/farm/track.xml
-_("Bovine Barnyard")
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("General");
 
-//I18N: ../stk-assets/tracks/fortmagma/track.xml
-_("Fort Magma")
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("Weapons");
 
-//I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
-_("Gran Paradiso Island")
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("Game Modes");
 
-//I18N: ../stk-assets/tracks/greenvalley/track.xml
-_("Green Valley")
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("Multi­player");
 
-//I18N: ../stk-assets/tracks/hacienda/track.xml
-_("Hacienda")
+//I18N: ./data/gui/help1.stkgui
+_("Click here to play the tutorial")
 
-//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-_("What's wrong, little hippies? Your great gnu leader is missing?")
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("Collect blue boxes. They will give you weapons or other powerups.");
 
-//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-_("What's wrong, little hippies? Your great gnu leader is missing?")
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("Avoid bananas!");
 
-//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-_("Oh yes, see, he's in my castle now and will be served for supper...")
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("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.");
 
-//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-_("Oh yes, see, he's in my castle now and will be served for supper...")
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("If you see a button with a lock like this one, you need to complete a challenge to unlock it.");
 
-//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-_("But I'm a fair creature, so I'll make you a deal.")
+//I18N: ./data/gui/help1.stkgui
+//I18N: in the help menu
+_("The 'skidding' key allows you to skid in sharp turns and get a boost.");
 
-//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-_("But I'm a fair creature, so I'll make you a deal.")
+//I18N: ./data/gui/help1.stkgui
+//I18N: in the help screen
+_("* Current key bindings can be seen/changed in menu Options");
 
-//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-_("If you can beat me at racing, I will free the old codger.")
+//I18N: ./data/gui/help2.stkgui
+_("SuperTuxKart Help")
 
-//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-_("If you can beat me at racing, I will free the old codger.")
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("General");
 
-//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-_(" But you pathetic little twerps will never be able to beat me - King of the Karts!")
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("Weapons");
 
-//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-_(" But you pathetic little twerps will never be able to beat me - King of the Karts!")
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("Game Modes");
 
-//I18N: ../stk-assets/tracks/lighthouse/track.xml
-_("Around the lighthouse")
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("Multi­player");
+
+//I18N: ./data/gui/help2.stkgui
+//I18N: In the help menu
+_("To help you win, there are some powerups you can collect:");
+
+//I18N: ./data/gui/help2.stkgui
+_("BubbleGum - protect yourself with a shield, or use while looking back to leave a sticky pink puddle behind you.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Cake - thrown at the closest rival, best on short ranges and long straights.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Plunger - throw straight to pull an opponent back, or throw while looking back to make one lose sight.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Bowling Ball - bounces off walls. If you are looking back, it will be thrown backwards.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Parachute - slows down all karts in a better position.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Anchor - greatly slows down the kart in the first position.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Swapper - gift boxes are transformed into bananas and vice versa for a short time.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Basket Ball - bounces after the leader, and might squash and slow down karts down on the way.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Swatter - will squash karts close by, slowing them down.")
+
+//I18N: ./data/gui/help3.stkgui
+_("SuperTuxKart Help")
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("General");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("Weapons");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("Game Modes");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("Multi­player");
+
+//I18N: ./data/gui/help3.stkgui
+_("SuperTuxKart features several game modes")
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Regular Race: All blows allowed, so catch weapons and make clever use of them!");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Time Trial: Contains no powerups, so only your driving skills matter!");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("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!");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("3 Strikes Battle: Only in multiplayer games. Hit others with weapons until they lose all their lives.");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Soccer: Only in multiplayer games. Use your kart to push the ball into the goal.");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Egg hunt: Explore tracks to find all hidden eggs.");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("* 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.");
+
+//I18N: ./data/gui/select_challenge.stkgui
+_("Race Setup")
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Type of race, in a challenge
+_("Type:");
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Difficulty
+_("Novice");
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Difficulty
+_("Intermediate");
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Difficulty
+_("Expert");
+
+//I18N: ./data/achievements.xml
+_("Christoffel Columbus")
+
+//I18N: ./data/achievements.xml
+_("Play every official track at least once.")
+
+//I18N: ./data/achievements.xml
+_("Strike!")
+
+//I18N: ./data/achievements.xml
+_("Hit 10 karts with a bowling-ball.")
+
+//I18N: ./data/achievements.xml
+_("Arch Enemy")
+
+//I18N: ./data/achievements.xml
+_("Hit the same kart at least 5 times in one race.")
+
+//I18N: ./data/achievements.xml
+_("Marathoner")
+
+//I18N: ./data/achievements.xml
+_("Make a race with 5 laps or more.")
+
+//I18N: ./data/achievements.xml
+_("Skid-row")
+
+//I18N: ./data/achievements.xml
+_("Make 5 skidding in a single lap.")
+
+//I18N: ./data/achievements.xml
+_("Gold driver")
+
+//I18N: ./data/achievements.xml
+_("Win against at least 3 opponents in all single player modes.")
+
+//I18N: ./data/achievements.xml
+_("Powerup Love")
+
+//I18N: ./data/achievements.xml
+_("Use 10 or more powerups in a race.")
+
+//I18N: ./data/achievements.xml
+_("Unstoppable")
+
+//I18N: ./data/achievements.xml
+_("Win 5 single races in a row.")
+
+//I18N: ./data/achievements.xml
+_("Banana Lover")
+
+//I18N: ./data/achievements.xml
+_("Collect at least 5 bananas in one race.")
+
+//I18N: ./data/achievements.xml
+_("It's secret")
+
+//I18N: ./data/achievements.xml
+_("Really ... a secret.")
+
+//I18N: ./data/achievements.xml
+_("Mosquito Hunter")
+
+//I18N: ./data/achievements.xml
+_("Take your opponents for mosquitos! With the swatter, squash at least 5 of them in a race.")
+
+//I18N: ../stk-assets/tracks/soccer_field/track.xml
+_("Soccer field")
+
+//I18N: ../stk-assets/tracks/subsea/track.xml
+_("Subsea")
+
+//I18N: ../stk-assets/tracks/snowmountain/track.xml
+_("Northern Resort")
+
+//I18N: ../stk-assets/tracks/minigolf/track.xml
+_("Minigolf")
 
 //I18N: ../stk-assets/tracks/mansion/track.xml
 _("Blackhill Mansion")
 
+//I18N: ../stk-assets/tracks/stadium/track.xml
+_("The Stadium")
+
+//I18N: ../stk-assets/tracks/battleisland/track.xml
+_("Battle Island")
+
+//I18N: ../stk-assets/tracks/scotland/track.xml
+_("Nessie's pond")
+
+//I18N: ../stk-assets/tracks/city/track.xml
+_("Shiny Suburbs")
+
+//I18N: ../stk-assets/tracks/lighthouse/track.xml
+_("Around the lighthouse")
+
 //I18N: ../stk-assets/tracks/mines/track.xml
 _("Old Mine")
 
-//I18N: ../stk-assets/tracks/minigolf/track.xml
-_("Minigolf")
+//I18N: ../stk-assets/tracks/zengarden/track.xml
+_("Zen Garden")
+
+//I18N: ../stk-assets/tracks/greenvalley/track.xml
+_("Green Valley")
+
+//I18N: ../stk-assets/tracks/fortmagma/track.xml
+_("Fort Magma")
+
+//I18N: ../stk-assets/tracks/farm/track.xml
+_("Bovine Barnyard")
+
+//I18N: ../stk-assets/tracks/temple/track.xml
+_("Temple")
+
+//I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
+_("Snow Peak")
+
+//I18N: ../stk-assets/tracks/xr591/track.xml
+_("XR591")
+
+//I18N: ../stk-assets/tracks/cocoa_temple/track.xml
+_("Cocoa Temple")
+
+//I18N: ../stk-assets/tracks/hacienda/track.xml
+_("Hacienda")
+
+//I18N: ../stk-assets/tracks/stk_enterprise/track.xml
+_("STK Enterprise")
+
+//I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
+_("Gran Paradiso Island")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("What's wrong, little hippies? Your great gnu leader is missing?")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("What's wrong, little hippies? Your great gnu leader is missing?")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("Oh yes, see, he's in my castle now and will be served for supper...")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("Oh yes, see, he's in my castle now and will be served for supper...")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("But I'm a fair creature, so I'll make you a deal.")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("But I'm a fair creature, so I'll make you a deal.")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("If you can beat me at racing, I will free the old codger.")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("If you can beat me at racing, I will free the old codger.")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_(" But you pathetic little twerps will never be able to beat me - King of the Karts!")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_(" But you pathetic little twerps will never be able to beat me - King of the Karts!")
 
 //I18N: ../stk-assets/tracks/olivermath/track.xml
 _("Oliver's Math Class")
@@ -1444,56 +1472,17 @@ _("Oliver's Math Class")
 //I18N: ../stk-assets/tracks/sandtrack/track.xml
 _("Shifting Sands")
 
-//I18N: ../stk-assets/tracks/scotland/track.xml
-_("Nessie's pond")
+//I18N: ../stk-assets/tracks/cave/track.xml
+_("Cave X")
 
-//I18N: ../stk-assets/tracks/snowmountain/track.xml
-_("Northern Resort")
-
-//I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-_("Snow Peak")
-
-//I18N: ../stk-assets/tracks/soccer_field/track.xml
-_("Soccer field")
-
-//I18N: ../stk-assets/tracks/stadium/track.xml
-_("The Stadium")
-
-//I18N: ../stk-assets/tracks/stk_enterprise/track.xml
-_("STK Enterprise")
-
-//I18N: ../stk-assets/tracks/subsea/track.xml
-_("Subsea")
-
-//I18N: ../stk-assets/tracks/temple/track.xml
-_("Temple")
-
-//I18N: ../stk-assets/tracks/xr591/track.xml
-_("XR591")
-
-//I18N: ../stk-assets/tracks/zengarden/track.xml
-_("Zen Garden")
-
-//I18N: ../stk-assets/karts/adiumy/kart.xml
-_("Adiumy")
-
-//I18N: ../stk-assets/karts/amanda/kart.xml
-_("Amanda")
-
-//I18N: ../stk-assets/karts/beastie/kart.xml
-_("Beastie")
+//I18N: ../stk-assets/karts/tux/kart.xml
+_("Tux")
 
 //I18N: ../stk-assets/karts/elephpant/kart.xml
 _("Elephpant")
 
-//I18N: ../stk-assets/karts/emule/kart.xml
-_("Emule")
-
-//I18N: ../stk-assets/karts/gnu/kart.xml
-_("Gnu")
-
-//I18N: ../stk-assets/karts/hexley/kart.xml
-_("Hexley")
+//I18N: ../stk-assets/karts/amanda/kart.xml
+_("Amanda")
 
 //I18N: ../stk-assets/karts/konqi/kart.xml
 _("Konqi")
@@ -1501,27 +1490,42 @@ _("Konqi")
 //I18N: ../stk-assets/karts/nolok/kart.xml
 _("Nolok")
 
-//I18N: ../stk-assets/karts/pidgin/kart.xml
-_("Pidgin")
+//I18N: ../stk-assets/karts/suzanne/kart.xml
+_("Suzanne")
+
+//I18N: ../stk-assets/karts/wilber/kart.xml
+_("Wilber")
+
+//I18N: ../stk-assets/karts/adiumy/kart.xml
+_("Adiumy")
+
+//I18N: ../stk-assets/karts/gnu/kart.xml
+_("Gnu")
 
 //I18N: ../stk-assets/karts/puffy/kart.xml
 _("Puffy")
 
+//I18N: ../stk-assets/karts/gavroche/kart.xml
+_("Gavroche")
+
+//I18N: ../stk-assets/karts/hexley/kart.xml
+_("Hexley")
+
+//I18N: ../stk-assets/karts/xue/kart.xml
+_("Xue")
+
 //I18N: ../stk-assets/karts/sara_the_racer/kart.xml
 _("Sara the Racer")
 
 //I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
 _("Sara the Wizard")
 
-//I18N: ../stk-assets/karts/suzanne/kart.xml
-_("Suzanne")
+//I18N: ../stk-assets/karts/emule/kart.xml
+_("Emule")
 
-//I18N: ../stk-assets/karts/tux/kart.xml
-_("Tux")
+//I18N: ../stk-assets/karts/pidgin/kart.xml
+_("Pidgin")
 
-//I18N: ../stk-assets/karts/wilber/kart.xml
-_("Wilber")
-
-//I18N: ../stk-assets/karts/xue/kart.xml
-_("Xue")
+//I18N: ../stk-assets/karts/beastie/kart.xml
+_("Beastie")
 

src/input/input_manager.cpp

@@ -748,7 +748,7 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
                         //I18N: message shown when an input device is used but
                         // is not associated to any player
                         GUIEngine::showMessage(
-                            _("Ignoring '%s', you needed to join earlier to play!",
+                            _("Ignoring '%s'. You needed to join earlier to play!",
                             core::stringw(gp->getName().c_str())));
                     }
                 }

src/states_screens/dialogs/select_challenge.cpp

@@ -50,22 +50,22 @@ core::stringw getLabel(RaceManager::Difficulty difficulty, const ChallengeData*
         if (c->getMinorMode() == RaceManager::MINOR_MODE_FOLLOW_LEADER) r--;
 
         if (label.size() > 0) label.append(L"\n");
-        label.append( _("Required Rank : %i", r) );
+        label.append( _("Required Rank: %i", r) );
     }
     if (c->getTime(difficulty) > 0)
     {
         if (label.size() > 0) label.append(L"\n");
-        label.append( _("Required Time : %i",
+        label.append( _("Required Time: %i",
                         StringUtils::timeToString(c->getTime(difficulty)).c_str()) );
     }
     if (c->getEnergy(difficulty) > 0)
     {
         if (label.size() > 0) label.append(L"\n");
-        label.append( _("Required Nitro Points : %i", c->getEnergy(difficulty)) );
+        label.append( _("Required Nitro Points: %i", c->getEnergy(difficulty)) );
     }
 
     if (label.size() > 0) label.append(L"\n");
-    label.append(_("Number of AI Karts : %i", c->getNumKarts(difficulty) - 1));
+    label.append(_("Number of AI Karts: %i", c->getNumKarts(difficulty) - 1));
 
     return label;
 }

src/states_screens/options_screen_input2.cpp

@@ -476,8 +476,8 @@ void OptionsScreenInput2::gotSensedInput(const Input& sensed_input)
                      sensed_input.m_button_id == irr::KEY_LSHIFT ||
                      sensed_input.m_button_id == irr::KEY_RSHIFT))
     {
-        new MessageDialog(_("Warning, 'Shift' is not a recommended key : when "
-                            "shift is pressed down, all keys that contain a "
+        new MessageDialog(_("Warning: The 'Shift' is not a recommended key. When "
+                            "'Shift' is pressed down, all keys that contain a "
                             "character that is different in upper-case will "
                             "stop working."));
     }

src/states_screens/options_screen_video.cpp

@@ -440,30 +440,30 @@ void OptionsScreenVideo::updateTooltip()
     const core::stringw none = _LTR("None");
 
     //I18N: in graphical options
-//    tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
+//    tooltip = tooltip + L"\n" + _("Pixel shaders: %s",
 //                                  UserConfigParams::m_pixel_shaders ? enabled : disabled);
     //I18N: in graphical options
-    tooltip = _("Animated Scenery : %s",
+    tooltip = _("Animated Scenery: %s",
         UserConfigParams::m_graphical_effects ? enabled : disabled);
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Weather Effects : %s",
+    tooltip = tooltip + L"\n" + _("Weather Effects: %s",
         UserConfigParams::m_weather_effects ? enabled : disabled);
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Animated Characters : %s",
+    tooltip = tooltip + L"\n" + _("Animated Characters: %s",
         UserConfigParams::m_show_steering_animations == 2
         ? all
         : (UserConfigParams::m_show_steering_animations == 1 ? me : none));
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Dynamic lights : %s",
+    tooltip = tooltip + L"\n" + _("Dynamic lights: %s",
         UserConfigParams::m_dynamic_lights ? enabled : disabled);
     //I18N: in graphical options
     tooltip = tooltip + L"\n" + _("Motion blur: %s",
         UserConfigParams::m_motionblur ? enabled : disabled);
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Anti-aliasing : %s",
+    tooltip = tooltip + L"\n" + _("Anti-aliasing: %s",
         UserConfigParams::m_mlaa ? enabled : disabled);
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Ambient occlusion : %s",
+    tooltip = tooltip + L"\n" + _("Ambient occlusion: %s",
         UserConfigParams::m_ssao ? enabled : disabled);
     //I18N: in graphical options
     if (UserConfigParams::m_shadows_resolution == 0)
@@ -472,28 +472,28 @@ void OptionsScreenVideo::updateTooltip()
         tooltip = tooltip + L"\n" + _("Shadows: %i", UserConfigParams::m_shadows_resolution);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Bloom : %s",
+    tooltip = tooltip + L"\n" + _("Bloom: %s",
         UserConfigParams::m_bloom ? enabled : disabled);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Glow (outlines) : %s",
+    tooltip = tooltip + L"\n" + _("Glow (outlines): %s",
         UserConfigParams::m_glow ? enabled : disabled);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Light shaft (God rays) : %s",
+    tooltip = tooltip + L"\n" + _("Light shaft (God rays): %s",
         UserConfigParams::m_light_shaft ? enabled : disabled);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Depth of field : %s",
+    tooltip = tooltip + L"\n" + _("Depth of field: %s",
         UserConfigParams::m_dof ? enabled : disabled);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Global illumination : %s",
+    tooltip = tooltip + L"\n" + _("Global illumination: %s",
         UserConfigParams::m_gi ? enabled : disabled);
     
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Use high definition textures") + L" : " +
-        ((UserConfigParams::m_high_definition_textures & 0x1) == 0 ? disabled : enabled);
+    tooltip = tooltip + L"\n" + _("Use high definition textures: %s",
+        (UserConfigParams::m_high_definition_textures & 0x1) == 0 ? disabled : enabled);
     
     gfx->setTooltip(tooltip);
 }   // updateTooltip

src/states_screens/race_setup_screen.cpp

@@ -228,7 +228,7 @@ void RaceSetupScreen::init()
         irr::core::stringw name4 = irr::core::stringw(
             RaceManager::getNameOf(RaceManager::MINOR_MODE_3_STRIKES)) + L"\n";
         //FIXME: avoid duplicating descriptions from the help menu!
-        name4 += _("Hit others with weapons until they lose all their lives. (Only in multiplayer games)");
+        name4 += _("Hit others with weapons until they lose all their lives (only in multiplayer games).");
         w2->addItem( name4, IDENT_STRIKES, RaceManager::getIconOf(RaceManager::MINOR_MODE_3_STRIKES));
     }
 
@@ -237,7 +237,7 @@ void RaceSetupScreen::init()
     {
         irr::core::stringw name5 = irr::core::stringw(
             RaceManager::getNameOf(RaceManager::MINOR_MODE_SOCCER)) + L"\n";
-        name5 += _("Push the ball to the opposite cage to score goals. (Only in multiplayer games)");
+        name5 += _("Push the ball to the opposite cage to score goals (only in multiplayer games).");
         w2->addItem( name5, IDENT_SOCCER, RaceManager::getIconOf(RaceManager::MINOR_MODE_SOCCER));
     }
 #endif

src/states_screens/tracks_screen.cpp

@@ -282,7 +282,7 @@ void TracksScreen::buildTrackList()
             race_manager->getNumLocalPlayers() == 1)
         {
             tracks_widget->addItem(
-                _("Locked : solve active challenges to gain access to more!"),
+                _("Locked: solve active challenges to gain access to more!"),
                 "locked", curr->getScreenshotFile(), LOCKED_BADGE,
                 IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
         }