Merge remote-tracking branch 'origin/master' into network

CHANGELOG.md

@@ -20,7 +20,8 @@ For similar reasons, and because some features are vastly more complex than othe
 
 ### Race gameplay and physics
 * New game mode Capture the Flag by Benau (online multiplayer only)
-* New game mode Free for All by Benau (online multiplayer only)
+* New game mode Free for All by Benau
+* Free for All available in offline mode with AI, by Mrxx99
 * Revised kart characteristics for better balance between light, medium and heavy karts by Alayan
 * Better random item distribution for various numbers of karts by Alayan and hiker
 * Fix position interpolation causing some incorrect lapline validation by Auria
@@ -54,7 +55,11 @@ For similar reasons, and because some features are vastly more complex than othe
 
 ### Android
 * Gyroscope support by Pelya
-* Numerous improvements to input on Android, especially screen keyboard, by deveee
+* Numerous improvements to input on Android, including screen keyboard, keyboard, gamepads, by deveee
+* Android TV support
+* Improved UI and font scaling by deveee
+* More compact APK thanks to png optimization, allows to have several tracks more than the 0.9.3 APK, by deveee and Alayan
+* Wayland support and many other smaller improvements and fixes
 
 ### User Interface
 * New networking user interface by Benau and hiker
@@ -67,19 +72,20 @@ For similar reasons, and because some features are vastly more complex than othe
 * Improved help menu with lateral tabs and a lot more information by Alayan
 * Improved option menu with lateral tabs by Alayan
 * Many improvements to the ghost replay selection list (give access to egg hunt replays, kart icon shown in the list, replay's game version shown, hide player number column by default) and dialog (allow replay comparison, show track picture, show information about the selected replays) by Alayan
-* Other significant enhancements (detailed progress of multi-goal achievements, reset password button, clearer checkbox status, milliseconds displayed in time-trials and egg hunts, nitro efficiency in the kart selection screen, better track info screen, better warnings when trying to do an online action with internet access disabled, control configurations can be disabled without being deleted...)
+* Other significant enhancements (detailed progress of multi-goal achievements, reset password button, clearer checkbox status, milliseconds displayed in time-trials and egg hunts, nitro efficiency in the kart selection screen, better track info screen, better warnings when trying to do an online action with internet access disabled, control configurations can be disabled without being deleted, default resolutions can't be used in fullscreen if unsupported by the monitor...)
 * Many bugfixes and small enhancements mostly by deveee and Alayan
 
 ### Tracks and modeling
 #### Tracks
+* Ravenbridge Mansion by samuncle, replacing Black Hill Mansion
 * Las Dunas Soccer by samuncle
 * Candela City arena by Benau based on samuncle's track
-* Unwanted shortcuts and exploits fixed by Auria in many tracks :
-    * Around the Lighthouse, Fort Magma Grand Paradisio Island, Hacienda, Minigolf, Nessie's Pond, Northern Resort, Oliver's Math Class, Shifting Sands, STK Enterprise, XR591
+* Unwanted shortcuts and exploits found by several players and fixed by Auria in many tracks :
+    * Around the Lighthouse, Fort Magma, Grand Paradisio Island, Hacienda, Minigolf, Nessie's Pond, Northern Resort, Oliver's Math Class, Shifting Sands, STK Enterprise, XR591
 * Smoothness issues causing collisions and kart slowdown fixed by Auria :
     * Nessie's Pond, Old Mine, Shifting Sands, Volcano Island, XR591
 * Item positions improvement by Alayan and theThomasPat :
-    * Northern Resort, Zen Garden, Volcano Island, Minigolf, Around the Lighthouse
+    * Around the Lighthouse, Black Forest, Candela City, Hacienda, Minigolf, Northern Resort, Oliver's Math Class, STK Enterprise, Old Mine, Volcano Island, Zen Garden
 #### Karts
 * New version of Beastie by Jymis
 

android/generate_assets.sh

@@ -24,9 +24,9 @@ export TRACKS="abyss arena_candela_city battleisland cave cornfield_crossing   \
                endcutscene featunlocked fortmagma gplose gpwin hacienda        \
                icy_soccer_field introcutscene introcutscene2 lasdunasarena     \
                lasdunassoccer lighthouse mines minigolf olivermath overworld   \
-               sandtrack scotland snowmountain snowtuxpeak soccer_field        \
-               stadium stk_enterprise temple tutorial volcano_island xr591     \
-               zengarden"
+               ravenbridge_mansion sandtrack scotland snowmountain snowtuxpeak \
+               soccer_field stadium stk_enterprise temple tutorial             \
+               volcano_island xr591 zengarden"
 
 export ASSETS_PATHS="../data                    \
                      ../../stk-assets           \

data/challenges/candela_city.challenge

@@ -3,7 +3,7 @@
     <unlock_list list="false"/>
     <track id="candela_city" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="75"/>
+    <requirements trophies="90"/>
     
     <best>
         <karts number="9"/>

data/challenges/cocoa_temple.challenge

@@ -3,7 +3,7 @@
     <unlock_list list="false"/>
     <track id="cocoa_temple" laps="3" reverse="false"/>
     <mode major="single" minor="timetrial"/>
-    <requirements trophies="0"/>
+    <requirements trophies="45"/>
 
     <best>
         <karts number="1"

data/challenges/cornfield_crossing.challenge

@@ -6,19 +6,19 @@
     <requirements trophies="0"/>
     
     <best>
-        <karts number="7"/>
+        <karts number="8"/>
         <requirements position="1" time="128"/>
     </best>
     <hard>
-        <karts number="6"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="5"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="4"/>
+        <karts number="5"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/green_valley.challenge

@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 <challenge version="3">
     <unlock_list list="false"/>
-    <track id="greenvalley" laps="3" reverse="false"/>
+    <track id="black_forest" laps="2" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="90"/>
+    <requirements trophies="130"/>
     
     <best>
-        <karts number="9"/>
-        <requirements position="1" time="160"/>
+        <karts number="10"/>
+        <requirements position="1" time="170"/>
     </best>
     <hard>
-        <karts number="8"/>
+        <karts number="9"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="7"/>
+        <karts number="8"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="6"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/hacienda.challenge

@@ -3,22 +3,22 @@
     <unlock_list list="false"/>
     <track id="hacienda" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="25"/>
+    <requirements trophies="0"/>
     
     <best>
-        <karts number="8"/>
+        <karts number="7"/>
         <requirements position="1" time="124"/>
     </best>
     <hard>
-        <karts number="7"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="6"/>
+        <karts number="5"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="5"/>
+        <karts number="4"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/lighthouse.challenge

@@ -3,22 +3,22 @@
     <unlock_list list="false"/>
     <track id="lighthouse" laps="4" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="105"/>
+    <requirements trophies="95"/>
     
     <best>
-        <karts number="10"/>
+        <karts number="9"/>
         <requirements position="1" time="120"/>
     </best>
     <hard>
-        <karts number="9"/>
+        <karts number="8"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="8"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="7"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/mansion.challenge

@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 <challenge version="3">
     <unlock_list list="false"/>
-    <track id="mansion" laps="3" reverse="false"/>
+    <track id="ravenbridge_mansion" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-		<requirements trophies="100"/>
+		<requirements trophies="0"/>
 
     <best>
-        <karts number="9"/>
-        <requirements position="1" time="100"/>
+        <karts number="8"/>
+        <requirements position="1" time="130"/>
     </best>
     <hard>
-        <karts number="8"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="7"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="6"/>
+        <karts number="5"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/minigolf.challenge

@@ -3,7 +3,7 @@
     <unlock_list list="false"/>
     <track id="minigolf" laps="4" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="130"/>
+    <requirements trophies="125"/>
     
     <best>
         <karts number="10"/>

data/challenges/olivermath.challenge

@@ -3,22 +3,22 @@
     <unlock_list list="false"/>
     <track id="olivermath" laps="5" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="0"/>
+    <requirements trophies="75"/>
 
     <best>
-        <karts number="7"/>
+        <karts number="9"/>
         <requirements position="1" time="77"/>
     </best>
     <hard>
-        <karts number="6"/>
+        <karts number="8"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="5"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="4"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/snowmountain.challenge

@@ -3,22 +3,22 @@
     <unlock_list list="false"/>
     <track id="snowmountain" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="115"/>
+    <requirements trophies="105"/>
 
     <best>
-        <karts number="10"/>
+        <karts number="9"/>
         <requirements position="1" time="110"/>
     </best>
     <hard>
-        <karts number="9"/>
+        <karts number="8"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="8"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="7"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/snowpeak.challenge

@@ -3,7 +3,7 @@
     <unlock_list list="false"/>
     <track id="snowtuxpeak" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="45"/>
+    <requirements trophies="0"/>
     
     <best>
         <karts number="8"/>

data/challenges/stk_enterprise.challenge

@@ -3,22 +3,22 @@
     <unlock_list list="false"/>
     <track id="stk_enterprise" laps="3" reverse="false"/>
     <mode major="single" minor="timetrial"/>
-    <requirements trophies="125"/>
+    <requirements trophies="145"/>
     
     <best>
-        <karts number="9"/>
+        <karts number="10"/>
         <requirements position="1" time="132"/>
     </best>
     <hard>
-        <karts number="8"/>
+        <karts number="9"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="7"/>
+        <karts number="8"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="6"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/volcano_island.challenge

@@ -3,22 +3,22 @@
     <unlock_list list="false"/>
     <track id="volcano_island" laps="2" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="15"/>
+    <requirements trophies="0"/>
     
     <best>
-        <karts number="8"/>
+        <karts number="7"/>
         <requirements position="1" time="138"/>
     </best>
     <hard>
-        <karts number="7"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="6"/>
+        <karts number="5"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="5"/>
+        <karts number="4"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/xr591.challenge

@@ -3,7 +3,7 @@
     <unlock_list list="false"/>
     <track id="xr591" laps="2" reverse="false"/>
     <mode major="single" minor="timetrial"/>
-    <requirements trophies="135"/>
+    <requirements trophies="150"/>
     
     <best>
         <karts number="1"/>

data/challenges/zengarden.challenge

@@ -6,19 +6,19 @@
     <requirements trophies="35"/>
     
     <best>
-        <karts number="5"/>
-        <requirements position="1" time="92"/>
+        <karts number="8"/>
+        <requirements position="1" time="105"/>
     </best>
     <hard>
-        <karts number="4"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="3"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="2"/>
+        <karts number="5"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/grandprix/1_penguinplayground.grandprix

@@ -2,9 +2,9 @@
 <supertuxkart_grand_prix name="Penguin Playground">
 
     <track id="sandtrack"          laps="3" reverse="false" />
-    <track id="cornfield_crossing" laps="3" reverse="false" />
-    <track id="olivermath"         laps="5" reverse="false" />
+    <track id="scotland"           laps="3" reverse="false" />
     <track id="abyss"              laps="3" reverse="false" />
-    <track id="scotland"           laps="3" reverse="false" /> 
+    <track id="volcano_island"     laps="2" reverse="false" />
+    <track id="hacienda"           laps="3" reverse="false" />
  
 </supertuxkart_grand_prix>

data/grandprix/2_offthebeatentrack.grandprix

@@ -1,10 +1,10 @@
 
 <supertuxkart_grand_prix name="Off the Beaten Track">
 
-    <track id="cocoa_temple"   laps="3" reverse="false" />
-    <track id="hacienda"       laps="3" reverse="false" />
-    <track id="zengarden"      laps="4" reverse="false" />
-    <track id="volcano_island" laps="2" reverse="false" />
-    <track id="snowtuxpeak"    laps="3" reverse="false" />
+    <track id="cornfield_crossing"   laps="3" reverse="false" />
+    <track id="snowtuxpeak"          laps="3" reverse="false" />
+    <track id="ravenbridge_mansion"  laps="3" reverse="false" />
+    <track id="zengarden"            laps="4" reverse="false" />
+    <track id="cocoa_temple"         laps="3" reverse="false" />
     
 </supertuxkart_grand_prix>

data/grandprix/3_tothemoonandback.grandprix

@@ -1,10 +1,10 @@
 
 <supertuxkart_grand_prix name="To the Moon and Back">
 
+    <track id="olivermath"           laps="5" reverse="false" />
     <track id="gran_paradiso_island" laps="3" reverse="false" />
-    <track id="greenvalley"          laps="3" reverse="false" />
-    <track id="mansion"              laps="3" reverse="false" />
     <track id="lighthouse"           laps="4" reverse="false" />
     <track id="candela_city"         laps="3" reverse="false" />
+    <track id="snowmountain"         laps="3" reverse="false" />
     
 </supertuxkart_grand_prix>

data/grandprix/4_atworldsend.grandprix

@@ -1,10 +1,10 @@
 
 <supertuxkart_grand_prix name="At World's End">
 
-    <track id="stk_enterprise" laps="3" reverse="false" />
-    <track id="snowmountain"   laps="3" reverse="false" />
     <track id="minigolf"       laps="4" reverse="false" />
-    <track id="xr591"          laps="3" reverse="false" />
+    <track id="black_forest"    laps="3" reverse="false" />
     <track id="mines"          laps="3" reverse="false" />
+    <track id="stk_enterprise" laps="3" reverse="false" />
+    <track id="xr591"          laps="3" reverse="false" />
     
 </supertuxkart_grand_prix>

data/gui/screens/help1.stkgui

@@ -12,7 +12,7 @@
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/gift.png"
                         I18N="Tab in help menu" text="Powerups"/>
                 <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>
@@ -29,13 +29,13 @@
             <box width="80%" height="100%" layout="vertical-row">
 
                 <spacer width="5" height="1%"/>
-                <div width="50%" proportion="2" align="center" layout="horizontal-row">
+                <div width="50%" height="7%" align="center" layout="horizontal-row">
                     <icon id="tutorialIcon" width="64" height="64" align="center" icon="gui/icons/tutorial.png"/>
                     <button id="startTutorial" align="center" text="Start the tutorial"/>
                 </div>
-                <spacer width="5" height="1%"/>
+                <spacer width="5" height="2%"/>
 
-                <div width="100%" proportion="5" layout="horizontal-row">
+                <div width="100%" proportion="4" layout="horizontal-row">
                     <icon align="center" width="64" height="64" icon="gui/icons/gift.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="7" height="100%" word_wrap="true"
@@ -73,7 +73,15 @@
                             text="You can skid by pressing a special key or button. Successive short skids help to take sharp turns; while medium skids will boost your speed, long skids more so. You can't stop turning while skidding, so orient your kart carefully before!"/>
                 </div>
 
-                <spacer height="3%" width="10"/>
+                <div width="100%" proportion="4" layout="horizontal-row">
+                    <icon align="center" width="64" height="64" icon="gui/icons/speed.png"/>
+                    <spacer width="25" height="25"/>
+                    <bubble proportion="2" height="100%" word_wrap="true"
+                            I18N="In the help menu"
+                            text="You can get a startup boost by pressing the accelerate button at 'Set!', before the race's start."/>
+                </div>
+
+                <spacer height="2%" width="10"/>
 
                 <label align="center" word_wrap="true" I18N="in the help screen" text="* Current key bindings can be seen/changed in the Options menu"/>
                 <spacer height="1%" width="10"/>

data/gui/screens/help2.stkgui

@@ -12,7 +12,7 @@
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/gift.png"
                         I18N="Tab in help menu" text="Powerups"/>
                 <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>
@@ -56,7 +56,7 @@
                 </div>
 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/icons/weapons.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/gift.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"

data/gui/screens/help3.stkgui

@@ -12,7 +12,7 @@
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/gift.png"
                         I18N="Tab in help menu" text="Powerups"/>
                 <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>

data/gui/screens/help4.stkgui

@@ -12,7 +12,7 @@
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/gift.png"
                         I18N="Tab in help menu" text="Powerups"/>
                 <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>

data/gui/screens/help5.stkgui

@@ -12,7 +12,7 @@
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/gift.png"
                         I18N="Tab in help menu" text="Powerups"/>
                 <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>

data/gui/screens/help6.stkgui

@@ -12,7 +12,7 @@
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/gift.png"
                         I18N="Tab in help menu" text="Powerups"/>
                 <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>

data/gui/screens/help7.stkgui

@@ -12,7 +12,7 @@
                         I18N="Tab in help menu" text="General"/>
                 <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/gift.png"
                         I18N="Tab in help menu" text="Powerups"/>
                 <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>

data/gui/screens/track_info.stkgui

@@ -81,7 +81,7 @@
                                      wrap_around="true" />
                         </div>
                         <spacer width="3%"/>
-                        <label id="target-type-text" proportion="3" I18N="In the track info screen" text="Soccer game type" text_align="left" />
+                        <label id="target-type-text" proportion="3" I18N="In the track info screen" text_align="left" />
                     </div>
                     <spacer width="1" height="2%"/>
                     <div width="100%" height="fit" layout="horizontal-row" >

data/po/supertuxkart.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-11 09:19+0800\n"
+"POT-Creation-Date: 2019-02-25 10:28+0800\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"
@@ -720,6 +720,7 @@ msgstr ""
 #. I18N: In the server configuration screen
 #. I18N: ./data/gui/screens/online/create_server.stkgui
 #. I18N: In the server creation screen
+#: src/states_screens/track_info_screen.cpp:198
 msgid "Game mode"
 msgstr ""
 
@@ -745,6 +746,7 @@ msgstr ""
 #. I18N: Multiplayer game mode
 #. I18N: ./data/gui/screens/online/create_server.stkgui
 #. I18N: Multiplayer game mode
+#: src/states_screens/race_setup_screen.cpp:111
 msgid "Battle"
 msgstr ""
 
@@ -1287,6 +1289,13 @@ msgid ""
 "carefully before!"
 msgstr ""
 
+#. I18N: ./data/gui/screens/help1.stkgui
+#. I18N: In the help menu
+msgid ""
+"You can get a startup boost by pressing the accelerate button at 'Set!', "
+"before the race's start."
+msgstr ""
+
 #. I18N: ./data/gui/screens/help1.stkgui
 #. I18N: in the help screen
 msgid "* Current key bindings can be seen/changed in the Options menu"
@@ -2127,22 +2136,14 @@ msgstr ""
 
 #. I18N: ./data/gui/screens/track_info.stkgui
 #. I18N: for empty highscores entries
-#: src/states_screens/track_info_screen.cpp:375
+#: src/states_screens/track_info_screen.cpp:405
 msgid "(Empty)"
 msgstr ""
 
-#. I18N: ./data/gui/screens/track_info.stkgui
-#. I18N: In the track info screen
-#. I18N: In the create server screen
-#: src/states_screens/dialogs/server_configuration_dialog.cpp:168
-#: src/states_screens/online/create_server_screen.cpp:190
-msgid "Soccer game type"
-msgstr ""
-
 #. I18N: ./data/gui/screens/track_info.stkgui
 #. I18N: In the track info screen
 #: src/states_screens/online/tracks_screen.cpp:510
-#: src/states_screens/track_info_screen.cpp:196
+#: src/states_screens/track_info_screen.cpp:225
 msgid "Number of laps"
 msgstr ""
 
@@ -2269,6 +2270,10 @@ msgstr ""
 msgid "Battle Island"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/black_forest/track.xml
+msgid "Black Forest"
+msgstr ""
+
 #. I18N: ../stk-assets/tracks/cave/track.xml
 msgid "Cave X"
 msgstr ""
@@ -2356,6 +2361,10 @@ msgstr ""
 msgid "Oliver's Math Class"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/ravenbridge_mansion/track.xml
+msgid "Ravenbridge mansion"
+msgstr ""
+
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
 msgid "Shifting Sands"
 msgstr ""
@@ -3242,8 +3251,9 @@ msgstr ""
 #: src/main.cpp:2128
 #, c-format
 msgid ""
-"Your OpenGL version appears to be too old. Please verify if an update for "
-"your video driver is available. SuperTuxKart requires %s or better."
+"Your graphics driver appears to be very old. Please check if an update is "
+"available. SuperTuxKart recommends a driver supporting %s or better. The "
+"game will likely still run, but in a reduced-graphics mode."
 msgstr ""
 
 #: src/main_loop.cpp:347 src/network/protocols/client_lobby.cpp:91
@@ -3321,11 +3331,11 @@ msgid_plural "%i spare tire karts have been spawned!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modes/world.cpp:1300
+#: src/modes/world.cpp:1301
 msgid "You have been eliminated!"
 msgstr ""
 
-#: src/modes/world.cpp:1307
+#: src/modes/world.cpp:1308
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
@@ -3387,7 +3397,7 @@ msgstr ""
 #: src/network/protocols/client_lobby.cpp:643
 #: src/states_screens/dialogs/server_configuration_dialog.cpp:171
 #: src/states_screens/online/create_server_screen.cpp:194
-#: src/states_screens/track_info_screen.cpp:166
+#: src/states_screens/track_info_screen.cpp:178
 msgid "Time limit"
 msgstr ""
 
@@ -3395,7 +3405,7 @@ msgstr ""
 #: src/network/protocols/client_lobby.cpp:644
 #: src/states_screens/dialogs/server_configuration_dialog.cpp:172
 #: src/states_screens/online/create_server_screen.cpp:196
-#: src/states_screens/track_info_screen.cpp:167
+#: src/states_screens/track_info_screen.cpp:179
 msgid "Goals limit"
 msgstr ""
 
@@ -3511,6 +3521,7 @@ msgstr ""
 #: src/network/server_config.cpp:266 src/race/race_manager.hpp:195
 #: src/states_screens/dialogs/server_configuration_dialog.cpp:158
 #: src/states_screens/online/create_server_screen.cpp:178
+#: src/states_screens/track_info_screen.cpp:201
 msgid "Free-For-All"
 msgstr ""
 
@@ -3527,7 +3538,11 @@ msgstr ""
 msgid "Official"
 msgstr ""
 
-#: src/network/server.cpp:117
+#. I18N: Trusted means this server is trusted by team to not
+#. doing any modification on server side, so players playing
+#. in this server will not meet cheaters, and trusted server
+#. will optionally host a ranked matching game
+#: src/network/server.cpp:122
 msgid "Trusted"
 msgstr ""
 
@@ -3593,7 +3608,7 @@ msgid "Follow the Leader"
 msgstr ""
 
 #. I18N: Game mode
-#: src/race/race_manager.hpp:193
+#: src/race/race_manager.hpp:193 src/states_screens/track_info_screen.cpp:200
 msgid "3 Strikes Battle"
 msgstr ""
 
@@ -4338,7 +4353,7 @@ msgid "Nitro challenge"
 msgstr ""
 
 #: src/states_screens/dialogs/select_challenge.cpp:151
-#: src/states_screens/race_setup_screen.cpp:136
+#: src/states_screens/race_setup_screen.cpp:135
 msgid "Ghost replay race"
 msgstr ""
 
@@ -4348,6 +4363,13 @@ msgstr ""
 msgid "Battle mode"
 msgstr ""
 
+#. I18N: In the create server screen
+#: src/states_screens/dialogs/server_configuration_dialog.cpp:168
+#: src/states_screens/online/create_server_screen.cpp:190
+#: src/states_screens/track_info_screen.cpp:166
+msgid "Soccer game type"
+msgstr ""
+
 #. I18N: In server info dialog, showing the current track playing in
 #. server
 #: src/states_screens/dialogs/server_info_dialog.cpp:100
@@ -4921,27 +4943,28 @@ msgstr ""
 #. I18N: In the track info screen
 #: src/states_screens/online/tracks_screen.cpp:443
 #: src/states_screens/online/tracks_screen.cpp:491
-#: src/states_screens/track_info_screen.cpp:266
+#: src/states_screens/track_info_screen.cpp:296
 msgid "Random item location"
 msgstr ""
 
 #. I18N: In track screen
 #: src/states_screens/online/tracks_screen.cpp:473
-#: src/states_screens/track_info_screen.cpp:177
-#: src/states_screens/track_info_screen.cpp:476
+#: src/states_screens/track_info_screen.cpp:189
+#: src/states_screens/track_info_screen.cpp:517
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: In track screen
 #: src/states_screens/online/tracks_screen.cpp:481
-#: src/states_screens/track_info_screen.cpp:172
-#: src/states_screens/track_info_screen.cpp:471
+#: src/states_screens/track_info_screen.cpp:184
+#: src/states_screens/track_info_screen.cpp:204
+#: src/states_screens/track_info_screen.cpp:512
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: In the track info screen
 #: src/states_screens/online/tracks_screen.cpp:521
-#: src/states_screens/track_info_screen.cpp:261
+#: src/states_screens/track_info_screen.cpp:291
 msgid "Drive in reverse"
 msgstr ""
 
@@ -5405,31 +5428,31 @@ msgstr ""
 msgid "Keep up with the leader kart but don't overtake it!"
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:114
+#: src/states_screens/race_setup_screen.cpp:113
 msgid "Hit others with weapons until they lose all their lives."
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:119
+#: src/states_screens/race_setup_screen.cpp:118
 msgid "Push the ball into the opposite cage to score goals."
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:129
+#: src/states_screens/race_setup_screen.cpp:128
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/states_screens/race_setup_screen.cpp:137
+#: src/states_screens/race_setup_screen.cpp:136
 msgid "Race against ghost karts and try to beat them!"
 msgstr ""
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
-#: src/states_screens/track_info_screen.cpp:118
+#: src/states_screens/track_info_screen.cpp:129
 #, c-format
 msgid "Track by %s"
 msgstr ""
 
 #. I18N: the max players supported by an arena.
-#: src/states_screens/track_info_screen.cpp:126
+#: src/states_screens/track_info_screen.cpp:137
 #, c-format
 msgid "Max players supported: %d"
 msgstr ""