First attempt at animating the sun, doesn't work yet

2015-12-17 19:15:46 -05:00
545 changed files with 141992 additions and 84235 deletions
@@ -3,51 +3,50 @@
 # Configuration manual:
 # http://docs.travis-ci.com/user/build-configuration/
 #
-sudo: false
 language: cpp
 compiler:
  - gcc
-  - clang
-
-matrix:
-  fast_finish: true
-
-env:
-  matrix:
-    - BUILD_TYPE="Debug"
-    - BUILD_TYPE="Release"
-
-addons:
-  apt:
-    packages:
-    - build-essential
-    - libogg-dev
-    - libvorbis-dev
-    - libopenal-dev
-    - libxxf86vm-dev
-    - libcurl4-openssl-dev
-    - libfribidi-dev
-    - libbluetooth-dev
-    - libgl1-mesa-dev
-    - libglu1-mesa-dev
-    - libglew-dev
-    - cmake
+# - clang
+#branches:
+#  only:
+#    - master
+before_install:
+  # Update repos
+  - sudo apt-get update -qq
+  # Install dependencies
+  - sudo apt-get install build-essential libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
+  # Install mesa from an other repo (a newer version is required). Quantal is not supported anymore, saucy is only supported till July 2014,
+  # so we try to use trusty (precise which is what traiv uses a too old mesa version which doesn't link)
+  - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted"
+  - sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32
+  - sudo apt-get update -qq
+  - sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev libglew-dev cmake

 before_script:
-  - export THREADS=$((`nproc` + 1))
+  - export THREADS=`nproc`
+  # Unfortunately using all threads crashes g++: "g++: internal compiler error: Killed (program cc1plus)"
+  - export THREADS=4
  - echo "THREADS = $THREADS"
-  - free -mt

 script:
-  - mkdir "build"
-  - cd "build"
-  - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCHECK_ASSETS=off
+  
+  # First a debug build: 
+  - mkdir build-debug
+  - cd build-debug
+  - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off
+  - make VERBOSE=1 -j $THREADS
+
+  # Then a release build: 
+  - cd ..
+  - mkdir build-release
+  - cd build-release
+  - cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off
  - make VERBOSE=1 -j $THREADS

 notifications:
  irc:
    channels:
-      - "irc.freenode.org#supertuxkart"
+      - "irc.freenode.org#stk"
    skip_join: false
    use_notice: true
    template:
@@ -1,19 +1,4 @@
-## SuperTuxKart 0.9.2
-* Ghost replay races by Benau
-* Battle mode AI by Benau
-* Soccer mode AI by Benau
-* New icy soccer field by samuncle and Benau
-* New subsea track by samuncle
-* New volcano track by Ponzino
-* TTF font rendering by Benau
-* Kart properties refactor by Flakebi
-* Scripting work under the hood
-* Work on the track editor by mhp
-* Tweak to challenges
-* New farm track song by 0zone0ne and Krobonil
-* Bugfixes
-
-## SuperTuxKart 0.9.1
+## SupertTuxKart 0.9.1
 * Many bug fixes
 * Started to use scripting in tracks
 * Significant audio performance improvements
@@ -1,6 +1,6 @@
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
-set(PROJECT_VERSION "0.9.2")
+set(PROJECT_VERSION "0.9.1")

 cmake_minimum_required(VERSION 2.8.4)
 if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
@@ -68,7 +68,6 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
 include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")

 # Build glew library
-add_definitions(-DGLEW_NO_GLU)
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
 include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")

@@ -118,8 +117,8 @@ endif()
 include_directories(${STK_SOURCE_DIR})

 if(APPLE)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch x86_64")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -F/Library/Frameworks")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch i386")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch i386 -F/Library/Frameworks")
 elseif(MSVC)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")   # Enable multi-processor compilation (faster)
 endif()
@@ -216,7 +215,7 @@ endif()
 # Set some compiler options
 if(UNIX OR MINGW)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 endif()

 if(MINGW AND CMAKE_BUILD_TYPE MATCHES Release)
@@ -259,7 +258,7 @@ endif()
 add_definitions(-DHAVE_OGGVORBIS)

 if(WIN32)
-    configure_file("${STK_SOURCE_DIR}/../tools/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
+    configure_file("${STK_SOURCE_DIR}/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
 endif()

 # Provides list of source and header files (STK_SOURCES and STK_HEADERS)
@@ -366,17 +365,12 @@ if(UNIX AND NOT APPLE)
    endif()
 endif()

-# FreeBSD does not search in /usr/local/lib, but at least Freetype is installed there :(
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
-endif()
-
 if(APPLE)
    # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
    # unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :
    # the mac I use to make STK releases does have other installs of vorbis/ogg/etc. which aren't compatible with STK, so letting
    # CMake pick the library it wants essentially means I can't build.
-    set_target_properties(supertuxkart PROPERTIES LINK_FLAGS "-arch x86_64 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
+    set_target_properties(supertuxkart PROPERTIES LINK_FLAGS "-arch i386 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/Library/Frameworks/OpenAL.framework/Versions/A/Headers")
 endif()

@@ -1,7 +1,6 @@
 # SuperTuxKart Installation Instructions

-Note: If you obtained this source code from Github, you also need to download 
-the game assets from Sourceforge using SVN.
+Note: If you obtained this source code from Github, you also need to download the game assets from Sourceforge using SVN.

 `svn checkout https://svn.code.sf.net/p/supertuxkart/code/stk-assets stk-assets`

@@ -17,7 +16,6 @@ First, make sure that you have the following packages installed:
  * OpenAL (recommended: openal-soft-devel)
  * Ogg    (libogg-dev)
  * Vorbis (libvorbis-dev)
-  * Freetype (libfreetype6-dev)
  * libcurl (libcurl-devel)
  * libbluetooth (bluez-devel)
  * libpng (libpng-devel)
@@ -27,10 +25,8 @@ First, make sure that you have the following packages installed:
 Ubuntu command:

 ```
-sudo apt-get install build-essential cmake libbluetooth-dev \
-libcurl4-gnutls-dev libfreetype6-dev libfribidi-dev libgl1-mesa-dev \
-libjpeg-dev libogg-dev libopenal-dev libpng-dev libvorbis-dev libxrandr-dev \
-mesa-common-dev pkg-config zlib1g-dev
+sudo apt-get install autoconf automake build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev \
+libgl1-mesa-dev libglu1-mesa-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev libxrandr-dev
 ```
  
 Unpack the files from the tarball like this:
@@ -41,6 +41,8 @@ this has been done (check with the forum for details).
 ### Mac OS X
 The latest information about compilation on Mac are on our wiki:
 <http://supertuxkart.sourceforge.net/Building_and_packaging_on_OSX>
+The Xcode project file is in `/src/ide/Xcode/`, but it still 
+requires that all dependencies are installed as explained on the wiki.

 ### UNIX
 See [`INSTALL.md`](INSTALL.md) for details.
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.2-rc1</string>
+	<string>0.8.1</string>
 	<key>CFBundleSignature</key>
 	<string>SPTK</string>
 	<key>CFBundleVersion</key>
-	<string>0.9.2-rc1</string>
+	<string>0.8.1</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>
@@ -2,7 +2,7 @@
 <challenge version="2">
    <track id="cocoa_temple" laps="3"/>
    <mode major="single" minor="quickrace"/>
-    <requirements trophies="5"/>
+    <requirements trophies="15"/>
    
    <hard>
        <karts number="5"/>
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="abyss" laps="3"/>
+    <track id="subsea" laps="2"/>
    <mode major="single" minor="quickrace"/>
    <requirements trophies="0"/>
    
    <hard>
        <karts number="5"/>
-        <requirements position="1" time="160"/>
+        <requirements position="1" time="205"/>
    </hard>
    <medium>
        <karts number="4"/>
-        <requirements time="185"/>
+        <requirements time="225"/>
    </medium>
    <easy>
        <karts number="4"/>
-        <requirements time="270"/>
+        <requirements time="290"/>
    </easy>
 </challenge>
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="volcano_island" laps="2"/>
-    <mode major="single" minor="quickrace"/>
-    <requirements trophies="15"/>
-    
-    <hard>
-        <karts number="5"/>
-        <requirements position="1"/>
-    </hard>
-    <medium>
-        <karts number="4"/>
-        <requirements position="1"/>
-    </medium>
-    <easy>
-        <karts number="4"/>
-        <requirements position="1"/>
-    </easy>
-</challenge>
@@ -4,7 +4,7 @@
    <track id="sandtrack"    laps="3" reverse="false" />
    <track id="farm"         laps="3" reverse="false" />
    <track id="olivermath"   laps="4" reverse="false" />
-    <track id="abyss"        laps="3" reverse="false" />
+    <track id="subsea"       laps="2" reverse="false" />
    <track id="scotland"     laps="3" reverse="false" /> 
 
 </supertuxkart_grand_prix>
@@ -5,7 +5,7 @@
    <track id="greenvalley"          laps="2" reverse="false" />
    <track id="mansion"              laps="3" reverse="false" />
    <track id="stk_enterprise"       laps="3" reverse="false" />
-    <track id="volcano_island"       laps="2" reverse="false" />
+    <track id="city"                 laps="2" reverse="false" />
    
 </supertuxkart_grand_prix>

@@ -4,24 +4,20 @@
  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="AdvancedPipeline"/>
  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="FramebufferSRGBWorking"/>
  <card contains="Intel"          os="osx"                         disable="GI"/>
-  <card contains="Intel"          os="linux"    version="<11.2"    disable="ComputeShader"/>
-  <card contains="Intel"          os="linux"    version="<11.2"    disable="GeometryShader"/>
-  <card contains="Intel"          os="linux"    version="<16.0"    disable="FramebufferSRGBCapable"/>
-  <card contains="Intel"          os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
-  <card contains="Intel"          os="windows"                     disable="TextureCompressionS3TC"/>
-  <card contains="Intel"          os="osx"                         disable="TextureCompressionS3TC"/>
+  <card contains="Intel"          os="linux"    version="<12.0"    disable="FramebufferSRGBCapable"/>
+  <card contains="Intel"                                           disable="TextureCompressionS3TC"/>
  <card contains="Intel"          os="windows"                     disable="HighDefinitionTextures"/>
  <card contains="NVIDIA"         os="windows"  version="<344.65"  disable="BufferStorage"/>
  <card contains="NVIDIA"         os="linux"    version="<343.22"  disable="BufferStorage"/>
  <card contains="NVIDIA"                                          disable="ShaderAtomicCounters"/>
  <card contains="Mesa"           os="linux"    version="<10.3"    disable="BufferStorage"/>
  <card contains="Mesa"           os="linux"    version="<10.3"    disable="DriverRecentEnough"/>
-  <card contains="Mesa"           os="linux"    version="<11.2"    disable="GeometryShader"/>
-  <card contains="Mesa"           os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
+  <card contains="Mesa"           os="linux"    version="<10.6"    disable="GeometryShader4"/>
+  <card contains="Mesa"           os="linux"                       disable="TextureCompressionS3TC"/>
  <card contains="Gallium"        os="linux"    version="<10.3"    disable="BufferStorage"/>
  <card contains="Gallium"        os="linux"    version="<10.3"    disable="DriverRecentEnough"/>
-  <card contains="Gallium"        os="linux"    version="<11.2"    disable="GeometryShader"/>
-  <card contains="Gallium"        os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
+  <card contains="Gallium"        os="linux"    version="<10.6"    disable="GeometryShader4"/>
+  <card contains="Gallium"        os="linux"                       disable="TextureCompressionS3TC"/>
  <!-- On osx radeon appears to have different version numbers, e.g.
       1.32.20 -->
  <card contains="Radeon"         os="linux"    version="<14.300"  disable="DriverRecentEnough"/>
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row">
-        <div x="5%" y="0%" width="90%" proportion="6" layout="horizontal-row">
-            <div width="40%" height="100%" layout="vertical-row">
-                <icon id="icon" align="center" width="100%" icon="gui/loading.png" />
-            </div>
-            <div width="60%" height="50%" layout="vertical-row">
-                <label id="name" width="100%" text_align="left"/>
-            </div>
-        </div>
-
-        <div width="90%" align="center" layout="vertical-row" height="fit">
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <checkbox width="fit" id="record-race" I18N="Ghost replay info action" text_align="left"/>
-                <spacer width="10"/>
-                <label proportion="1" id="record-race-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Record the race for ghost replay"/>
-            </div>
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <checkbox width="fit" id="watch-only" I18N="Ghost replay info action" text_align="left"/>
-                <spacer width="10"/>
-                <label proportion="1" id="watch-only-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Watch replay only"/>
-            </div>
-        </div>
-
-        <div width="80%" proportion="5" align="center">
-            <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
-                <icon-button id="start" width="128" height="128"
-                             icon="gui/green_check.png"
-                             I18N="Ghost replay info screen action" text="Start Race" />
-                <icon-button id="remove" width="128" height="128"
-                             icon="gui/remove.png"
-                             I18N="Ghost replay info action" text="Remove" />
-                <icon-button id="back" width="128" height="128"
-                             icon="gui/back.png"
-                             I18N="Ghost replay info action" text="Back" />
-            </buttonbar>
-        </div>
-    </div>
-</stkgui>
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <div x="0%" y="1%" width="100%" height="98%" layout="vertical-row" >
-
-        <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
-            <icon-button id="back" height="100%" icon="gui/back.png"/>
-            <header text_align="center" proportion="1" I18N="In the ghost replay selection screen" text="Ghost Replay Selection" align="center"/>
-            <icon-button id="reload" height="90%" icon="gui/restart.png"/>
-        </div>
-
-        <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
-            <list id="replay_list" x="0" y="0" width="100%" height="100%"/>
-        </box>
-
-        <div width="99%" align="center" layout="vertical-row" height="fit">
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <checkbox width="fit" id="replay_difficulty_toggle" text_align="left"/>
-                <spacer width="10"/>
-                <label proportion="1" height="100%" text_align="left" I18N="In the ghost replay selection screen" text="Only show replays matching the current difficulty"/>
-            </div>
-        </div>
-        <spacer width="100%" height="1%" />
-        <button x="1%" id="record-ghost" I18N="In the ghost replay selection screen" text="Record ghost replay"/>
-
-    </div>
-</stkgui>
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <spacer proportion="1"/>
-        <button id="save"     width="450" align="center" text="Save Grand Prix"/>
-        <spacer height="20"/>
-        <button id="continue" width="450" align="center" text="Continue"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
+        <button id="continue" width="250" align="bottom" text="Continue"/>
+        <spacer width="20"/>
+        <button id="save"     width="250" align="bottom" text="Save Grand Prix"/>
    </div>
 </stkgui>
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <spacer proportion="1"/>
-        <button id="save"     width="450" align="center" text="Save Grand Prix"/>
-        <spacer height="20"/>
-        <button id="continue" width="450" align="center" text="Continue"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
+        <button id="continue" width="250" align="bottom" text="Continue"/>
+        <spacer width="20"/>
+        <button id="save"     width="250" align="bottom" text="Save Grand Prix"/>
    </div>
 </stkgui>

@@ -17,42 +17,6 @@
                        <label proportion="1" text_align="left" I18N="In the server creation screen" text="Max. number of players"/>
                        <gauge id="max_players" proportion="1" min_value="2" max_value="12"/>
                    </div>
-                    
-                    <spacer height="20" width="20"/>
-
-                    <div width="100%" height="fit" layout="horizontal-row" >
-                        <label proportion="1" text_align="left" I18N="In the server creation screen" text="Password (optional)"/>
-                        <textbox proportion="1" id="password" I18N="In the server creation screen"/>
-                    </div>
-                    
-                    <spacer height="20" width="20"/>
-                    
-                    <label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Difficulty"/>
-                        <!--<gauge id="difficulty" proportion="1" min_value="1" max_value="4"/>-->
-                    <ribbon id="difficulty" height="135" width="90%" align="center">
-                        <icon-button id="novice" width="128" height="128" icon="gui/difficulty_easy.png"
-                                I18N="Difficulty" text="Novice"/>
-                        <icon-button id="intermediate" width="128" height="128" icon="gui/difficulty_medium.png"
-                                I18N="Difficulty" text="Intermediate"/>
-                        <icon-button id="expert" width="128" height="128" icon="gui/difficulty_hard.png"
-                                I18N="Difficulty"  text="Expert"/>
-                        <icon-button id="best" width="128" height="128" icon="gui/difficulty_best.png"
-                                I18N="Difficulty"  text="SuperTux"/>
-                    </ribbon>
-                    
-                    <spacer height="20" width="20"/>
-                    
-                    <label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Game mode"/>
-                    <ribbon id="gamemode" height="135" width="50%" align="center">
-                        <icon-button id="normal" width="128" height="128" icon="gui/mode_normal.png"
-                                I18N="Multiplayer game mode" text="Normal Race"/>
-                        <icon-button id="timetrial" width="128" height="128" icon="gui/mode_tt.png"
-                                I18N="Multiplayer game mode" text="Time Trial"/>
-                    </ribbon>
-                    <!--
-                    <scrollable_toolbar id="gamemode" height="135" width="90%" label_location="bottom" align="center"
-                            child_width="135" child_height="135" />
-                    -->
                </div>

                <label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>
@@ -10,14 +10,6 @@
                        <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>
-                    <div width="100%" height="fit" layout="horizontal-row" >
-                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Difficulty:"/>
-                        <label proportion="2" text_align="left" id="server_difficulty" text=""/>
-                    </div>
-                    <div width="100%" height="fit" layout="horizontal-row" >
-                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Game mode:"/>
-                        <label proportion="2" text_align="left" id="server_game_mode" text=""/>
-                    </div>
                </box>
                <spacer width="20" height="20"/>
                <box proportion="1" height="100%" layout="vertical-row">
@@ -33,11 +25,7 @@
                </box>
                <spacer width="20" height="20"/>
                <box id="actions" proportion="1" height="100%" layout="vertical-row">
-<!--                    <label I18N="In networking lobby" word_wrap="true" text="actions" align="center" text-align="center"/>
-->
-                  <icon-button id="start" width="64" height="64" icon="gui/green_check.png" align="center"
-                      I18N="In the network lobby" text="Start Race"/>
-
+                    <label I18N="In networking lobby" word_wrap="true" text="actions" align="center" text-align="center"/>
                </box>
            </div>
        </div>
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="0" y="0" width="100%" height="fit" layout="vertical-row">
+        <button id="user-id" width="20%" height="fit" align="right"/>
+    </div>
+    
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
+
+        <header text_align="center" width="80%" align="center" I18N="In the online multiplayer screen" text="Online Multiplayer"/>
+
+        <spacer height="5%" width="25"/>
+        <box width="100%" height="38%" padding="10" layout="vertical-row">
+            <bright width="100%" text="Local Networking" align="center" text_align="left" />
+
+            <buttonbar  id="lan" proportion="2" width="90%" align="center">
+                <icon-button id="find_lan_server" width="128" height="128"
+                             icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
+                             I18N="In the online multiplayer screen" text="Find Server"/>
+                <icon-button id="create_lan_server" width="128" height="128"
+                             icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
+                             I18N="In the online multiplayer screen" text="Create Server"/>
+                <icon-button id="manage_user" width="128" height="128"
+                             icon="gui/options_players.png"
+                             I18N="In the online multiplayer screen" text="Users"/>
+            </buttonbar>
+        </box>
+
+        <spacer height="5%" width="25"/>
+
+        <box width="100%" height="38%" padding="10" layout="vertical-row">
+            <bright width="100%" text="Global Networking" align="center" text_align="left" />
+
+            <buttonbar id="menu_top_row" proportion="2" width="90%" align="center">
+                <icon-button id="find_wan_server" width="128" height="128"
+                             icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
+                             I18N="In the online multiplayer screen" text="Find Server"/>
+                <icon-button id="create_wan_server" width="128" height="128"
+                             icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
+                             I18N="In the online multiplayer screen" text="Create Server"/>
+                <icon-button id="quick_wan_play" width="128" height="128"
+                             icon="gui/online/menu_quick_play.png" focus_icon="gui/online/menu_quick_play_hover.png"
+                             I18N="In the online multiplayer screen" text="Quick Play"/>
+            </buttonbar>
+        </box>
+
+        <bottombar x="2%" width="96%" height="10%" layout="horizontal-row">
+            <label text_align="left" align="center" height="100%" id="online_status" proportion="1" text=""/>
+
+            <spacer width="10" height="10" />
+
+            <buttonbar id="menu_bottomrow" x="0" y="0" width="12%" height="100%" align="center">
+                <icon-button id="profile" width="64" height="64" icon="gui/green_check.png"  extend_label="50"
+                             I18N="In the online multiplayer screen" text="Profile" label_location="hover"/>
+                <icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png"  extend_label="70"
+                             I18N="In the online multiplayer screen" text="Log Out" label_location="hover"/>
+            </buttonbar>
+
+        </bottombar>
+
+    </div>
+
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+</stkgui>
@@ -9,9 +9,6 @@
        <spacer height="25" width="10"/>

        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <!--
-            <icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>
-            -->
            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"
                I18N="Section in the profile screen" text="Achievements"/>
            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"/>
@@ -9,7 +9,6 @@
        <spacer height="25" width="10"/>

        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <!--<icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>-->
            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"
                I18N="Section in the profile screen" text="Friends"/>
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
-    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-        <header id="title" text_align="center" width="80%" align="center" text="..."/>
-
-        <spacer height="25" width="10"/>
-
-        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png" I18N="Section in the profile screen" text="Servers"/>
-            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
-            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
-            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png" />
-        </tabs>
-
-        <box proportion="1" width="100%" layout="vertical-row">
-            <div x="1%" y="2%" width="98%" height="96%" layout="vertical-row" >
-                
-                <spacer height="5%" width="25"/>
-                
-                <box width="100%" proportion="1" padding="10" layout="vertical-row">
-                    <bright width="100%" text="Local Networking" align="center" text_align="left" />
-
-                    <buttonbar id="lan" proportion="2" width="90%" align="center">
-                        <icon-button id="find_lan_server" width="128" height="128"
-                                     icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
-                                     I18N="In the online multiplayer screen" text="Find Server"/>
-                        <icon-button id="create_lan_server" width="128" height="128"
-                                     icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
-                                     I18N="In the online multiplayer screen" text="Create Server"/>
-                                     <!--
-                        <icon-button id="manage_user" width="128" height="128"
-                                     icon="gui/options_players.png"
-                                     I18N="In the online multiplayer screen" text="Users"/>
-                                     -->
-                    </buttonbar>
-                </box>
-
-                <spacer height="5%" width="25"/>
-
-                <box width="100%" proportion="1" padding="10" layout="vertical-row">
-                    <bright width="100%" text="Global Networking" align="center" text_align="left" />
-
-                    <buttonbar id="wan" proportion="2" width="90%" align="center">
-                        <icon-button id="find_wan_server" width="128" height="128"
-                                     icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
-                                     I18N="In the online multiplayer screen" text="Find Server"/>
-                        <icon-button id="create_wan_server" width="128" height="128"
-                                     icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
-                                     I18N="In the online multiplayer screen" text="Create Server"/>
-                        <icon-button id="quick_wan_play" width="128" height="128"
-                                     icon="gui/online/menu_quick_play.png" focus_icon="gui/online/menu_quick_play_hover.png"
-                                     I18N="In the online multiplayer screen" text="Quick Play"/>
-                    </buttonbar>
-                </box>
-
-            </div>
-        </box>
-    </div>
-</stkgui>
@@ -8,7 +8,6 @@
        <spacer height="25" width="10"/>

        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <!--<icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>-->
            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"
@@ -8,24 +8,10 @@
       <spacer height="20" width="50"/>

        <div width="80%" align="center" layout="vertical-row" height="fit" >
-            <!--
            <div width="100%" height="fit" layout="horizontal-row" >
                <label proportion="1" text_align="left" I18N="In the server info dialog" text="Name"/>
                <label id="name" proportion="2" text_align="left" text=""/>
            </div>
-            -->
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <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>
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <label proportion="1" text_align="left" I18N="In the networking lobby" text="Difficulty:"/>
-                <label proportion="2" text_align="left" id="server_difficulty" text=""/>
-            </div>
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <label proportion="1" text_align="left" I18N="In the networking lobby" text="Game mode:"/>
-                <label proportion="2" text_align="left" id="server_game_mode" text=""/>
-            </div>
        </div>

        <spacer height="20" width="50"/>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
-
-        <header id="title" width="96%" height="fit" text_align="center" I18N="Networking screen" text="Waiting for the others..."/>
-
-        <spacer height="40" width="50"/>
-
-        <label proportion="1" width="100%" text_align="left" id="lblDetails"/>
-    </div>
-</stkgui>
@@ -6,39 +6,38 @@

        <header width="80%" text="Race Setup" align="center" text_align="center" />

-        <spacer height="10" width="25"/>
+        <spacer height="25" width="25"/>

        <div layout="horizontal-row" width="fit" height="35" align="left">
            <bright proportion="1" height="100%"
                    I18N="In soccer setup screen" text="Number of goals to win" text_align="left" />
-            <spacer width="10" height="25"/>
+            <spacer width="50" height="25"/>
            <spinner id="goalamount" width="200" height="90%" min_value="1" max_value="10"/>
        </div>

        <div layout="horizontal-row" width="fit" height="35" align="left">
            <bright proportion="1" height="100%"
                    I18N="In soccer setup screen" text="Maximum time (min.)" text_align="left" />
-            <spacer width="10" height ="25"/>
+            <spacer width="50" height ="25"/>
            <spinner id="timeamount" width="200" height="90%" min_value="1" max_value="15"/>
        </div>

        <div layout="horizontal-row" width="fit" height="35" align="left">
            <bright proportion="1" height="100%"
                    I18N="In soccer setup screen" text="Game type (Goals limit / Time limit)" text_align="left" />
-            <spacer width="10" height="25"/>
+            <spacer width="50" height="25"/>
            <checkbox id="time_enabled"/>
        </div>

-        <spacer height="10" width="25"/>
+        <spacer height="40" width="25"/>

-        <bubble height="fit" width="100%" id="lblLeftRight" I18N="In soccer setup screen" text="Use left/right to choose your team and press fire" word_wrap="true" text_align="center"/>
+        <bright height="15" width="25" I18N="In soccer setup screen" text="Use left/right to choose your team and press fire" text_align="center" align="center" />

        <div id="central_div" layout="horizontal-row" width="100%" proportion="1" align="center">
-            <roundedbox y="5%" width="100%" layout="horizontal-row" height="95%">
+            <roundedbox y="5%" width="100%" layout="horizontal-row" height="100%">
                <!-- Content is added programmatically -->
            </roundedbox>
-            <icon id="red_team" I18N="In soccer setup screen" text="Red Team" icon="gui/soccer_ball_red.png" width="font" height="font"/>  <!-- Layout is done programmatically -->
-            <icon id="blue_team" I18N="In soccer setup screen" text="Blue Team" icon="gui/soccer_ball_blue.png" width="font" height="font"/>
+            <header id="vs" text="VS"/>     <!-- Layout is done programmatically -->
        </div>

        <button id="continue" I18N="In soccer setup screen" text="Continue" align="center" width="60%"/>
@@ -3,9 +3,9 @@
    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>

    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <header id="name" height="7%" width="80%" align="center" text_align="center"/>
+        <header id="name" height="5%" width="80%" align="center" text_align="center"/>

-        <spacer width="1" height="1%"/>
+        <spacer width="1" height="5%"/>

        <box width="100%" height="40%" padding="10" layout="horizontal-row">
            <!-- Left pane -->
@@ -40,17 +40,14 @@
                    <label id="highscore3" proportion="1" text="(Empty)"/>
                </div>

-                <spacer width="1" height="2%"/>
+                <spacer width="1" height="10%"/>

                <label id="author" width="100%" text_align="center" word_wrap="true"/>
-
-                <spacer width="1" height="10%"/>
-                <label id="max-arena-players" width="100%" text_align="center" word_wrap="true"/>
            </div>

        </box>
-        <spacer width="1" height="1%"/>
-        <box width="100%" height="33%" padding="15" layout="vertical-row">
+        <spacer width="1" height="5%"/>
+        <box width="100%" height="25%" padding="15" layout="vertical-row">
            <div width="100%" height="fit" layout="horizontal-row" >
                <label id="lap-text" proportion="1" I18N="In the track info screen" text="Number of laps" text_align="right"/>
                <spacer width="40"/>
@@ -70,26 +67,17 @@
            </div>
            <spacer height="10"/>
            <div width="100%" height="fit" layout="horizontal-row" >
-                <label id="option-text" proportion="1" I18N="In the track info screen" text_align="right"/>
+                <label id="reverse-text" proportion="1" I18N="In the track info screen" text="Drive in reverse" text_align="right"/>
                <spacer width="40"/>
                <div proportion="1" height="fit" layout="horizontal-row">
                    <div width="50%" height="fit" text-align="center" layout="vertical-row" >
-                        <checkbox id="option" align="center"/>
+                        <checkbox id="reverse" align="center"/>
                    </div>
                </div>
            </div>
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <label id="record-race-text" proportion="1" I18N="In the track info screen" text="Record the race for ghost replay" text_align="right"/>
-                <spacer width="40"/>
-                <div proportion="1" height="fit" layout="horizontal-row">
-                    <div width="50%" height="fit" text-align="center" layout="vertical-row" >
-                        <checkbox id="record" align="center"/>
-                    </div>
-                </div>
-            </div>
-            <spacer width="1" height="1%"/>
+            <spacer width="1" height="2%"/>
        </box>
-        <spacer width="1" height="1%"/>
+        <spacer width="1" height="5%"/>
        <buttonbar id="buttons" height="15%" width="100%" align="center">
            <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
                    I18N="In the track info screen" text="Start Race"/>
@@ -3,7 +3,16 @@
    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>

    <div x="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
-        <header width="80%" I18N="In the track selection screen" text="All Tracks"
+
+        <header width="80%" I18N="In the track selection screen" text="Grand Prix"
+                align="center" text_align="center" />
+
+        <box width="100%" height="195" padding="0">
+            <scrollable_toolbar id="gps" height="175" y="10" x="10" width="98%" align="center" label_location="each"
+                                square_items="true" child_width="175" child_height="120" />
+        </box>
+
+        <header width="100%" I18N="In the track selection screen" text="All Tracks"
                align="center" text_align="center" />

        <box proportion="1" width="100%" layout="vertical-row" padding="1">
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
-    <div x="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
-
-        <header width="80%" I18N="In the track and grand prix selection screen" text="Grand Prix"
-                align="center" text_align="center" />
-
-        <box width="100%" height="195" padding="0">
-            <scrollable_toolbar id="gps" height="175" y="10" x="10" width="98%" align="center" label_location="each"
-                                square_items="true" child_width="175" child_height="120" />
-        </box>
-
-        <header width="100%" I18N="In the track and grand prix selection screen" text="All Tracks"
-                align="center" text_align="center" />
-
-        <box proportion="1" width="100%" layout="vertical-row" padding="1">
-            <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
-                label_location="bottom" align="center" max_rows="4"
-                child_width="160" child_height="120" />
-            <spacer width="20" height="13" />
-        </box>
-
-        <!-- Populated dynamically at runtime -->
-        <tabs width="100%" height="25" id="trackgroups"> </tabs>
-
-        <spacer width="100%" height="2%" />
-    </div>
-</stkgui>
@@ -13,7 +13,7 @@
                               square_items="true" child_width="128" child_height="128" />

            <spacer height="15" width="10"/>
-            <div width="90%" align="center" layout="vertical-row" proportion="1">
+            <div width="90%" align="center" layout="vertical-row" height="fit">
                <div width="100%" height="fit" layout="horizontal-row" >
                    <checkbox width="fit" id="online" I18N="In the user screen" text_align="left"/>
                    <spacer width="10"/>
@@ -44,29 +44,23 @@
                           I18N="In the user screen" text="Password"/>
                    <textbox id="password" proportion="2" height="fit" I18N="In the user screen"/>
                </div>
-                
-                <spacer height="20" width="20"/>
-                
-                <label id="message" width="100%" text_align="center"/>
            </div>
-            
-			<spacer width="20" proportion="1"/>
-			
-			<div width="90%" align="center" layout="vertical-row" height="fit">
-				<buttonbar id="options" width="100%" height="80" align="center">
-					<icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
-								 I18N="In the user screen" text="OK" label_location="bottom"/>
-					<icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
-								 I18N="In the user screen" text="Add user" label_location="bottom"/>
-					<icon-button id="delete" width="64" height="64" icon="gui/remove.png"
-								 I18N="In the user screen" text="Delete" label_location="bottom"/>
-					<icon-button id="rename" width="64" height="64" icon="gui/rename.png"
-								 I18N="In the user screen" text="Rename" label_location="bottom"/>
-					<icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-								 I18N="In the user screen" text="Cancel" label_location="bottom"/>
-				</buttonbar>
-			</div>
-			<spacer width="20" height="25"/>
+            <div width="80%" align="center" layout="vertical-row" height="fit">
+                <label id="message" width="80%" align="center" text_align="left"/>
+            </div>
+            <spacer width="20" height="25"/>
+            <buttonbar id="options" width="90%" height="13%" align="bottom">
+                <icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
+                             I18N="In the user screen" text="OK" label_location="bottom"/>
+                <icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
+                             I18N="In the user screen" text="Add user" label_location="bottom"/>
+                <icon-button id="delete" width="64" height="64" icon="gui/remove.png"
+                             I18N="In the user screen" text="Delete" label_location="bottom"/>
+                <icon-button id="rename" width="64" height="64" icon="gui/rename.png"
+                             I18N="In the user screen" text="Rename" label_location="bottom"/>
+                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+                             I18N="In the user screen" text="Cancel" label_location="bottom"/>
+            </buttonbar>
        </box>
        <spacer width="20" height="15"/>
    </div>
@@ -187,7 +187,7 @@
            max: maximum leaning (i.e. when steering as much as possible at highest
                speed), in degrees.
            speed: Speed with which the leaning changes (in degree/second). -->
-        <lean max="6.6" speed="15.0" />
+        <lean max="8.6" speed="5.0" />


        <!-- ********** Items ********** -->
@@ -1,231 +0,0 @@
-aa=ʿAfár af
-af=Afrikaans
-af_ZA=0
-am=ኣማርኛ
-ar=العربية
-ar_AR=0
-ar_OM=0
-ar_SA=0
-ar_SY=0
-ar_TN=0
-as=অসমীয়া
-ast=Asturianu
-ay=aymar aru
-az=Azərbaycanca
-az_IR=0
-be=Беларуская мова
-bg=български
-bg_BG=0
-bn=বাংলা
-bn_BD=0
-bn_IN=0
-bo=བོད་སྐད་
-br=brezhoneg
-bs=Bosanski
-bs_BA=0
-bs_BS=0
-ca_ES=0
-ca=0
-cmn=0
-co=corsu
-cs=Čeština
-cs_CZ=Čeština (Česká Republika)
-cy=Welsh
-cy_GB=Welsh (Great Britain)
-cz=Unknown language
-da=Dansk
-da_DK=Dansk (Danmark)
-de=Deutsch
-de_AT=Deutsch (Österreich)
-de_CH=Deutsch (Schweiz)
-de_DE=Deutsch (Deutschland)
-dk=Unknown language
-dz=རྫོང་ཁ
-el=ελληνικά
-el_GR=0
-en=English
-en_AU=English (Australia)
-en_CA=English (Canada)
-en_GB=English (Great Britain)
-en_US=English (United States)
-en_ZA=English (South Africa)
-en_US=English
-eo=Esperanto
-es=Español
-es_AR=0
-es_CL=0
-es_CO=0
-es_CR=0
-es_DO=0
-es_EC=0
-es_ES=0
-es_GT=0
-es_HN=0
-es_LA=0
-es_MX=0
-es_NI=0
-es_PA=0
-es_PE=0
-es_PR=0
-es_SV=0
-es_UY=0
-es_VE=0
-et=eesti keel
-et_EE=0
-et_ET=0
-eu=euskara
-eu_ES=0
-fa=فارسى
-fa_AF=0
-fa_IR=0
-fi=suomi
-fi_FI=0
-fo=Føroyskt
-fo_FO=0
-fr=Français
-fr_CA=Français (Canada)
-fr_CH=Français (Suisse)
-fr_FR=Français (France)
-fr_LU=Français (Luxembourg)
-fy=Frysk
-ga=Gaeilge
-gd=Gàidhlig
-gl=Galego
-gl_ES=0
-gn=Avañe'ẽ
-gu=ગુજરાતી
-gv=Gaelg
-ha=حَوْسَ
-he=עברית
-he_IL=0
-hi=हिन्दी
-hr=Hrvatski
-hr_HR=0
-hu=magyar
-hu_HU=0
-hy=Հայերեն
-ia=Interlingua
-id=Bahasa Indonesia
-id_ID=0
-is=Íslenska
-is_IS=0
-it=Italiano
-it_CH=0
-it_IT=0
-iu=ᐃᓄᒃᑎᑐᑦ/inuktitut
-ja=日本語
-ja_JP=0
-ka=ქართული
-kk=Қазақша
-kl=Kalaallisut
-km=ភាសាខ្មែរ
-km_KH=0
-kn=ಕನ್ನಡ
-ko=한국어
-ko_KR=0
-ku=Kurdî
-kw=Kernowek
-ky=кыргызча
-la=Latina
-lo=ລາວ
-lt=Lietuvių
-lt=0
-lv=Latviešu
-lv_LV=0
-jbo=La .lojban.
-mg=Malagasy
-mi=Māori
-mk=Македонски
-mk_MK=0
-ml=മലയാളം
-mn=Монгол
-mr=मराठी
-ms=Bahasa Melayu
-ms_MY=0
-mt=Malti
-my=မြန်မာဘာသာ
-my_MM=0
-nb=0
-nb_NO=0
-ne=0
-nl=Nederlands
-nl_BE=0
-nl_NL=0
-nn=Norsk nynorsk
-nn_NO=0
-no=Norsk bokmål
-no_NO=0
-no_NY=0
-nr=0
-oc=Occitan
-om=Oromoo
-or=ଓଡ଼ିଆ
-os=0
-pa=ਪੰਜਾਬੀ
-pl=Polski
-pl_PL=0
-ps=پښتو
-pt=Português
-pt_BR=0
-pt_PT=0
-qu=Runa Simi
-rm=Rumantsch
-ro=Română
-ro_RO=0
-ru=Русский
-ru_RU=0
-rw=Kinyarwanda
-sa=0
-sd=0
-se=Sámegiella
-se_NO=0
-si=0
-sk=Slovenčina
-sk_SK=0
-sl=Slovenščina
-sl_SI=0
-sl_SL=0
-sm=0
-so=0
-sp=0
-sq=Shqip
-sq_AL=0
-sr=Српски
-sr_YU=0
-ss=0
-st=0
-sv=Svenska
-sv_SE=0
-sv_SV=0
-sw=0
-ta=தமிழ்
-te=0
-tg=0
-th=ไทย
-th_TH=0
-ti=0
-tk=0
-tl=0
-to=0
-tr=Türkçe
-tr_TR=0
-ts=0
-tt=Татарча
-ug=0
-uk=Українська
-uk_UA=0
-ur=اردو
-ur_PK=0
-uz=0
-vi=Tiếng Việt
-vi_VN=0
-wa=0
-wo=0
-xh=0
-yi=ייִדיש
-yo=0
-zh=中文
-zh_CN=中文（简体）
-zh_HK=中文（香港）
-zh_TW=中文（繁體）
-zu=0
--- a/Show More
+++ b/Show More