Moved supertuxkart tags to new directory.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/tags/0.5@3235 178a84e3-b1eb-0310-8ba1-8eac791a3b58

ChangeLog

@@ -1,12 +1,13 @@
-SuperTuxKart 0.4.1 (May 2009)
+SuperTuxKart 0.5 (May 2008)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* Five new tracks: Fort Magma, SnowTux Peak, Amazonian Journey, City and Canyon
+* Six new tracks and one improved track: Fort Magma, SnowTux Peak, Amazonian Journey, City, 
+   Canyon, Crescent Crossing and StarTrack
 * Complete Challenges to unlock game modes, new tracks and a skidding preview
 * New Follow the Leader game mode
 * New Grand Prix
 * Improved User Interface
 * Improved game pad/joystick handling
-* German, French and Dutch translations
+* German, French, Dutch, Spanish, Italian and Swedish translations
 * Additional music
 * Many Bugfixes including:
 	a memory leak fix (Charlie Head)

INSTALL

@@ -9,9 +9,8 @@ First, make sure that you have the following packages installed:
   * OpenGL (or Mesa 3.0 or later)
   * PLIB version 1.8.4 or later
   * SDL 1.2 or later
-  * OpenAL (optional)
+  * OpenAL
-  * freealut (optional)
+  * freealut
-  * MikMod (optional)
 
 Unpack the files from the tarball like this:
 
@@ -64,9 +63,6 @@ If you want to install the game system-wide, do 'make install'.
 But it didn't work!
 -------------------
 
-Right now there is no proper windows compilation. You can still compile
-for windows using cygwin, see README.cygwin for details.
-
 If you checked out your copy directly from SVN, you have to run
 'sh autogen.sh' to generate the configure script.
 

Makefile.am

@@ -7,4 +7,4 @@ EXTRA_DIST = README README.cygwin README.macosx README.windows ChangeLog COPYING
 pkgdatadir=$(datadir)/doc/@PACKAGE@
 pkgdata_DATA=AUTHORS ChangeLog COPYING README
 # NEWS only contains "see changelog"
-# CHANGES only contains "see NEW"
+# CHANGES only contains "see NEW"

README.windows

@@ -15,10 +15,8 @@ If you are downloading a source version and want to compile it yourself:
 There are two documented ways to compile an executable for windows: using
 cygwin, and using visual c++ (tested with the free Express version).
 
-If you have any problems, please post on the mailing list - I am 
+If you have any problems, please post on the mailing list, and we will
-not a regular windows user, so am probably not able to help you.
+do our best to help you. 
-
-   hiker
 
 
 Cygwin
@@ -57,7 +55,8 @@ can be found in .../src/ide/vc8/README.
 You still have to install all dependencies, and:
 1) Modify plib:
    Best choice would be to use the plib version from our download page,
-   since it contains all bugfixes that are necessary. Otherwise:
+   since it contains all bugfixes that are necessary. The latest
+   release (1.8.5) might work, if you are using 1.8.4:
    In src/ssg/ssgLoadAC.cxx replace:
       loader_fd = fopen ( filename, "ra" ) ;
    with

TODO

@@ -47,34 +47,12 @@ Thanks in advance!
 ********************************
 ********************************
 
-Known bugs
-==========
-This contains either hard, or not reproducible errors. 
-
-- Fix keyboard bug: the first time turning left/right while
-  pressing the up key is ignored. See bug 6168
-  Might be difficult to fix, since it occurs (it appears) in the interface
-  between X and plib.
-
 Things that would be nice to fix, but are not urgent
 =====================================================
-- Write some documentation. Things to include:
+- Write some documentation.
-  - taking shortcuts might result in not finishing a lap
-  - lap display colour for all karts changes colour whenever
-    a lap is finished
 - Display skid marks again (currently disabled due to problems of 
   skid marks being 'in the air').
 - Added settings menu (e.g. for MPH vs KPH (vs. KM/H), ...)
-- Enable real fullscreen support
-- Top 10 lists for time trial, and grand prix.
-- Display the time difference to either the
-  kart in front of the kart, or to the first kart.
-- Add track sections which must be passed in order to finish
-  a lap. This would avoid karts taking shortcuts.
-  That's already in the code, but currently the user does 
-  not get any feedback if a driveline is skipped --> after 
-  crossing the finishing line, the race might not end for a
-  kart. Well, there is the 'wrong direction' message (?)
 - Add a tutorial course
 - Valgrind for memory bugs.
 - Update the web page, make more screen shots, ...
@@ -84,9 +62,6 @@ Things that would be nice to fix, but are not urgent
 
 long term
 =========
-- OpenAL support (optional)  [patrick]
-- Improved physics to support skidding
-- Improved collision handling
 - Add network multiplayer
 - Make full use of OpenAL
 - Performance tuning
@@ -113,13 +88,4 @@ long term
   ambience, ...
 - More tracks
 - More grand prixs
-- Support for translations(?)
-- Support for easy-to-plugin different AIs, and allow different karts
-  to have different AIs
 - Code cleanup
-  - Consistent style (which needs to be defined)
-  - Replace (as far as possible) all char* with std::string
-  - Rather complicated way of passing information to world, a 
-    mixture of CupData, raceSetup, race_manager. This could
-    probably all be simplified by only using the race_manager,
-    removing the raceSetup class completely.

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autogen.sh to produce a configure script.
 
-AC_INIT(supertuxkart, SVN)
+AC_INIT(supertuxkart, 0.5)
 AC_CONFIG_SRCDIR([src/main.cpp])
 
 dnl Require at least automake 2.59

data/CREDITS

@@ -1,4 +1,4 @@
-Super TuxKart - SVN
+Super TuxKart - 0.5
 =================
 Visit us at http://supertuxkart.sourceforge.net
 
@@ -7,6 +7,7 @@ Project Leaders
 ---------------
 
 Joerg Henrichs (hiker)
+    Dedicates this release to Lia
 
 Eduardo Hernandez Munoz (Coz)
 
@@ -54,6 +55,8 @@ Marianne Gagnon (Auria)
 - Wilber kart
 - 'Amazonian Journey' track
 - 'Fort Magma' track
+- 'Crescent Crossing' track
+- New icon
 
 Frederico de Oliveira Linhares
 - Hexley the platypus kart
@@ -61,6 +64,9 @@ Frederico de Oliveira Linhares
 Johannes Sjolund
 - 'The Island' track
 
+Paul Elms (scifly)
+- 'Star Track' improvements
+
 Thomas Oppl
 - 'Canyon' track
 - 'City' track
@@ -82,6 +88,7 @@ Lukas Siewert (Dr.Sternhagel)
 
 Magne Djupvik
 - 'King Arthur's castle' song
+- 'Penguin Party' song
 
 Paul Esra Martin (P@ule)
 - 'G4M fan track' song
@@ -92,10 +99,12 @@ Stephan Wiefling
 
 Translations
 ------------
-German: Stefan von Halenbach
+German: Dominique Leuenberger, Stefan von Halenbach
 French: Marianne Gagnon (Auria)
 Dutch:  Frans van Rijn (Asciimonster)
-
+Spanish: David Ballesteros Mayo (Dividio)
+Italian: Vincenzo (Gigugin)
+Swedish: Niklas Grahn (juno)
 
 Mac OS X port
 -------------

data/Makefile.am

@@ -11,7 +11,7 @@ pkgdata_DATA =  $(shell find $(srcdir) -name "*.data")        \
                 $(shell find $(srcdir) -name "*.projectile")  \
                 CREDITS licenses                              \
                 supertuxkart_32.xpm supertuxkart_64.xpm       \
-                supertuxkart.desktop
+                supertuxkart_desktop.template
 
 desktopdir = $(prefix)/share/applications
 desktop_DATA = supertuxkart.desktop
@@ -20,3 +20,10 @@ icondir = $(prefix)/share/pixmaps
 icon_DATA = supertuxkart_32.xpm supertuxkart_64.xpm
 
 EXTRA_DIST = $(pkgdata_DATA)
+
+# The desktop file needs the absolute path to the binary
+# since e.g. /usr/games might not be in the standard path
+
+supertuxkart.desktop: supertuxkart_desktop.template
+	cat supertuxkart_desktop.template | sed 's#PREFIX#@prefix@#' >supertuxkart.desktop
+

data/all.cup

@@ -3,7 +3,7 @@
 (supertuxkart-cup
  (name _("All tracks"))
  (description _("All tracks included in SuperTuxKart"))
- (tracks "beach" "startrack" "lighthouse" "jungle" "volcano" "islandtrack" "sandtrack" "fortmagma" "snowtuxpeak" "littlevolcano" "olivermath" "race" "city" "canyon" "subseatrack" "tuxtrack")
+ (tracks "beach" "startrack" "lighthouse" "jungle" "volcano" "islandtrack" "sandtrack" "fortmagma" "snowtuxpeak" "crescentcrossing" "olivermath" "race" "city" "canyon" "subseatrack" "tuxtrack")
  (laps      2         3            4          3        3           2             3           3            3              2               4         5     2       2          3            2)
 )
 

data/gp3.cup

@@ -3,7 +3,7 @@
 (supertuxkart-cup
  (name _("Snag Drive"))
  (description _("Third grand prix"))
- (tracks "islandtrack" "sandtrack" "city" "littlevolcano")
+ (tracks "islandtrack" "sandtrack" "city" "crescentcrossing")
  (laps      2               3           2          2)
 )
 

data/po/es.po

@@ -0,0 +1,971 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: SuperTuxKart 0.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-05-13 14:56-0400\n"
+"PO-Revision-Date: 2008-05-17 16:00+0100\n"
+"Last-Translator: David Ballesteros Mayo <davidio@telefonica.net>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+
+#: src/gui/config_display.cpp:385
+#, c-format
+msgid "%dx%d Blacklisted"
+msgstr "%dx%d en la Lista Negra"
+
+#: src/world.cpp:622
+#, c-format
+msgid ""
+"'%s' has\n"
+"been eliminated."
+msgstr ""
+"'%s' ha\n"
+"sido eliminado."
+
+#: src/gui/player_controls.cpp:64
+msgid "Accelerate"
+msgstr "Acelerar"
+
+#: src/gui/challenges_menu.cpp:36
+msgid "Active Challenges"
+msgstr "Desafíos activos"
+
+#: data/all.cup:4
+msgid "All tracks"
+msgstr "Todas las pistas"
+
+#: data/all.cup:5
+msgid "All tracks included in SuperTuxKart"
+msgstr "Todas las pistas incluidas en SuperTuxKart"
+
+#: data/tracks/jungle/jungle.track:4
+msgid "Amazonian Journey"
+msgstr "Viaje por el Amazonas"
+
+#: src/gui/help_page_two.cpp:108
+msgid "Anvil - slows down greatly the kart in the first position"
+msgstr "Yunque - ralentiza el kart que está en primera posición"
+
+#: src/gui/config_display.cpp:92
+msgid "Apply "
+msgstr "Aplicar "
+
+#: src/gui/config_display.cpp:351
+#, c-format
+msgid "Apply %dx%d"
+msgstr "Aplicar %dx%d"
+
+#: data/tracks/lighthouse/lighthouse.track:4
+msgid "Around the Lighthouse"
+msgstr "Alrededor del Faro"
+
+#: src/gui/help_page_one.cpp:112
+msgid ""
+"At high speeds wheelies drive you faster, but you can't steer. If you\n"
+"get stuck or fall too far, use the rescue button to get back on track."
+msgstr ""
+"A altas velocidades conducirás más rápido a dos ruedas, pero no podrás girar.\n"
+"Si te chocas o caes muy lejos, usa el botón de rescate para volver a la pista."
+
+#: data/gp4.cup:4
+msgid "At world's end"
+msgstr "En el Fin del Mundo"
+
+#: src/gui/help_page_one.cpp:78
+msgid "Avoid bananas"
+msgstr "Evita las bananas"
+
+#: src/gui/grand_prix_ending.cpp:148
+#: src/gui/leader_result.cpp:152
+#: src/gui/race_results_gui.cpp:144
+msgid "Back to the main menu"
+msgstr "Volver al menú principal"
+
+#: src/gui/help_page_two.cpp:122
+msgid "Back to the menu"
+msgstr "Volver al menú"
+
+#: src/gui/player_controls.cpp:65
+msgid "Brake"
+msgstr "Frenar"
+
+#: data/tracks/canyon/canyon.track:4
+msgid "Canyon"
+msgstr "Cañón"
+
+#: src/gui/main_menu.cpp:52
+msgid "Challenges"
+msgstr "Desafíos"
+
+#: src/gui/help_page_one.cpp:117
+msgid "Check the current key bindings for the first player"
+msgstr "Comprobar la configuración de teclado para el primer jugador"
+
+#: src/gui/grand_prix_select.cpp:50
+msgid "Choose a Grand Prix"
+msgstr "Elegir un Gran Premio"
+
+#: src/gui/game_mode.cpp:45
+msgid "Choose a Race Mode"
+msgstr "Elegir el Modo Carrera"
+
+#: src/gui/track_sel.cpp:49
+msgid "Choose a track"
+msgstr "Elige una pista"
+
+#: src/gui/player_controls.cpp:74
+#, c-format
+msgid "Choose your controls, %s"
+msgstr "Elige tus controles, %s"
+
+#: data/tracks/city/city.track:4
+msgid "City"
+msgstr "Ciudad"
+
+#: src/gui/config_display.cpp:97
+msgid "Clear from Blacklist"
+msgstr "Eliminar de la Lista Negra"
+
+#: src/challenges/energy_math_class.cpp:26
+msgid "Collect Coins in Math Class"
+msgstr "Recoge Monedas en la Clase de Mates"
+
+#: src/challenges/energy_math_class.cpp:28
+msgid ""
+"Collect at least 6 coins\n"
+"on three laps of\n"
+"Oliver's Math Class\n"
+"in under 1 minute."
+msgstr ""
+"Recoge al menos 6 monedas\n"
+"en tres vueltas de\n"
+"la Clase de Mates de Oliver\n"
+"en menos de 1 minuto."
+
+#: src/challenges/energy_shifting_sands.cpp:27
+msgid ""
+"Collect at least 9 coins\n"
+"on 3 laps of Shifting Sands\n"
+"in under 2:20 minutes."
+msgstr ""
+"Recoge al menos 9 monedas\n"
+"en 3 vueltas de Arenas Movedizas\n"
+"en menos de 2:20 minutos."
+
+#: src/challenges/energy_shifting_sands.cpp:25
+msgid "Collect the Pharaohs Treasure"
+msgstr "Recoge el Tesoro del Faraón"
+
+#: src/challenges/worlds_end_gp.cpp:27
+msgid ""
+"Come first in the At World's End\n"
+"Grand Prix with 3 'Racer'\n"
+"Level AI karts."
+msgstr ""
+"Se el primero en el Gran Premio\n"
+"En el Fin del Mundo contra\n"
+"3 karts de nivel 'Corredor'."
+
+#: src/gui/display_res_confirm.cpp:55
+msgid "Confirm Resolution"
+msgstr "Confirmar Resolución"
+
+#: src/gui/display_res_confirm.cpp:109
+#, c-format
+msgid "Confirm Resolution Within %d Seconds"
+msgstr "Confirmar Resolución en %d Segundos"
+
+#: src/gui/display_res_confirm.cpp:51
+msgid "Confirm Resolution Within 5 Seconds"
+msgstr "Confirmar Resolución en 5 Segundos"
+
+#: src/gui/feature_unlocked.cpp:47
+#: src/gui/grand_prix_ending.cpp:144
+#: src/gui/leader_result.cpp:148
+#: src/gui/race_results_gui.cpp:135
+msgid "Continue"
+msgstr "Continuar"
+
+#: src/gui/race_results_gui.cpp:140
+msgid "Continue Grand Prix"
+msgstr "Continuar Gran Premio"
+
+#: data/tracks/beach/beach.track:5
+#: data/tracks/lighthouse/lighthouse.track:5
+msgid ""
+"Created by Ingo Ruhnke,\n"
+"modified by M. Gagnon"
+msgstr ""
+"Creado por Ingo Ruhnke,\n"
+"modificado por M. Gagnon"
+
+#: data/tracks/fortmagma/fortmagma.track:5
+msgid ""
+"Created by Oliver & Steve Baker\n"
+"modified by Marianne Gagnon"
+msgstr ""
+"Creado por Oliver y Steve Baker\n"
+"modificado por Marianne Gagnon"
+
+#: data/tracks/snowtuxpeak/snowtuxpeak.track:5
+msgid ""
+"Created by Oliver & Steve Baker,\n"
+" modified by M. Gagnon"
+msgstr ""
+"Creado por Oliver y Steve Baker,\n"
+" modificado por M. Gagnon"
+
+#: data/tracks/sandtrack/sandtrack.track:5
+msgid ""
+"Created by Oliver & Steve Baker,\n"
+"modified by M. Gagnon"
+msgstr ""
+"Creado por Oliver y Steve Baker,\n"
+"modificado por M. Gagnon"
+
+#: src/gui/main_menu.cpp:63
+msgid "Credits"
+msgstr "Créditos"
+
+#: src/gui/config_display.cpp:83
+#, c-format
+msgid "Current: %dx%d"
+msgstr "Actual: %dx%d"
+
+#: src/gui/config_display.cpp:89
+msgid "Decrease Resolution"
+msgstr "Reducir Resolución"
+
+#: src/gui/race_options.cpp:62
+msgid "Difficulty"
+msgstr "Dificultad"
+
+#: src/gui/options.cpp:49
+msgid "Display"
+msgstr "Vídeo"
+
+#: src/gui/config_display.cpp:55
+msgid "Display Settings"
+msgstr "Opciones de Vídeo"
+
+#: src/gui/race_options.cpp:282
+msgid "Driver"
+msgstr "Driver"
+
+#: src/gui/config_controls.cpp:43
+msgid "Edit controls for who?"
+msgstr "De quién quieres editar los controles?"
+
+#: src/gui/race_menu.cpp:60
+msgid "Exit Race"
+msgstr "Salir de la carrera"
+
+#: src/challenges/race_track_time.cpp:28
+msgid ""
+"Finish 3 laps in the Race track\n"
+"with 3 AI karts\n"
+"in under 1:15 minutes."
+msgstr ""
+"Finaliza 3 vueltas en la Pista\n"
+"de Carreras contra 3 karts con IA\n"
+"en menos de 1:15 minutos."
+
+#: src/challenges/city_time.cpp:27
+msgid ""
+"Finish 3 laps on the City track\n"
+"with 3 AI karts\n"
+"in under 5:20 minutes."
+msgstr ""
+"Finaliza 3 vueltas en la pista\n"
+"Ciudad contra 3 karts con IA\n"
+"en menos de 5:20 minutos."
+
+#: src/challenges/tollway_time.cpp:27
+msgid ""
+"Finish 3 laps on the Tux Tollway\n"
+"track with 3 AI karts\n"
+"in under 3:00 minutes."
+msgstr ""
+"Finaliza 3 vueltas en\n"
+"La Autopista de Tux contra\n"
+"3 karts con IA en menos de\n"
+"3:00 minutos."
+
+#: src/challenges/race_track_time.cpp:26
+msgid "Finish Race track in 1:15"
+msgstr "Finaliza la Pista de Carreras en 1:15"
+
+#: src/challenges/tollway_time.cpp:25
+msgid "Finish Tux Tollway track in 3:00"
+msgstr "Finaliza La Autopista de Tux en 3:00"
+
+#: src/challenges/city_time.cpp:25
+msgid "Finish the City track in 5:20"
+msgstr "Finaliza la pista Ciudad en 5:20"
+
+#: src/gui/race_gui.cpp:800
+#, c-format
+msgid "Finished"
+msgstr "Finalizado"
+
+#: src/gui/player_controls.cpp:66
+msgid "Fire"
+msgstr "Fuego"
+
+#: data/gp1.cup:5
+msgid "First grand prix, easy to get started"
+msgstr "Primer gran premio, fácil para empezar"
+
+#: src/challenges/penguin_playground_gp.cpp:28
+#: src/gui/game_mode.cpp:74
+msgid "Follow the Leader"
+msgstr "Sigue al Líder"
+
+#: src/challenges/jungle_follow.cpp:25
+msgid "Follow the Leader in the Jungle"
+msgstr "Sigue al Líder en la Jungla"
+
+#: src/challenges/island_follow.cpp:25
+msgid ""
+"Follow the Leader on a\n"
+"Desert Island"
+msgstr ""
+"Sigue al Líder en la\n"
+"Isla Desértica"
+
+#: src/gui/help_page_three.cpp:74
+msgid ""
+"Follow the leader: Stay behind the leader kart.\n"
+"When the countdown reaches zero, a kart ahead\n"
+"of the leader or the last kart is eliminated."
+msgstr ""
+"Sigue al Líder: Ponte tras el kart del líder.\n"
+"Cuando la cuenta atrás llegue a cero,\n"
+"el kart que esté por delante\n"
+"del líder o el último kart será eliminado."
+
+#: src/gui/help_page_one.cpp:73
+msgid "Force your rivals bite *your* dust!"
+msgstr "Fuerza a tus rivales a morder el polvo!"
+
+#: data/tracks/fortmagma/fortmagma.track:4
+msgid "Fort Magma"
+msgstr "Fuerte Magma"
+
+#: src/gui/num_players.cpp:40
+msgid "Four Players"
+msgstr "Cuatro Jugadores"
+
+#: src/gui/config_display.cpp:76
+#: src/gui/config_display.cpp:128
+#: src/gui/config_display.cpp:183
+msgid "Fullscreen mode"
+msgstr "Modo Pantalla Completa"
+
+#: src/gui/help_page_two.cpp:84
+msgid "Fuzzy blob/Spark - very slow, but bounces from walls"
+msgstr "Bola Brillante/Destello - muy lento, pero rebota en las paredes"
+
+#: src/gui/game_mode.cpp:79
+msgid "Game mode help"
+msgstr "Ayuda de los modos de juego"
+
+#: src/gui/help_page_three.cpp:47
+msgid "Game modes"
+msgstr "Modos de juego"
+
+#: src/gui/challenges_menu.cpp:51
+#: src/gui/credits_menu.cpp:76
+msgid "Go back to the main menu"
+msgstr "Volver al menú principal"
+
+#: src/gui/help_page_one.cpp:148
+#: src/gui/help_page_three.cpp:87
+msgid "Go back to the menu"
+msgstr "Volver al menú"
+
+#: src/gui/race_gui.cpp:948
+msgid "Go!"
+msgstr "Ya!"
+
+#: src/gui/help_page_one.cpp:77
+msgid "Grab blue boxes and coins"
+msgstr "Recoge las cajas azules y las monedas"
+
+#: src/challenges/energy_math_class.cpp:29
+#: src/gui/game_mode.cpp:55
+msgid "Grand Prix"
+msgstr "Gran Premio"
+
+#: src/gui/help_page_three.cpp:54
+msgid ""
+"Grand Prix: Win victory points \n"
+"by racing through a group of tracks,  \n"
+"most points wins (shortest time in case of a tie!)          "
+msgstr ""
+"Gran Premio: Gana puntos por victoria \n"
+"corriendo en un grupo de pistas,  \n"
+"el que más puntos tenga gana (menor tiempo en caso de empate!)          "
+
+#: src/gui/main_menu.cpp:60
+#: src/gui/race_menu.cpp:51
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/gui/race_results_gui.cpp:55
+msgid "Highscores"
+msgstr "Máximas Puntuaciones"
+
+#: src/gui/help_page_two.cpp:76
+msgid "Homing missile - follows rivals, but is slower than the missile"
+msgstr "Misil teledirigido- sigue a los rivales, pero es más lento que el misil"
+
+#: src/gui/config_display.cpp:87
+msgid "Increase Resolution"
+msgstr "Aumentar Resolución"
+
+#: src/user_config.cpp:861
+#, c-format
+msgid "Invalid"
+msgstr "Inválido"
+
+#: src/kart.cpp:634
+msgid "Invalid short-cut!!"
+msgstr "Atajo inválido"
+
+#: src/gui/player_controls.cpp:65
+msgid "Jump"
+msgstr "Saltar"
+
+#: src/gui/race_gui.cpp:805
+msgid "Lap"
+msgstr "Vuelta"
+
+#: data/gp4.cup:5
+msgid "Last grand prix, longer and harder"
+msgstr "Último gran premio, más largo y más difícil"
+
+#: src/gui/race_gui.cpp:409
+msgid "Leader"
+msgstr "Líder"
+
+#: src/gui/player_controls.cpp:64
+msgid "Left"
+msgstr "Izquierda"
+
+#: data/tracks/littlevolcano/littlevolcano.track:4
+msgid "Little Volcano"
+msgstr "Pequeño Volcán"
+
+#: src/gui/start_race_feedback.cpp:35
+msgid "Loading race..."
+msgstr "Cargando carrera..."
+
+#: src/gui/player_controls.cpp:66
+msgid "Look back"
+msgstr "Mirar atrás"
+
+#: src/gui/help_page_two.cpp:68
+msgid "Missile - fast stopper in a straight line"
+msgstr "Misil - freno rápido que va en línea recta"
+
+#: src/gui/main_menu.cpp:47
+msgid "Multiplayer"
+msgstr "Multijugador"
+
+#: src/gui/feature_unlocked.cpp:37
+msgid "New Feature Unlocked"
+msgstr "Nueva Característica Desbloqueada"
+
+#: src/challenges/challenge.cpp:121
+#, c-format
+msgid ""
+"New Grand Prix '%s'\n"
+"now available"
+msgstr ""
+"Nuevo Gran Premio '%s'\n"
+"ahora disponible"
+
+#: src/challenges/challenge.cpp:124
+#, c-format
+msgid ""
+"New difficulty\n"
+"'%s'\n"
+"now available"
+msgstr ""
+"Nueva dificultad\n"
+"'%s'\n"
+"ahora disponible"
+
+#: src/kart.cpp:400
+msgid "New fastest lap"
+msgstr "Nueva vuelta rápida"
+
+#: src/challenges/challenge.cpp:118
+#, c-format
+msgid ""
+"New game mode\n"
+"'%s'\n"
+"now available"
+msgstr ""
+"Nuevo modo de juego\n"
+"'%s'\n"
+"ahora disponible"
+
+#: src/challenges/challenge.cpp:114
+#, c-format
+msgid ""
+"New track '%s'\n"
+"now available"
+msgstr ""
+"Nueva pista '%s'\n"
+"ahora disponible"
+
+#: src/gui/help_page_one.cpp:144
+#: src/gui/help_page_two.cpp:118
+msgid "Next help screen"
+msgstr "Siguiente pantalla de ayuda"
+
+#: src/gui/grand_prix_select.cpp:71
+#: src/gui/grand_prix_select.cpp:76
+msgid "No Grand Prix selected"
+msgstr "Gran Premio no seleccionado"
+
+#: src/gui/track_sel.cpp:86
+msgid "No track selected"
+msgstr "No hay pista seleccionada"
+
+#: src/gui/race_options.cpp:281
+#: src/gui/race_options.cpp:285
+msgid "Novice"
+msgstr "Novato"
+
+#: src/gui/race_options.cpp:80
+msgid "Number of karts"
+msgstr "Número de karts"
+
+#: src/gui/race_options.cpp:106
+msgid "Number of laps"
+msgstr "Número de vueltas"
+
+#: src/user_config.cpp:488
+msgid "Old config file found, check your key bindings!"
+msgstr "Encontrado un fichero de configuración antiguo, comprueba tu asignación de teclas!"
+
+#: data/tracks/olivermath/olivermath.track:4
+msgid "Oliver's Math Class"
+msgstr "Clase de Mates de Oliver"
+
+#: data/tracks/beach/beach.track:4
+msgid "On the Beach"
+msgstr "En la Playa"
+
+#: src/gui/main_menu.cpp:55
+#: src/gui/options.cpp:40
+#: src/gui/race_menu.cpp:50
+msgid "Options"
+msgstr "Opciones"
+
+#: src/gui/help_page_two.cpp:100
+msgid "Parachute - slows down all karts in a better position!"
+msgstr "Paracaidas - ralentiza todos los karts en mejor posición!"
+
+#: src/gui/race_menu.cpp:47
+msgid "Paused"
+msgstr "Pausa"
+
+#: src/gui/race_gui.cpp:974
+msgid "Penalty time!!"
+msgstr "Penalización!!"
+
+#: data/gp1.cup:4
+msgid "Penguin Playground"
+msgstr "Patio del Pingüino"
+
+#: src/gui/player_controls.cpp:251
+msgid "Player "
+msgstr "Jugador"
+
+#: src/gui/char_sel.cpp:68
+#, c-format
+msgid "Player %d, choose a driver"
+msgstr "Jugador %d, elige un conductor"
+
+#: src/gui/config_controls.cpp:45
+msgid "Player 1"
+msgstr "Jugador 1"
+
+#: src/gui/config_controls.cpp:46
+msgid "Player 2"
+msgstr "Jugador 2"
+
+#: src/gui/config_controls.cpp:47
+msgid "Player 3"
+msgstr "Jugador 3"
+
+#: src/gui/config_controls.cpp:48
+msgid "Player 4"
+msgstr "Jugador 4"
+
+#: src/gui/options.cpp:41
+msgid "Player Config"
+msgstr "Configuración del Jugador"
+
+#: src/gui/player_controls.cpp:80
+msgid "Player name"
+msgstr "Nombre del jugador"
+
+#: src/gui/display_res_confirm.cpp:59
+msgid "Press <ESC> to Cancel"
+msgstr "Pulsa <ESC> para Cancelar"
+
+#: src/gui/config_controls.cpp:52
+#: src/gui/config_display.cpp:101
+#: src/gui/config_sound.cpp:63
+#: src/gui/game_mode.cpp:84
+#: src/gui/grand_prix_select.cpp:87
+#: src/gui/num_players.cpp:45
+#: src/gui/options.cpp:57
+#: src/gui/player_controls.cpp:112
+#: src/gui/race_options.cpp:134
+msgid "Press <ESC> to go back"
+msgstr "Pulsa <ESC> para volver"
+
+#: src/gui/player_controls.cpp:156
+msgid "Press key"
+msgstr "Pulsa una tecla"
+
+#: src/gui/help_page_three.cpp:83
+msgid "Previous help screen"
+msgstr "Pantalla anterior de ayuda"
+
+#: src/gui/help_page_two.cpp:114
+msgid "Previous screen"
+msgstr "Pantalla anterior"
+
+#: src/gui/game_mode.cpp:58
+msgid "Quick Race"
+msgstr "Carrera Rápida"
+
+#: src/gui/help_page_three.cpp:62
+msgid "Quick race: Pick a single track, shortest time wins.         "
+msgstr "Carrera Rápida: Elige una pista, el menor tiempo gana."
+
+#: src/gui/main_menu.cpp:56
+msgid "Quit"
+msgstr "Salir"
+
+#: src/gui/race_gui.cpp:746
+msgid "REV"
+msgstr ""
+
+#: data/tracks/race/race.track:4
+msgid "Race Track"
+msgstr "Pista de Carreras"
+
+#: src/gui/race_results_gui.cpp:148
+msgid "Race in this track again"
+msgstr "Correr en la pista otra vez"
+
+#: src/gui/race_results_gui.cpp:54
+msgid "Race results"
+msgstr "Resultados de la carrera"
+
+#: src/gui/race_options.cpp:283
+msgid "Racer"
+msgstr "Corredor"
+
+#: src/gui/race_gui.cpp:930
+msgid "Ready!"
+msgstr "Preparados!"
+
+#: src/gui/player_controls.cpp:66
+msgid "Rescue"
+msgstr "Rescatar"
+
+#: src/gui/race_menu.cpp:52
+msgid "Restart Race"
+msgstr "Reiniciar Carrera"
+
+#: src/gui/race_results_gui.cpp:48
+msgid "Result"
+msgstr "Resultado"
+
+#: src/gui/race_menu.cpp:49
+msgid "Return To Race"
+msgstr "Volver a la Carrera"
+
+#: src/gui/player_controls.cpp:64
+msgid "Right"
+msgstr "Derecha"
+
+#: data/gp2.cup:5
+msgid "Second grand prix"
+msgstr "Segundo gran premio"
+
+#: src/gui/race_gui.cpp:939
+msgid "Set!"
+msgstr "Listos!"
+
+#: src/gui/race_menu.cpp:57
+#: src/gui/race_results_gui.cpp:153
+msgid "Setup New Race"
+msgstr "Configurar Nueva Carrera"
+
+#: data/tracks/sandtrack/sandtrack.track:4
+msgid "Shifting Sands"
+msgstr "Arenas Movedizas"
+
+#: src/gui/main_menu.cpp:46
+msgid "Single Player"
+msgstr "Un jugador"
+
+#: src/gui/race_options.cpp:284
+msgid "Skidding Preview"
+msgstr ""
+
+#: data/gp3.cup:4
+msgid "Snag Drive"
+msgstr ""
+
+#: data/tracks/snowtuxpeak/snowtuxpeak.track:4
+msgid "SnowTux Peak"
+msgstr ""
+
+#: src/gui/options.cpp:52
+msgid "Sound"
+msgstr "Sonido"
+
+#: src/gui/config_sound.cpp:40
+msgid "Sound Settings"
+msgstr "Opciones de Sonido"
+
+#: data/tracks/startrack/startrack.track:4
+msgid "Star Track"
+msgstr "Pista de Estrellas"
+
+#: src/gui/race_options.cpp:129
+msgid "Start race"
+msgstr "Empezar carrera"
+
+#: data/tracks/subseatrack/subseatrack.track:4
+msgid "Sub Sea"
+msgstr "Bajo el Mar"
+
+#: data/tracks/islandtrack/islandtrack.track:4
+msgid "The Island"
+msgstr "La Isla"
+
+#: src/gui/grand_prix_ending.cpp:107
+#: src/gui/leader_result.cpp:109
+#, c-format
+msgid "The winner is %s!"
+msgstr "El ganador es %s!"
+
+#: data/gp3.cup:5
+msgid "Third grand prix"
+msgstr "Tercer gran premio"
+
+#: src/gui/num_players.cpp:39
+msgid "Three Players"
+msgstr "Tres jugadores"
+
+#: src/gui/game_mode.cpp:62
+msgid "Time Trial"
+msgstr "Contrareloj"
+
+#: src/gui/help_page_three.cpp:67
+msgid "Time Trial: As quick race, but no items.                       "
+msgstr "Contrareloj: Como la carrera rápida, pero sin objetos"
+
+#: src/gui/help_page_two.cpp:61
+msgid "To help you win, there are certain collectables you can grab:"
+msgstr "Para ayudarte a ganar, hay diferentes objetos que puedes recoger:"
+
+#: data/gp2.cup:4
+msgid "To the Moon and Back"
+msgstr "Hasta la Luna y Volver"
+
+#: src/gui/config_sound.cpp:45
+#: src/gui/config_sound.cpp:90
+msgid "Turn off music"
+msgstr "Apagar música"
+
+#: src/gui/config_sound.cpp:54
+#: src/gui/config_sound.cpp:103
+msgid "Turn off sound effects"
+msgstr "Apagar efectos de sonido"
+
+#: src/gui/config_sound.cpp:49
+#: src/gui/config_sound.cpp:84
+msgid "Turn on music"
+msgstr "Encender música"
+
+#: src/gui/config_sound.cpp:58
+#: src/gui/config_sound.cpp:98
+msgid "Turn on sound effects"
+msgstr "Encender efectos de sonido"
+
+#: data/tracks/tuxtrack/tuxtrack.track:4
+msgid "Tux Tollway"
+msgstr "La Autopista de Tux"
+
+#: src/gui/num_players.cpp:38
+msgid "Two Players"
+msgstr "Dos Jugadores"
+
+#: data/tracks/volcano/volcano.track:4
+msgid "Volcano"
+msgstr "Volcán"
+
+#: src/player_kart.cpp:264
+msgid "WRONG WAY!"
+msgstr "VAS AL REVÉS!"
+
+#: src/gui/player_controls.cpp:65
+msgid "Wheelie"
+msgstr "A dos ruedas"
+
+#: src/challenges/penguin_playground_gp.cpp:25
+msgid ""
+"Win Penguin Playground Grand\n"
+"Prix"
+msgstr ""
+"Gana el Gran Premio\n"
+"Patio del Pingüino"
+
+#: src/challenges/penguin_playground_gp.cpp:27
+msgid ""
+"Win Penguin Playground Grand\n"
+"Prix with 3 'Racer' Level AI karts."
+msgstr ""
+"Gana el Gran Premio\n"
+"Patio del Pingüino contra 3 karts\n"
+"con IA de nivel 'Corredor'"
+
+#: src/challenges/moon_and_back_gp.cpp:25
+msgid ""
+"Win To the Moon and Back\n"
+"Grand Prix"
+msgstr ""
+"Gana el Gran Premio\n"
+"Hasta la Luna y Volver"
+
+#: src/challenges/tollway_head2head.cpp:27
+msgid ""
+"Win a 1 lap Head to Head\n"
+"on Tux Tollway against 1 'Racer'\n"
+"level AI kart."
+msgstr ""
+"Gana 1 vuelta de Duelo\n"
+"en La Autopista de Tux contra\n"
+"1 kart con IA de nivel 'Corredor'"
+
+#: src/challenges/jungle_follow.cpp:27
+msgid ""
+"Win a Follow the Leader race\n"
+"with 3 AI karts\n"
+"in the Amazonian Jungle."
+msgstr ""
+"Gana una carrera Sigue al Líder\n"
+"contra 3 karts con IA\n"
+"en la Jungla del Amazonas."
+
+#: src/challenges/island_follow.cpp:27
+msgid ""
+"Win a Follow the Leader race\n"
+"with 3 AI karts\n"
+"on a Desert Island."
+msgstr ""
+"Gana una carrera Sigue al Líder\n"
+"contra 3 karts con IA\n"
+"en la Isla Desértica."
+
+#: src/challenges/tollway_head2head.cpp:25
+msgid ""
+"Win a Head to Head on\n"
+"Tux Tollway"
+msgstr ""
+"Gana un Duelo en\n"
+"La Autopista de Tux"
+
+#: src/challenges/worlds_end_gp.cpp:25
+msgid ""
+"Win the At World's End\n"
+"Grand Prix"
+msgstr ""
+"Gana el Gran Premio\n"
+"En el Fin del Mundo"
+
+#: src/challenges/moon_and_back_gp.cpp:27
+msgid ""
+"Win the To the Moon and Back\n"
+"Grand Prix with 3 'Racer'\n"
+"Level AI karts."
+msgstr ""
+"Gana el Gran Premio\n"
+"Hasta la Luna y Volver contra 3 karts\n"
+"con IA de nivel 'Corredor'"
+
+#: src/gui/config_display.cpp:71
+msgid "Window mode"
+msgstr "Modo ventana"
+
+#: src/world.cpp:538
+msgid "You finished"
+msgstr "Has finalizado"
+
+#: src/world.cpp:617
+msgid ""
+"You have been\n"
+"eliminated!"
+msgstr ""
+"Has sido\n"
+"eliminado!"
+
+#: src/world.cpp:537
+msgid "You won"
+msgstr "Has ganado"
+
+#: src/gui/help_page_two.cpp:92
+msgid "Zipper - speed boost"
+msgstr "Zipper - acelerador de velocidad"
+
+#: src/user_config.cpp:844
+#, c-format
+msgid "joy %d axis %d  %c"
+msgstr "joy %d eje %d  %c"
+
+#: src/user_config.cpp:848
+#, c-format
+msgid "joy %d btn %d"
+msgstr "joy %d btn %d"
+
+#: src/user_config.cpp:851
+#, c-format
+msgid "joy %d hat %d"
+msgstr "joy %d hat %d"
+
+#: src/user_config.cpp:857
+#, c-format
+msgid "mouse axis %d %c"
+msgstr "ratón eje %d %c"
+
+#: src/user_config.cpp:854
+#, c-format
+msgid "mouse btn %d"
+msgstr "ratón btn %d"
+
+#: src/user_config.cpp:838
+#: src/user_config.cpp:883
+#, c-format
+msgid "not set"
+msgstr "sin definir"
+
+#: src/world.cpp:540
+msgid "the race!"
+msgstr "la carrera!"
+

data/po/fr.po

@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: supertuxkart\n"
+"Project-Id-Version: supertuxkart 0.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-05-13 14:56-0400\n"
 "PO-Revision-Date: 2008-05-13 15:11-0500\n"

data/po/it.po

@@ -0,0 +1,992 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: SuperTuxKart 0.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-05-25 13:22+1000\n"
+"PO-Revision-Date: 2008-05-28 15:25+0100\n"
+"Last-Translator: Vincenzo <pvinci26@hotmail.it>\n"
+"Language-Team: STK italian <pvinci26@hotmail.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Italian\n"
+
+#: src/gui/config_display.cpp:385
+#, c-format
+msgid "%dx%d Blacklisted"
+msgstr ""
+
+#: src/world.cpp:611
+#, c-format
+msgid ""
+"'%s' has\n"
+"been eliminated."
+msgstr ""
+"'%s' è\n"
+"stato eliminato."
+
+#: src/gui/player_controls.cpp:64
+msgid "Accelerate"
+msgstr "Accelerare"
+
+#: src/gui/challenges_menu.cpp:36
+msgid "Active Challenges"
+msgstr "Sfide Attive"
+
+#: data/all.cup:4
+msgid "All tracks"
+msgstr "Tutte le piste"
+
+#: data/all.cup:5
+msgid "All tracks included in SuperTuxKart"
+msgstr "Tutte le piste incluse in SuperTuxKart"
+
+#: data/tracks/jungle/jungle.track:4
+msgid "Amazonian Journey"
+msgstr "Gita in Amazzonia"
+
+#: src/gui/help_page_two.cpp:108
+msgid "Anvil - slows down greatly the kart in the first position"
+msgstr "Incudine - rallenta notevolmente il kart in prima posizione"
+
+#: src/gui/config_display.cpp:92
+msgid "Apply "
+msgstr "Applica"
+
+#: src/gui/config_display.cpp:351
+#, c-format
+msgid "Apply %dx%d"
+msgstr "Applica %dx%d"
+
+#: data/tracks/lighthouse/lighthouse.track:4
+msgid "Around the Lighthouse"
+msgstr "Intorno al Faro"
+
+#: src/gui/help_page_one.cpp:107
+msgid ""
+"At high speeds wheelies drive you faster, but you can't steer. If you\n"
+"get stuck or fall too far, use the rescue button to get back on track."
+msgstr ""
+"Ad alta velocità impennare fa andare più veloce, ma si perde il controllo.\n"
+"Se vai fuori pista o cadi, usa il tasto Riposiziona per tornare in pista."
+
+#: src/challenges/worlds_end_gp.cpp:54
+#: data/gp4.cup:4
+msgid "At world's end"
+msgstr "La fine del Mondo"
+
+#: src/gui/help_page_one.cpp:73
+msgid "Avoid bananas"
+msgstr "Evitare le banane"
+
+#: src/gui/grand_prix_ending.cpp:148
+#: src/gui/leader_result.cpp:152
+#: src/gui/race_results_gui.cpp:144
+msgid "Back to the main menu"
+msgstr "Torna al menu principale"
+
+#: src/gui/help_page_two.cpp:122
+msgid "Back to the menu"
+msgstr "Torna al menu"
+
+#: src/gui/player_controls.cpp:65
+msgid "Brake"
+msgstr "Freno/Retro"
+
+#: data/tracks/canyon/canyon.track:4
+msgid "Canyon"
+msgstr "Canyon"
+
+#: src/gui/main_menu.cpp:52
+msgid "Challenges"
+msgstr "Sfide"
+
+#: src/gui/player_controls.cpp:74
+#, c-format
+msgid "Choose your controls, %s"
+msgstr "Scegli i tuoi comandi, %s"
+
+#: data/tracks/city/city.track:4
+msgid "City"
+msgstr "Città"
+
+#: src/gui/config_display.cpp:97
+msgid "Clear from Blacklist"
+msgstr ""
+
+#: src/challenges/energy_math_class.cpp:26
+msgid "Collect Coins in Math Class"
+msgstr ""
+"Raccogliere monete nell'Aula\n"
+" di Matematica"
+
+#: src/challenges/energy_math_class.cpp:28
+msgid ""
+"Collect at least 6 points\n"
+"worth of coins\n"
+"on three laps of\n"
+"Oliver's Math Class\n"
+"in under 1 minute."
+msgstr ""
+"Raccogliere almeno 6 monete\n"
+"in tre giri della pista\n"
+"Aula di Matematica di Oliver\n"
+"in meno di 1 minuto."
+
+#: src/challenges/energy_shifting_sands.cpp:27
+msgid ""
+"Collect at least 9 coins\n"
+"on 3 laps of Shifting Sands\n"
+"in under 2:20 minutes."
+msgstr ""
+"Raccogliere almeno 9 monete\n"
+"in 3 giri della pista\n"
+"Sabbie Mobili in meno \n"
+"di 2:20 minuti."
+
+#: src/challenges/energy_shifting_sands.cpp:25
+msgid "Collect the Pharaohs Treasure"
+msgstr "Colleziona il tesoro dei Faraoni"
+
+#: src/gui/help_page_one.cpp:117
+msgid ""
+"Collecting coins increases the number of collectables you receive.\n"
+"After 5 silver coins, each blue box will yield 2 collectables,\n"
+"after 10, 3 collectables and so on.\n"
+"Each gold coin is worth 3 silver coins, so look out for them!"
+msgstr ""
+"Raccogliere le monete aumenta il numero di oggetti che ricevi.\n"
+"Dopo 5 monete d'argento, ogni scatola blu produrrà 2 oggetti,\n"
+"dopo 10, 3 oggetti e così via. \n"
+" Ogni medaglia d'oro vale 3 monete d'argento!"
+
+#: src/challenges/worlds_end_gp.cpp:27
+msgid ""
+"Come first in the At World's End\n"
+"Grand Prix with 3 'Racer'\n"
+"Level AI karts."
+msgstr ""
+"Arriva primo nel Gran Premio\n"
+"La fine del Mondo, contro 3 kart\n"
+"con difficoltà 'corridore'"
+
+#: src/gui/display_res_confirm.cpp:55
+msgid "Confirm Resolution"
+msgstr "Conferma Risoluzione"
+
+#: src/gui/display_res_confirm.cpp:109
+#, c-format
+msgid "Confirm Resolution Within %d Seconds"
+msgstr "Conferma Risoluzione entro %d secondi"
+
+#: src/gui/display_res_confirm.cpp:51
+msgid "Confirm Resolution Within 5 Seconds"
+msgstr "Conferma Risoluzione entro 5 secondi"
+
+#: src/gui/grand_prix_ending.cpp:144
+#: src/gui/leader_result.cpp:148
+#: src/gui/feature_unlocked.cpp:47
+#: src/gui/race_results_gui.cpp:135
+msgid "Continue"
+msgstr "Continua"
+
+#: src/gui/race_results_gui.cpp:140
+msgid "Continue Grand Prix"
+msgstr "Continua Gran Premio"
+
+#: data/tracks/beach/beach.track:5
+#: data/tracks/lighthouse/lighthouse.track:5
+msgid ""
+"Created by Ingo Ruhnke,\n"
+"modified by M. Gagnon"
+msgstr ""
+"Creato da Ingo Ruhnke,\n"
+"modificato da M. Gagnon"
+
+#: data/tracks/fortmagma/fortmagma.track:5
+#: data/tracks/sandtrack/sandtrack.track:5
+#: data/tracks/snowtuxpeak/snowtuxpeak.track:5
+msgid ""
+"Created by Oliver & Steve Baker\n"
+"modified by Marianne Gagnon"
+msgstr ""
+"Creato da Oliver & Steve Baker\n"
+"modificato da Marianne Gagnon"
+
+#: src/gui/main_menu.cpp:63
+msgid "Credits"
+msgstr "Crediti"
+
+#: data/tracks/crescentcrossing/crescentcrossing.track:4
+msgid "Crescent Crossing"
+msgstr "Cimitero"
+
+#: src/gui/config_display.cpp:83
+#, c-format
+msgid "Current: %dx%d"
+msgstr "Corrente: %dx%d"
+
+#: src/gui/config_display.cpp:89
+msgid "Decrease Resolution"
+msgstr "Diminuisci Risoluzione"
+
+#: src/gui/race_options.cpp:64
+msgid "Difficulty"
+msgstr "Difficoltà"
+
+#: src/gui/options.cpp:49
+msgid "Display"
+msgstr "Video"
+
+#: src/gui/config_display.cpp:55
+msgid "Display Settings"
+msgstr "Impostazioni Video"
+
+#: src/gui/race_options.cpp:276
+msgid "Driver"
+msgstr "Pilota"
+
+#: src/gui/config_controls.cpp:43
+msgid "Edit controls for who?"
+msgstr "Modifica comandi a: "
+
+#: src/gui/race_menu.cpp:60
+msgid "Exit Race"
+msgstr "Abbandona corsa"
+
+#: src/challenges/race_track_time.cpp:28
+msgid ""
+"Finish 3 laps in the Race track\n"
+"with 3 AI karts\n"
+"in under 1:15 minutes."
+msgstr ""
+"Finisci 3 giri nella pista Circuito\n"
+"con 3 AI kart in meno di\n"
+"1:15 minuti."
+
+#: src/challenges/city_time.cpp:27
+msgid ""
+"Finish 3 laps on the City track\n"
+"with 3 AI karts\n"
+"in under 5:20 minutes."
+msgstr ""
+"Finisci 3 giri nella pista Città\n"
+"con 3 AI kart in meno di\n"
+"5:20 minuti."
+
+#: src/challenges/tollway_time.cpp:27
+msgid ""
+"Finish 3 laps on the Tux Tollway\n"
+"track with 3 AI karts\n"
+"in under 3:00 minutes."
+msgstr ""
+"Finisci 3 giri nella pista\n"
+"Autodromo Tux contro\n"
+"3 AI karts in meno di\n"
+"3:00 minuti."
+
+#: src/challenges/race_track_time.cpp:26
+msgid "Finish Race track in 1:15"
+msgstr "Finire la pista Circuito in 1:15"
+
+#: src/challenges/tollway_time.cpp:25
+msgid "Finish Tux Tollway track in 3:00"
+msgstr ""
+"Finisci la pista Autodromo\n"
+"Tux in 3:00"
+
+#: src/challenges/city_time.cpp:25
+msgid "Finish the City track in 5:20"
+msgstr "Finire la pista Città in 5:20 "
+
+#: src/gui/race_gui.cpp:800
+#, c-format
+msgid "Finished"
+msgstr "Finito"
+
+#: src/gui/player_controls.cpp:66
+msgid "Fire"
+msgstr "Sparare"
+
+#: data/gp1.cup:5
+msgid "First grand prix, easy to get started"
+msgstr "Primo gran premio, facile per iniziare"
+
+#: src/gui/game_mode.cpp:68
+#: src/challenges/penguin_playground_gp.cpp:28
+msgid "Follow the Leader"
+msgstr "Insegui il kart in Testa"
+
+#: src/challenges/jungle_follow.cpp:25
+msgid "Follow the Leader in the Jungle"
+msgstr "Insegui il kart in Testa nella Giungla"
+
+#: src/challenges/island_follow.cpp:25
+msgid ""
+"Follow the Leader on a\n"
+"Desert Island"
+msgstr ""
+"Insegui il kart in Testa in\n"
+"Isola Deserta"
+
+#: src/gui/help_page_three.cpp:74
+msgid ""
+"Follow the leader: Stay behind the leader kart.                 \n"
+"When the countdown reaches zero, a kart ahead\n"
+"of the leader or the last kart is eliminated."
+msgstr ""
+"Insegui il kart in Testa: Mantieniti dietro il kart in Testa.\n"
+"Quando il conto alla rovescia termina, l'ultimo kart\n"
+"viene eliminato."
+
+#: src/gui/help_page_one.cpp:68
+msgid "Force your rivals bite *your* dust!"
+msgstr "Fagli mangiare la polvere!"
+
+#: data/tracks/fortmagma/fortmagma.track:4
+msgid "Fort Magma"
+msgstr "Fortezza Incandescente"
+
+#: src/gui/num_players.cpp:40
+msgid "Four Players"
+msgstr "Quattro Giocatori"
+
+#: src/gui/config_display.cpp:76
+#: src/gui/config_display.cpp:128
+#: src/gui/config_display.cpp:183
+msgid "Fullscreen mode"
+msgstr "Modalità schermo intero"
+
+#: src/gui/help_page_two.cpp:84
+msgid "Fuzzy blob/Spark - very slow, but bounces from walls"
+msgstr "Goccia scintillante - molto lento, ma rimbalza sulle pareti"
+
+#: src/gui/game_mode.cpp:82
+msgid "Game mode help"
+msgstr "Aiuto del gioco"
+
+#: src/gui/help_page_three.cpp:47
+msgid "Game modes"
+msgstr "Modalità di gioco"
+
+#: src/gui/credits_menu.cpp:76
+#: src/gui/challenges_menu.cpp:51
+msgid "Go back to the main menu"
+msgstr "Torna al menu principale"
+
+#: src/gui/help_page_three.cpp:87
+#: src/gui/help_page_one.cpp:133
+msgid "Go back to the menu"
+msgstr "Torna al menu"
+
+#: src/gui/race_gui.cpp:948
+msgid "Go!"
+msgstr "Via!"
+
+#: src/gui/help_page_one.cpp:72
+msgid "Grab blue boxes and coins"
+msgstr "Prendi le scatole blu e le monete"
+
+#: src/gui/game_mode.cpp:46
+msgid "Grand Prix"
+msgstr "Gran Premio"
+
+#: src/gui/help_page_three.cpp:54
+msgid ""
+"Grand Prix: Win victory points \n"
+"by racing through a group of tracks,  \n"
+"most points wins (shortest time in case of a tie!)          "
+msgstr ""
+"Gran Premio: conquista i punti della vittoria correndo attraverso\n"
+"un gruppo di piste. In caso di parità vince chi ha terminate\n"
+"le piste nel minor tempo possibile. "
+
+#: src/gui/main_menu.cpp:60
+#: src/gui/race_menu.cpp:51
+msgid "Help"
+msgstr "Aiuto"
+
+#: src/gui/race_results_gui.cpp:55
+msgid "Highscores"
+msgstr "Punteggio migliore"
+
+#: src/gui/help_page_two.cpp:76
+msgid "Homing missile - follows rivals, but is slower than the missile"
+msgstr "Missile guidato - segue rivali, ma è più lento del missile"
+
+#: src/gui/config_display.cpp:87
+msgid "Increase Resolution"
+msgstr "Aumenta Risoluzione"
+
+#: src/user_config.cpp:861
+#, c-format
+msgid "Invalid"
+msgstr ""
+
+#: src/kart.cpp:650
+msgid "Invalid short-cut!!"
+msgstr "Scorciatoia non valida!!"
+
+#: src/gui/player_controls.cpp:65
+msgid "Jump"
+msgstr "Saltare"
+
+#: src/gui/race_gui.cpp:805
+msgid "Lap"
+msgstr "Giro"
+
+#: data/gp4.cup:5
+msgid "Last grand prix, longer and harder"
+msgstr "Ultimo Gran Premio, più lungo e più difficile"
+
+#: src/gui/race_gui.cpp:409
+msgid "Leader"
+msgstr "In Testa"
+
+#: src/gui/player_controls.cpp:64
+msgid "Left"
+msgstr "Sinistra"
+
+#: src/gui/start_race_feedback.cpp:35
+msgid "Loading race..."
+msgstr "Caricamento corsa..."
+
+#: src/gui/player_controls.cpp:66
+msgid "Look back"
+msgstr "Guardare Indietro"
+
+#: src/gui/help_page_two.cpp:68
+msgid "Missile - fast stopper in a straight line"
+msgstr "Missile - veloce in linea retta"
+
+#: src/gui/main_menu.cpp:47
+msgid "Multiplayer"
+msgstr "Multigiocatore"
+
+#: src/gui/feature_unlocked.cpp:37
+msgid "New Feature Unlocked"
+msgstr "Sbloccata nuova funzione"
+
+#: src/challenges/challenge.cpp:121
+#, c-format
+msgid ""
+"New Grand Prix '%s'\n"
+"now available"
+msgstr ""
+"Nuovo Gran Premio '%s'\n"
+"ora disponibile"
+
+#: src/challenges/challenge.cpp:124
+#, c-format
+msgid ""
+"New difficulty\n"
+"'%s'\n"
+"now available"
+msgstr ""
+"Nuova difficoltà\n"
+"'%s'\n"
+"ora disponibile"
+
+#: src/kart.cpp:407
+msgid "New fastest lap"
+msgstr "Nuovo giro più veloce"
+
+#: src/challenges/challenge.cpp:118
+#, c-format
+msgid ""
+"New game mode\n"
+"'%s'\n"
+"now available"
+msgstr ""
+"Nuova modalità di gioco\n"
+"'%s'\n"
+"ora disponibile"
+
+#: src/challenges/challenge.cpp:114
+#, c-format
+msgid ""
+"New track '%s'\n"
+"now available"
+msgstr ""
+"Nuova pista '%s'\n"
+"ora disponibile"
+
+#: src/gui/help_page_two.cpp:118
+#: src/gui/help_page_one.cpp:129
+msgid "Next help screen"
+msgstr "Prossima schermata di aiuto"
+
+#: src/gui/grand_prix_select.cpp:71
+#: src/gui/grand_prix_select.cpp:77
+msgid "No Grand Prix selected"
+msgstr "Gran Premio non selezionato"
+
+#: src/gui/track_sel.cpp:87
+msgid "No track selected"
+msgstr "Pista non selezionata"
+
+#: src/gui/race_options.cpp:275
+#: src/gui/race_options.cpp:279
+msgid "Novice"
+msgstr "Principiante"
+
+#: src/gui/race_options.cpp:80
+msgid "Number of karts"
+msgstr "Numero partecipanti"
+
+#: src/gui/race_options.cpp:101
+msgid "Number of laps"
+msgstr "Numero di giri"
+
+#: src/user_config.cpp:488
+msgid "Old config file found, check your key bindings!"
+msgstr ""
+
+#: data/tracks/olivermath/olivermath.track:4
+msgid "Oliver's Math Class"
+msgstr "Aula di Matematica di Oliver"
+
+#: data/tracks/beach/beach.track:4
+msgid "On the Beach"
+msgstr "Sulla Spiaggia"
+
+#: src/gui/options.cpp:40
+#: src/gui/main_menu.cpp:55
+#: src/gui/race_menu.cpp:50
+msgid "Options"
+msgstr "Opzioni"
+
+#: src/gui/help_page_two.cpp:100
+msgid "Parachute - slows down all karts in a better position!"
+msgstr "Paracadute - rallenta tutti i kart in posizioni migliori!"
+
+#: src/gui/race_menu.cpp:47
+msgid "Paused"
+msgstr "Pausa"
+
+#: src/gui/race_gui.cpp:977
+msgid "Penalty time!!"
+msgstr "Partenza anticipata!!"
+
+#: src/challenges/penguin_playground_gp.cpp:46
+#: data/gp1.cup:4
+msgid "Penguin Playground"
+msgstr "Livello Pinguino"
+
+#: src/gui/player_controls.cpp:251
+msgid "Player "
+msgstr "Giocatore"
+
+#: src/gui/char_sel.cpp:68
+#, c-format
+msgid "Player %d, choose a driver"
+msgstr "Giocatore %d, scegli un pilota"
+
+#: src/gui/config_controls.cpp:45
+msgid "Player 1"
+msgstr "Giocatore 1"
+
+#: src/gui/config_controls.cpp:46
+msgid "Player 2"
+msgstr "Giocatore 2"
+
+#: src/gui/config_controls.cpp:47
+msgid "Player 3"
+msgstr "Giocatore 3"
+
+#: src/gui/config_controls.cpp:48
+msgid "Player 4"
+msgstr "Giocatore 4"
+
+#: src/gui/options.cpp:41
+msgid "Player Config"
+msgstr "Impostazioni Giocatore"
+
+#: src/gui/player_controls.cpp:80
+msgid "Player name"
+msgstr "Nome Giocatore"
+
+#: src/gui/display_res_confirm.cpp:59
+msgid "Press <ESC> to Cancel"
+msgstr "Premere <ESC> per Cancellare"
+
+#: src/gui/options.cpp:57
+#: src/gui/player_controls.cpp:112
+#: src/gui/race_options.cpp:128
+#: src/gui/config_display.cpp:101
+#: src/gui/game_mode.cpp:87
+#: src/gui/config_sound.cpp:63
+#: src/gui/config_controls.cpp:52
+#: src/gui/grand_prix_select.cpp:88
+#: src/gui/num_players.cpp:45
+msgid "Press <ESC> to go back"
+msgstr "Premere <ESC> per tornare indietro"
+
+#: src/gui/player_controls.cpp:156
+msgid "Press key"
+msgstr "Premi un tasto"
+
+#: src/gui/help_page_three.cpp:83
+msgid "Previous help screen"
+msgstr "Schermata precedente di aiuto"
+
+#: src/gui/help_page_two.cpp:114
+msgid "Previous screen"
+msgstr "Schermata precedente"
+
+#: src/gui/game_mode.cpp:59
+msgid "Quick Race"
+msgstr "Corsa Veloce"
+
+#: src/gui/help_page_three.cpp:62
+msgid "Quick race: Pick a single track, shortest time wins.         "
+msgstr "Corsa veloce: Scegli una pista, vince chi la termina nel minor tempo."
+
+#: src/gui/main_menu.cpp:56
+msgid "Quit"
+msgstr "Esci"
+
+#: src/gui/race_gui.cpp:746
+msgid "REV"
+msgstr "RETRO"
+
+#: data/tracks/race/race.track:4
+msgid "Race Track"
+msgstr "Circuito"
+
+#: src/gui/race_results_gui.cpp:148
+msgid "Race in this track again"
+msgstr "Corri ancora in questa pista"
+
+#: src/gui/race_results_gui.cpp:54
+msgid "Race results"
+msgstr "Risultati corsa"
+
+#: src/gui/race_options.cpp:277
+msgid "Racer"
+msgstr "Corridore"
+
+#: src/gui/race_gui.cpp:930
+msgid "Ready!"
+msgstr "Pronti!"
+
+#: src/gui/player_controls.cpp:66
+msgid "Rescue"
+msgstr "Riposiziona"
+
+#: src/gui/race_menu.cpp:52
+msgid "Restart Race"
+msgstr "Ricomincia la corsa"
+
+#: src/gui/race_results_gui.cpp:48
+msgid "Result"
+msgstr "Risultato"
+
+#: src/gui/race_menu.cpp:49
+msgid "Return To Race"
+msgstr "Ritorna alla corsa"
+
+#: src/gui/player_controls.cpp:64
+msgid "Right"
+msgstr "Destra"
+
+#: data/gp2.cup:5
+msgid "Second grand prix"
+msgstr "Secondo Gran Premio"
+
+#: src/gui/race_gui.cpp:939
+msgid "Set!"
+msgstr "Partenza!"
+
+#: src/gui/race_menu.cpp:57
+#: src/gui/race_results_gui.cpp:153
+msgid "Setup New Race"
+msgstr "Imposta Nuovo Pilota"
+
+#: data/tracks/sandtrack/sandtrack.track:4
+msgid "Shifting Sands"
+msgstr "Sabbie Mobili"
+
+#: src/gui/main_menu.cpp:46
+msgid "Single Player"
+msgstr "1 Giocatore"
+
+#: src/gui/race_options.cpp:278
+msgid "Skidding Preview"
+msgstr ""
+
+#: data/gp3.cup:4
+msgid "Snag Drive"
+msgstr ""
+
+#: data/tracks/snowtuxpeak/snowtuxpeak.track:4
+msgid "SnowTux Peak"
+msgstr "Picco Innevato Tux"
+
+#: src/gui/options.cpp:52
+msgid "Sound"
+msgstr "Audio"
+
+#: src/gui/config_sound.cpp:40
+msgid "Sound Settings"
+msgstr "Impostazioni Audio"
+
+#: data/tracks/startrack.new/startrack.track:4
+#: data/tracks/startrack/startrack.track:4
+msgid "Star Track"
+msgstr "Pista Stellare"
+
+#: src/gui/race_options.cpp:121
+msgid "Start race"
+msgstr "Inizia corsa"
+
+#: data/tracks/subseatrack/subseatrack.track:4
+msgid "Sub Sea"
+msgstr "In fondo al mare"
+
+#: data/tracks/islandtrack/islandtrack.track:4
+msgid "The Island"
+msgstr "L'Isola"
+
+#: src/gui/help_page_one.cpp:113
+msgid ""
+"The current key bindings can be seen/changed in the\n"
+"Options->Player Config menu."
+msgstr ""
+"I comandi di gioco possono essere visti/modificati in\n"
+"Opzioni->Impostazioni Giocatore."
+
+#: src/gui/grand_prix_ending.cpp:107
+#: src/gui/leader_result.cpp:109
+#, c-format
+msgid "The winner is %s!"
+msgstr "Il vincitore è %s!"
+
+#: data/gp3.cup:5
+msgid "Third grand prix"
+msgstr "Terzo Gran Premio"
+
+#: src/gui/num_players.cpp:39
+msgid "Three Players"
+msgstr "Tre Giocatori"
+
+#: src/gui/game_mode.cpp:63
+msgid "Time Trial"
+msgstr "Cronometro"
+
+#: src/gui/help_page_three.cpp:67
+msgid "Time Trial: As quick race, but no items.                       "
+msgstr "Cronometro: Come Corsa Veloce, ma senza oggetti."
+
+#: src/gui/help_page_two.cpp:61
+msgid "To help you win, there are certain collectables you can grab:"
+msgstr "Per aiutarti a vincere, ci sono alcuni aiuti che puoi prendere:"
+
+#: src/challenges/moon_and_back_gp.cpp:49
+#: data/gp2.cup:4
+msgid "To the Moon and Back"
+msgstr "Andata e Ritorno sulla Luna"
+
+#: src/gui/config_sound.cpp:45
+#: src/gui/config_sound.cpp:90
+msgid "Turn off music"
+msgstr "Disattiva musica"
+
+#: src/gui/config_sound.cpp:54
+#: src/gui/config_sound.cpp:103
+msgid "Turn off sound effects"
+msgstr "Disattiva effetti audio"
+
+#: src/gui/config_sound.cpp:49
+#: src/gui/config_sound.cpp:84
+msgid "Turn on music"
+msgstr "Attiva musica"
+
+#: src/gui/config_sound.cpp:58
+#: src/gui/config_sound.cpp:98
+msgid "Turn on sound effects"
+msgstr "Attiva effetti audio"
+
+#: data/tracks/tuxtrack/tuxtrack.track:4
+msgid "Tux Tollway"
+msgstr "Autodromo Tux"
+
+#: src/gui/num_players.cpp:38
+msgid "Two Players"
+msgstr "Due Giocatori"
+
+#: data/tracks/volcano/volcano.track:4
+msgid "Volcano"
+msgstr "Vulcano"
+
+#: src/player_kart.cpp:276
+msgid "WRONG WAY!"
+msgstr "DIREZIONE ERRATA!"
+
+#: src/gui/player_controls.cpp:65
+msgid "Wheelie"
+msgstr "Impennare"
+
+#: src/challenges/penguin_playground_gp.cpp:25
+msgid ""
+"Win Penguin Playground Grand\n"
+"Prix"
+msgstr ""
+"Vinci il Gran Premio\n"
+"Livello Pinguino"
+
+#: src/challenges/penguin_playground_gp.cpp:27
+msgid ""
+"Win Penguin Playground Grand\n"
+"Prix with 3 'Racer' Level AI karts."
+msgstr ""
+"Vinci il Gran Premio\n"
+"Livello Pinguino contro 3\n"
+"kart con difficoltà 'Corridore'."
+
+#: src/challenges/moon_and_back_gp.cpp:25
+msgid ""
+"Win To the Moon and Back\n"
+"Grand Prix"
+msgstr ""
+"Vinci il Gran Premio\n"
+"Andata e Ritorno sulla Luna"
+
+#: src/challenges/tollway_head2head.cpp:27
+msgid ""
+"Win a 1 lap Head to Head\n"
+"on Tux Tollway against 1 'Racer'\n"
+"level AI kart."
+msgstr ""
+"Vinci un testa a testa in\n"
+"Autodromo Tux contro 1 kart\n"
+"a livello 'Corridore'"
+
+#: src/challenges/jungle_follow.cpp:27
+msgid ""
+"Win a Follow the Leader race\n"
+"with 3 AI karts\n"
+"in the Amazonian Jungle."
+msgstr ""
+"Vinci in Insegui il kart in Testa\n"
+"contro 3 AI kart."
+
+#: src/challenges/island_follow.cpp:27
+msgid ""
+"Win a Follow the Leader race\n"
+"with 3 AI karts\n"
+"on a Desert Island."
+msgstr ""
+"Vinci in Insegui il kart in Testa\n"
+"contro 3 AI kart su\n"
+"Isola Deserta."
+
+#: src/challenges/tollway_head2head.cpp:25
+msgid ""
+"Win a Head to Head on\n"
+"Tux Tollway"
+msgstr ""
+"Vinci un testa a testa in\n"
+"Autodromo Tux"
+
+#: src/challenges/worlds_end_gp.cpp:25
+msgid ""
+"Win the At World's End\n"
+"Grand Prix"
+msgstr ""
+"Vinci il Gran Premio\n"
+"La Fine del Mondo"
+
+#: src/challenges/moon_and_back_gp.cpp:27
+msgid ""
+"Win the To the Moon and Back\n"
+"Grand Prix with 3 'Racer'\n"
+"Level AI karts."
+msgstr ""
+"Vinci il Gran Premio\n"
+"Andata e Ritorno sulla Luna\n"
+"contro 3 kart con difficoltà\n"
+" 'Corridore'."
+
+#: src/gui/config_display.cpp:71
+msgid "Window mode"
+msgstr "Modalità finestra"
+
+#: src/player_kart.cpp:231
+msgid "You finished"
+msgstr "Hai finito"
+
+#: src/world.cpp:606
+msgid ""
+"You have been\n"
+"eliminated!"
+msgstr ""
+"Sei stato\n"
+"eliminato!"
+
+#: src/player_kart.cpp:231
+msgid "You won"
+msgstr "Hai Vinto"
+
+#: src/gui/help_page_two.cpp:92
+msgid "Zipper - speed boost"
+msgstr "Zip - Aumenta la velocità"
+
+#: src/user_config.cpp:844
+#, c-format
+msgid "joy %d axis %d  %c"
+msgstr ""
+
+#: src/user_config.cpp:848
+#, c-format
+msgid "joy %d btn %d"
+msgstr ""
+
+#: src/user_config.cpp:851
+#, c-format
+msgid "joy %d hat %d"
+msgstr ""
+
+#: src/user_config.cpp:857
+#, c-format
+msgid "mouse axis %d %c"
+msgstr ""
+
+#: src/user_config.cpp:854
+#, c-format
+msgid "mouse btn %d"
+msgstr ""
+
+#: src/user_config.cpp:838
+#: src/user_config.cpp:883
+#, c-format
+msgid "not set"
+msgstr "non impostato"
+
+#: src/player_kart.cpp:233
+msgid "the race!"
+msgstr "la corsa!"
+
+#~ msgid "Check the current key bindings for the first player"
+#~ msgstr "Verificare i seguenti comandi per il primo giocatore"
+#~ msgid "Choose a Grand Prix"
+#~ msgstr "Scegliere un Gran Premio"
+#~ msgid "Choose a Race Mode"
+#~ msgstr "Scegliere una modalità di corsa"
+#~ msgid "Choose a track"
+#~ msgstr "Scegli una pista"
+#~ msgid ""
+#~ "Created by Oliver & Steve Baker,\n"
+#~ " modified by M. Gagnon"
+#~ msgstr ""
+#~ "Creato da Oliver & Steve Baker,\n"
+#~ " modificato da M. Gagnon"
+#~ msgid ""
+#~ "Created by Oliver & Steve Baker,\n"
+#~ "modified by M. Gagnon"
+#~ msgstr ""
+#~ "Creato da Oliver & Steve Baker,\n"
+#~ "modificato da M. Gagnon"
+#~ msgid "Little Volcano"
+#~ msgstr "Piccolo Vulcano"
+

data/po/supertuxkart.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-13 14:56-0400\n"
+"POT-Creation-Date: 2008-05-25 20:38+1000\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"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "%dx%d Blacklisted"
 msgstr ""
 
-#: src/world.cpp:622
+#: src/world.cpp:619
 #, c-format
 msgid ""
 "'%s' has\n"
@@ -65,17 +65,17 @@ msgstr ""
 msgid "Around the Lighthouse"
 msgstr ""
 
-#: src/gui/help_page_one.cpp:112
+#: src/gui/help_page_one.cpp:107
 msgid ""
 "At high speeds wheelies drive you faster, but you can't steer. If you\n"
 "get stuck or fall too far, use the rescue button to get back on track."
 msgstr ""
 
-#: data/gp4.cup:4
+#: src/challenges/worlds_end_gp.cpp:54 data/gp4.cup:4
 msgid "At world's end"
 msgstr ""
 
-#: src/gui/help_page_one.cpp:78
+#: src/gui/help_page_one.cpp:73
 msgid "Avoid bananas"
 msgstr ""
 
@@ -96,26 +96,10 @@ msgstr ""
 msgid "Canyon"
 msgstr ""
 
-#: src/gui/main_menu.cpp:52
+#: src/gui/main_menu.cpp:53
 msgid "Challenges"
 msgstr ""
 
-#: src/gui/help_page_one.cpp:117
-msgid "Check the current key bindings for the first player"
-msgstr ""
-
-#: src/gui/grand_prix_select.cpp:50
-msgid "Choose a Grand Prix"
-msgstr ""
-
-#: src/gui/game_mode.cpp:45
-msgid "Choose a Race Mode"
-msgstr ""
-
-#: src/gui/track_sel.cpp:49
-msgid "Choose a track"
-msgstr ""
-
 #: src/gui/player_controls.cpp:74
 #, c-format
 msgid "Choose your controls, %s"
@@ -135,7 +119,8 @@ msgstr ""
 
 #: src/challenges/energy_math_class.cpp:28
 msgid ""
-"Collect at least 6 coins\n"
+"Collect at least 6 points\n"
+"worth of coins\n"
 "on three laps of\n"
 "Oliver's Math Class\n"
 "in under 1 minute."
@@ -152,6 +137,14 @@ msgstr ""
 msgid "Collect the Pharaohs Treasure"
 msgstr ""
 
+#: src/gui/help_page_one.cpp:117
+msgid ""
+"Collecting coins increases the number of collectables you receive.\n"
+"After 5 silver coins, each blue box will yield 2 collectables,\n"
+"after 10, 3 collectables and so on.\n"
+"Each gold coin is worth 3 silver coins, so look out for them!"
+msgstr ""
+
 #: src/challenges/worlds_end_gp.cpp:27
 msgid ""
 "Come first in the At World's End\n"
@@ -172,8 +165,8 @@ msgstr ""
 msgid "Confirm Resolution Within 5 Seconds"
 msgstr ""
 
-#: src/gui/feature_unlocked.cpp:47 src/gui/grand_prix_ending.cpp:144
+#: src/gui/grand_prix_ending.cpp:144 src/gui/leader_result.cpp:148
-#: src/gui/leader_result.cpp:148 src/gui/race_results_gui.cpp:135
+#: src/gui/feature_unlocked.cpp:47 src/gui/race_results_gui.cpp:135
 msgid "Continue"
 msgstr ""
 
@@ -188,27 +181,21 @@ msgid ""
 msgstr ""
 
 #: data/tracks/fortmagma/fortmagma.track:5
+#: data/tracks/sandtrack/sandtrack.track:5
+#: data/tracks/snowtuxpeak/snowtuxpeak.track:5
 msgid ""
 "Created by Oliver & Steve Baker\n"
 "modified by Marianne Gagnon"
 msgstr ""
 
-#: data/tracks/snowtuxpeak/snowtuxpeak.track:5
+#: src/gui/main_menu.cpp:64
-msgid ""
-"Created by Oliver & Steve Baker,\n"
-" modified by M. Gagnon"
-msgstr ""
-
-#: data/tracks/sandtrack/sandtrack.track:5
-msgid ""
-"Created by Oliver & Steve Baker,\n"
-"modified by M. Gagnon"
-msgstr ""
-
-#: src/gui/main_menu.cpp:63
 msgid "Credits"
 msgstr ""
 
+#: data/tracks/crescentcrossing/crescentcrossing.track:4
+msgid "Crescent Crossing"
+msgstr ""
+
 #: src/gui/config_display.cpp:83
 #, c-format
 msgid "Current: %dx%d"
@@ -218,7 +205,7 @@ msgstr ""
 msgid "Decrease Resolution"
 msgstr ""
 
-#: src/gui/race_options.cpp:62
+#: src/gui/race_options.cpp:67
 msgid "Difficulty"
 msgstr ""
 
@@ -230,7 +217,7 @@ msgstr ""
 msgid "Display Settings"
 msgstr ""
 
-#: src/gui/race_options.cpp:282
+#: src/gui/race_options.cpp:279
 msgid "Driver"
 msgstr ""
 
@@ -288,7 +275,7 @@ msgstr ""
 msgid "First grand prix, easy to get started"
 msgstr ""
 
-#: src/challenges/penguin_playground_gp.cpp:28 src/gui/game_mode.cpp:74
+#: src/gui/game_mode.cpp:68 src/challenges/penguin_playground_gp.cpp:28
 msgid "Follow the Leader"
 msgstr ""
 
@@ -304,12 +291,12 @@ msgstr ""
 
 #: src/gui/help_page_three.cpp:74
 msgid ""
-"Follow the leader: Stay behind the leader kart.\n"
+"Follow the leader: Stay behind the leader kart.                 \n"
 "When the countdown reaches zero, a kart ahead\n"
 "of the leader or the last kart is eliminated."
 msgstr ""
 
-#: src/gui/help_page_one.cpp:73
+#: src/gui/help_page_one.cpp:68
 msgid "Force your rivals bite *your* dust!"
 msgstr ""
 
@@ -330,7 +317,7 @@ msgstr ""
 msgid "Fuzzy blob/Spark - very slow, but bounces from walls"
 msgstr ""
 
-#: src/gui/game_mode.cpp:79
+#: src/gui/game_mode.cpp:82
 msgid "Game mode help"
 msgstr ""
 
@@ -338,11 +325,11 @@ msgstr ""
 msgid "Game modes"
 msgstr ""
 
-#: src/gui/challenges_menu.cpp:51 src/gui/credits_menu.cpp:76
+#: src/gui/credits_menu.cpp:76 src/gui/challenges_menu.cpp:51
 msgid "Go back to the main menu"
 msgstr ""
 
-#: src/gui/help_page_one.cpp:148 src/gui/help_page_three.cpp:87
+#: src/gui/help_page_three.cpp:87 src/gui/help_page_one.cpp:133
 msgid "Go back to the menu"
 msgstr ""
 
@@ -350,11 +337,11 @@ msgstr ""
 msgid "Go!"
 msgstr ""
 
-#: src/gui/help_page_one.cpp:77
+#: src/gui/help_page_one.cpp:72
 msgid "Grab blue boxes and coins"
 msgstr ""
 
-#: src/challenges/energy_math_class.cpp:29 src/gui/game_mode.cpp:55
+#: src/gui/game_mode.cpp:46
 msgid "Grand Prix"
 msgstr ""
 
@@ -365,7 +352,7 @@ msgid ""
 "most points wins (shortest time in case of a tie!)          "
 msgstr ""
 
-#: src/gui/main_menu.cpp:60 src/gui/race_menu.cpp:51
+#: src/gui/main_menu.cpp:61 src/gui/race_menu.cpp:51
 msgid "Help"
 msgstr ""
 
@@ -386,7 +373,7 @@ msgstr ""
 msgid "Invalid"
 msgstr ""
 
-#: src/kart.cpp:634
+#: src/kart.cpp:635
 msgid "Invalid short-cut!!"
 msgstr ""
 
@@ -410,10 +397,6 @@ msgstr ""
 msgid "Left"
 msgstr ""
 
-#: data/tracks/littlevolcano/littlevolcano.track:4
-msgid "Little Volcano"
-msgstr ""
-
 #: src/gui/start_race_feedback.cpp:35
 msgid "Loading race..."
 msgstr ""
@@ -426,7 +409,7 @@ msgstr ""
 msgid "Missile - fast stopper in a straight line"
 msgstr ""
 
-#: src/gui/main_menu.cpp:47
+#: src/gui/main_menu.cpp:48
 msgid "Multiplayer"
 msgstr ""
 
@@ -468,27 +451,27 @@ msgid ""
 "now available"
 msgstr ""
 
-#: src/gui/help_page_one.cpp:144 src/gui/help_page_two.cpp:118
+#: src/gui/help_page_two.cpp:118 src/gui/help_page_one.cpp:129
 msgid "Next help screen"
 msgstr ""
 
-#: src/gui/grand_prix_select.cpp:71 src/gui/grand_prix_select.cpp:76
+#: src/gui/grand_prix_select.cpp:71 src/gui/grand_prix_select.cpp:77
 msgid "No Grand Prix selected"
 msgstr ""
 
-#: src/gui/track_sel.cpp:86
+#: src/gui/track_sel.cpp:87
 msgid "No track selected"
 msgstr ""
 
-#: src/gui/race_options.cpp:281 src/gui/race_options.cpp:285
+#: src/gui/race_options.cpp:278 src/gui/race_options.cpp:282
 msgid "Novice"
 msgstr ""
 
-#: src/gui/race_options.cpp:80
+#: src/gui/race_options.cpp:83
 msgid "Number of karts"
 msgstr ""
 
-#: src/gui/race_options.cpp:106
+#: src/gui/race_options.cpp:104
 msgid "Number of laps"
 msgstr ""
 
@@ -504,7 +487,7 @@ msgstr ""
 msgid "On the Beach"
 msgstr ""
 
-#: src/gui/main_menu.cpp:55 src/gui/options.cpp:40 src/gui/race_menu.cpp:50
+#: src/gui/options.cpp:40 src/gui/main_menu.cpp:56 src/gui/race_menu.cpp:50
 msgid "Options"
 msgstr ""
 
@@ -516,11 +499,11 @@ msgstr ""
 msgid "Paused"
 msgstr ""
 
-#: src/gui/race_gui.cpp:974
+#: src/gui/race_gui.cpp:977
 msgid "Penalty time!!"
 msgstr ""
 
-#: data/gp1.cup:4
+#: src/challenges/penguin_playground_gp.cpp:46 data/gp1.cup:4
 msgid "Penguin Playground"
 msgstr ""
 
@@ -561,11 +544,11 @@ msgstr ""
 msgid "Press <ESC> to Cancel"
 msgstr ""
 
-#: src/gui/config_controls.cpp:52 src/gui/config_display.cpp:101
-#: src/gui/config_sound.cpp:63 src/gui/game_mode.cpp:84
-#: src/gui/grand_prix_select.cpp:87 src/gui/num_players.cpp:45
 #: src/gui/options.cpp:57 src/gui/player_controls.cpp:112
-#: src/gui/race_options.cpp:134
+#: src/gui/race_options.cpp:131 src/gui/config_display.cpp:101
+#: src/gui/game_mode.cpp:87 src/gui/config_sound.cpp:63
+#: src/gui/config_controls.cpp:52 src/gui/grand_prix_select.cpp:88
+#: src/gui/num_players.cpp:45
 msgid "Press <ESC> to go back"
 msgstr ""
 
@@ -581,7 +564,7 @@ msgstr ""
 msgid "Previous screen"
 msgstr ""
 
-#: src/gui/game_mode.cpp:58
+#: src/gui/game_mode.cpp:59
 msgid "Quick Race"
 msgstr ""
 
@@ -589,7 +572,7 @@ msgstr ""
 msgid "Quick race: Pick a single track, shortest time wins.         "
 msgstr ""
 
-#: src/gui/main_menu.cpp:56
+#: src/gui/main_menu.cpp:57
 msgid "Quit"
 msgstr ""
 
@@ -609,7 +592,7 @@ msgstr ""
 msgid "Race results"
 msgstr ""
 
-#: src/gui/race_options.cpp:283
+#: src/gui/race_options.cpp:280
 msgid "Racer"
 msgstr ""
 
@@ -653,11 +636,11 @@ msgstr ""
 msgid "Shifting Sands"
 msgstr ""
 
-#: src/gui/main_menu.cpp:46
+#: src/gui/main_menu.cpp:47
 msgid "Single Player"
 msgstr ""
 
-#: src/gui/race_options.cpp:284
+#: src/gui/race_options.cpp:281
 msgid "Skidding Preview"
 msgstr ""
 
@@ -681,7 +664,7 @@ msgstr ""
 msgid "Star Track"
 msgstr ""
 
-#: src/gui/race_options.cpp:129
+#: src/gui/race_options.cpp:124
 msgid "Start race"
 msgstr ""
 
@@ -693,6 +676,12 @@ msgstr ""
 msgid "The Island"
 msgstr ""
 
+#: src/gui/help_page_one.cpp:113
+msgid ""
+"The current key bindings can be seen/changed in the\n"
+"Options->Player Config menu."
+msgstr ""
+
 #: src/gui/grand_prix_ending.cpp:107 src/gui/leader_result.cpp:109
 #, c-format
 msgid "The winner is %s!"
@@ -706,7 +695,7 @@ msgstr ""
 msgid "Three Players"
 msgstr ""
 
-#: src/gui/game_mode.cpp:62
+#: src/gui/game_mode.cpp:63
 msgid "Time Trial"
 msgstr ""
 
@@ -718,7 +707,7 @@ msgstr ""
 msgid "To help you win, there are certain collectables you can grab:"
 msgstr ""
 
-#: data/gp2.cup:4
+#: src/challenges/moon_and_back_gp.cpp:49 data/gp2.cup:4
 msgid "To the Moon and Back"
 msgstr ""
 
@@ -750,7 +739,7 @@ msgstr ""
 msgid "Volcano"
 msgstr ""
 
-#: src/player_kart.cpp:264
+#: src/player_kart.cpp:262
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -820,17 +809,17 @@ msgstr ""
 msgid "Window mode"
 msgstr ""
 
-#: src/world.cpp:538
+#: src/world.cpp:535
 msgid "You finished"
 msgstr ""
 
-#: src/world.cpp:617
+#: src/world.cpp:614
 msgid ""
 "You have been\n"
 "eliminated!"
 msgstr ""
 
-#: src/world.cpp:537
+#: src/world.cpp:534
 msgid "You won"
 msgstr ""
 
@@ -868,6 +857,6 @@ msgstr ""
 msgid "not set"
 msgstr ""
 
-#: src/world.cpp:540
+#: src/world.cpp:537
 msgid "the race!"
 msgstr ""

data/po/sv.po

@@ -0,0 +1,965 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: SuperTuxKart 0.5\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2008-05-22 23:29+0100\n"
+"Last-Translator: Niklas Grahn <master_niklas@hotmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: SWEDEN\n"
+
+#: src/gui/config_display.cpp:385
+#, c-format
+msgid "%dx%d Blacklisted"
+msgstr "%dx%d svartlistad"
+
+#: src/world.cpp:622
+#, c-format
+msgid ""
+"'%s' has\n"
+"been eliminated."
+msgstr ""
+"'%s' har\n"
+"eliminerats"
+
+#: src/gui/player_controls.cpp:64
+msgid "Accelerate"
+msgstr "Gasa"
+
+#: src/gui/challenges_menu.cpp:36
+msgid "Active Challenges"
+msgstr "Aktiva utmaningar"
+
+#: data/all.cup:4
+msgid "All tracks"
+msgstr "Alla banor"
+
+#: data/all.cup:5
+msgid "All tracks included in SuperTuxKart"
+msgstr "Alla banor inkluderade i SuperTuxKart"
+
+#: data/tracks/jungle/jungle.track:4
+msgid "Amazonian Journey"
+msgstr "Amasonresa"
+
+#: src/gui/help_page_two.cpp:108
+msgid "Anvil - slows down greatly the kart in the first position"
+msgstr "Städ - saktar ned den ledande gokarten väldigt mycket"
+
+#: src/gui/config_display.cpp:92
+msgid "Apply "
+msgstr "Applicera"
+
+#: src/gui/config_display.cpp:351
+#, c-format
+msgid "Apply %dx%d"
+msgstr "Applicera %dx%d"
+
+#: data/tracks/lighthouse/lighthouse.track:4
+msgid "Around the Lighthouse"
+msgstr "Omkring fyren"
+
+#: src/gui/help_page_one.cpp:112
+msgid ""
+"At high speeds wheelies drive you faster, but you can't steer. If you\n"
+"get stuck or fall too far, use the rescue button to get back on track."
+msgstr ""
+"Vid höga hastigheter gör stegringar att du kör fortare, men kan inte styra.\n"
+"Om du fastnar eller faller för långt använd då räddningsknappen för att ta \n"
+"dig tillbaka på banan."
+
+#: data/gp4.cup:4
+msgid "At world's end"
+msgstr "Vid världens ände"
+
+#: src/gui/help_page_one.cpp:78
+msgid "Avoid bananas"
+msgstr "Undvik bananer"
+
+#: src/gui/grand_prix_ending.cpp:148
+#: src/gui/leader_result.cpp:152
+#: src/gui/race_results_gui.cpp:144
+msgid "Back to the main menu"
+msgstr "Tillbaka till huvudmenyn"
+
+#: src/gui/help_page_two.cpp:122
+msgid "Back to the menu"
+msgstr "Tillbaka till menyn"
+
+#: src/gui/player_controls.cpp:65
+msgid "Brake"
+msgstr "Bromsa"
+
+#: data/tracks/canyon/canyon.track:4
+msgid "Canyon"
+msgstr "Ravin"
+
+#: src/gui/main_menu.cpp:52
+msgid "Challenges"
+msgstr "Utmaningar"
+
+#: src/gui/help_page_one.cpp:117
+msgid "Check the current key bindings for the first player"
+msgstr "Kontrollera den första spelarens aktuella tangentkontroller"
+
+#: src/gui/grand_prix_select.cpp:50
+msgid "Choose a Grand Prix"
+msgstr "Välj en grand prix-tävling"
+
+#: src/gui/game_mode.cpp:45
+msgid "Choose a Race Mode"
+msgstr "Välj ett loppläge"
+
+#: src/gui/track_sel.cpp:49
+msgid "Choose a track"
+msgstr "Välj en bana"
+
+#: src/gui/player_controls.cpp:74
+#, c-format
+msgid "Choose your controls, %s"
+msgstr "Välj dina kontroller, %s"
+
+#: data/tracks/city/city.track:4
+msgid "City"
+msgstr "Stad"
+
+#: src/gui/config_display.cpp:97
+msgid "Clear from Blacklist"
+msgstr "Ta bort från svartlista"
+
+#: src/challenges/energy_math_class.cpp:26
+msgid "Collect Coins in Math Class"
+msgstr "Samla mynt i matematikklass"
+
+#: src/challenges/energy_math_class.cpp:28
+msgid ""
+"Collect at least 6 coins\n"
+"on three laps of\n"
+"Oliver's Math Class\n"
+"in under 1 minute."
+msgstr ""
+"Samla minst sex mynt\n"
+" på tre varv på\n"
+"Olivers matematikklass\n"
+"inom under en minut."
+
+#: src/challenges/energy_shifting_sands.cpp:27
+msgid ""
+"Collect at least 9 coins\n"
+"on 3 laps of Shifting Sands\n"
+"in under 2:20 minutes."
+msgstr ""
+"Samla minst nio mynt\n"
+" på tre varv på Shifting Sands\n"
+"på under 2:20 minuter."
+
+#: src/challenges/energy_shifting_sands.cpp:25
+msgid "Collect the Pharaohs Treasure"
+msgstr "Samla faraonens skatt"
+
+#: src/challenges/worlds_end_gp.cpp:27
+msgid ""
+"Come first in the At World's End\n"
+"Grand Prix with 3 'Racer'\n"
+"Level AI karts."
+msgstr "Kom först i grand prix-tävlingen"
+
+#: src/gui/display_res_confirm.cpp:55
+msgid "Confirm Resolution"
+msgstr "Bekräfta skärmupplösning"
+
+#: src/gui/display_res_confirm.cpp:109
+#, c-format
+msgid "Confirm Resolution Within %d Seconds"
+msgstr "Bekräfta skärmupplösning inom %d sekunder"
+
+#: src/gui/display_res_confirm.cpp:51
+msgid "Confirm Resolution Within 5 Seconds"
+msgstr "Bekräfta skärmupplösning inom fem sekunder"
+
+#: src/gui/feature_unlocked.cpp:47
+#: src/gui/grand_prix_ending.cpp:144
+#: src/gui/leader_result.cpp:148
+#: src/gui/race_results_gui.cpp:135
+msgid "Continue"
+msgstr "Fortsätt"
+
+#: src/gui/race_results_gui.cpp:140
+msgid "Continue Grand Prix"
+msgstr "Fortsätt grand prix-tävling"
+
+#: data/tracks/beach/beach.track:5
+#: data/tracks/lighthouse/lighthouse.track:5
+msgid ""
+"Created by Ingo Ruhnke,\n"
+"modified by M. Gagnon"
+msgstr ""
+"Skapad av Ingo Ruhnke,\n"
+"modifierad av M. Gagnon"
+
+#: data/tracks/fortmagma/fortmagma.track:5
+msgid ""
+"Created by Oliver & Steve Baker\n"
+"modified by Marianne Gagnon"
+msgstr ""
+"Skapad av Oliver & Steve Baker\n"
+"modifierad av Marianne Gagnon"
+
+#: data/tracks/snowtuxpeak/snowtuxpeak.track:5
+msgid ""
+"Created by Oliver & Steve Baker,\n"
+" modified by M. Gagnon"
+msgstr ""
+"Skapad av Oliver & Steve Baker,\n"
+" modifierad av M. Gagnon"
+
+#: data/tracks/sandtrack/sandtrack.track:5
+msgid ""
+"Created by Oliver & Steve Baker,\n"
+"modified by M. Gagnon"
+msgstr ""
+"Skapad av Oliver & Steve Baker,\n"
+"modifierad av M. Gagnon"
+
+#: src/gui/main_menu.cpp:63
+msgid "Credits"
+msgstr "Upphovsmän"
+
+#: src/gui/config_display.cpp:83
+#, c-format
+msgid "Current: %dx%d"
+msgstr "Nuvarande: %dx%d"
+
+#: src/gui/config_display.cpp:89
+msgid "Decrease Resolution"
+msgstr "Minska skärmupplösning"
+
+#: src/gui/race_options.cpp:62
+msgid "Difficulty"
+msgstr "Svårighetsgrad"
+
+#: src/gui/options.cpp:49
+msgid "Display"
+msgstr "Skärm"
+
+#: src/gui/config_display.cpp:55
+msgid "Display Settings"
+msgstr "Skärminställningar"
+
+#: src/gui/race_options.cpp:282
+msgid "Driver"
+msgstr "Förare"
+
+#: src/gui/config_controls.cpp:43
+msgid "Edit controls for who?"
+msgstr "Redigera kontroller för vem?"
+
+#: src/gui/race_menu.cpp:60
+msgid "Exit Race"
+msgstr "Avsluta lopp"
+
+#: src/challenges/race_track_time.cpp:28
+msgid ""
+"Finish 3 laps in the Race track\n"
+"with 3 AI karts\n"
+"in under 1:15 minutes."
+msgstr ""
+"Klara tre varv på Kapplöpningsbanan\n"
+"med tre AI-motståndare under 1:15 minuter."
+
+#: src/challenges/city_time.cpp:27
+msgid ""
+"Finish 3 laps on the City track\n"
+"with 3 AI karts\n"
+"in under 5:20 minutes."
+msgstr ""
+"Klara tre varv på Stadsbanan\n"
+"med tre AI-motståndare under 5:20 minuter."
+
+#: src/challenges/tollway_time.cpp:27
+msgid ""
+"Finish 3 laps on the Tux Tollway\n"
+"track with 3 AI karts\n"
+"in under 3:00 minutes."
+msgstr ""
+"Klara tre varv på Tux Tollway\n"
+"-banan med tre AI-motståndare\n"
+"på under tre minuter."
+
+#: src/challenges/race_track_time.cpp:26
+msgid "Finish Race track in 1:15"
+msgstr "Klara lopp inom 1:15"
+
+#: src/challenges/tollway_time.cpp:25
+msgid "Finish Tux Tollway track in 3:00"
+msgstr "Klara Tux Tollway-banan på tre minuter."
+
+#: src/challenges/city_time.cpp:25
+msgid "Finish the City track in 5:20"
+msgstr "Klara Stadsbanan på 5:20"
+
+#: src/gui/race_gui.cpp:800
+#, c-format
+msgid "Finished"
+msgstr "Klar"
+
+#: src/gui/player_controls.cpp:66
+msgid "Fire"
+msgstr "Skjut"
+
+#: data/gp1.cup:5
+msgid "First grand prix, easy to get started"
+msgstr "Första grand prix-tävlingen, lätt för att börja med"
+
+#: src/challenges/penguin_playground_gp.cpp:28
+#: src/gui/game_mode.cpp:74
+msgid "Follow the Leader"
+msgstr "Följ ledaren"
+
+#: src/challenges/jungle_follow.cpp:25
+msgid "Follow the Leader in the Jungle"
+msgstr "Följ ledaren i djungeln"
+
+#: src/challenges/island_follow.cpp:25
+msgid ""
+"Follow the Leader on a\n"
+"Desert Island"
+msgstr ""
+"Följ ledaren på a\n"
+"Ökenön"
+
+#: src/gui/help_page_three.cpp:74
+msgid ""
+"Follow the leader: Stay behind the leader kart.\n"
+"When the countdown reaches zero, a kart ahead\n"
+"of the leader or the last kart is eliminated."
+msgstr ""
+"Följ ledaren: Håll dig bakom den ledande gokarten.\n"
+"När nedräkningen når noll kommer en gokart framför\n"
+"eller den sista gokarten att elimineras."
+
+#: src/gui/help_page_one.cpp:73
+msgid "Force your rivals bite *your* dust!"
+msgstr "Tvinga dina motståndare att bita *ditt* gräs!"
+
+#: data/tracks/fortmagma/fortmagma.track:4
+msgid "Fort Magma"
+msgstr "Fort Magma"
+
+#: src/gui/num_players.cpp:40
+msgid "Four Players"
+msgstr "Fyra spelare"
+
+#: src/gui/config_display.cpp:76
+#: src/gui/config_display.cpp:128
+#: src/gui/config_display.cpp:183
+msgid "Fullscreen mode"
+msgstr "Fullskärmsläge"
+
+#: src/gui/help_page_two.cpp:84
+msgid "Fuzzy blob/Spark - very slow, but bounces from walls"
+msgstr "Otydlig plump/gnista - väldigt långsam, men studsar på väggar"
+
+#: src/gui/game_mode.cpp:79
+msgid "Game mode help"
+msgstr "Hjälp för spelsätt"
+
+#: src/gui/help_page_three.cpp:47
+msgid "Game modes"
+msgstr "Spelsätt"
+
+#: src/gui/challenges_menu.cpp:51
+#: src/gui/credits_menu.cpp:76
+msgid "Go back to the main menu"
+msgstr "Gå tillbaka till huvudmenyn"
+
+#: src/gui/help_page_one.cpp:148
+#: src/gui/help_page_three.cpp:87
+msgid "Go back to the menu"
+msgstr "Gå tillbaka till menyn"
+
+#: src/gui/race_gui.cpp:948
+msgid "Go!"
+msgstr "Gå!"
+
+#: src/gui/help_page_one.cpp:77
+msgid "Grab blue boxes and coins"
+msgstr "Ta blåa lådor och mynt"
+
+#: src/challenges/energy_math_class.cpp:29
+#: src/gui/game_mode.cpp:55
+msgid "Grand Prix"
+msgstr "Grand prix-tävling"
+
+#: src/gui/help_page_three.cpp:54
+msgid ""
+"Grand Prix: Win victory points \n"
+"by racing through a group of tracks,  \n"
+"most points wins (shortest time in case of a tie!)          "
+msgstr ""
+"Grand prix-tävling: Vinn segrarpoäng \n"
+"genom att köra ett gäng banor, \n"
+"flest poäng vinner (snabbast tid om det blir lika!)"
+
+#: src/gui/main_menu.cpp:60
+#: src/gui/race_menu.cpp:51
+msgid "Help"
+msgstr "Hjälp"
+
+#: src/gui/race_results_gui.cpp:55
+msgid "Highscores"
+msgstr "Topplista"
+
+#: src/gui/help_page_two.cpp:76
+msgid "Homing missile - follows rivals, but is slower than the missile"
+msgstr "Målsökande missil - följer rivaler, men är långsammare än missilen"
+
+#: src/gui/config_display.cpp:87
+msgid "Increase Resolution"
+msgstr "Öka skärmupplösning"
+
+#: src/user_config.cpp:861
+#, c-format
+msgid "Invalid"
+msgstr "Ogiltig"
+
+#: src/kart.cpp:634
+msgid "Invalid short-cut!!"
+msgstr "Ogiltig genväg"
+
+#: src/gui/player_controls.cpp:65
+msgid "Jump"
+msgstr "Hoppa"
+
+#: src/gui/race_gui.cpp:805
+msgid "Lap"
+msgstr "Varv"
+
+#: data/gp4.cup:5
+msgid "Last grand prix, longer and harder"
+msgstr "Sista grand prix-tävlingen, längre och svårare"
+
+#: src/gui/race_gui.cpp:409
+msgid "Leader"
+msgstr "Ledare"
+
+#: src/gui/player_controls.cpp:64
+msgid "Left"
+msgstr "Vänster"
+
+#: data/tracks/littlevolcano/littlevolcano.track:4
+msgid "Little Volcano"
+msgstr "Lilla vulkanen"
+
+#: src/gui/start_race_feedback.cpp:35
+msgid "Loading race..."
+msgstr "Laddar lopp..."
+
+#: src/gui/player_controls.cpp:66
+msgid "Look back"
+msgstr "Titta bakåt"
+
+#: src/gui/help_page_two.cpp:68
+msgid "Missile - fast stopper in a straight line"
+msgstr "Missil - en rak snabbmissil"
+
+#: src/gui/main_menu.cpp:47
+msgid "Multiplayer"
+msgstr "Flerspelarläge"
+
+#: src/gui/feature_unlocked.cpp:37
+msgid "New Feature Unlocked"
+msgstr "Ny finess upplåst"
+
+#: src/challenges/challenge.cpp:121
+#, c-format
+msgid ""
+"New Grand Prix '%s'\n"
+"now available"
+msgstr ""
+"Ny grand prix-tävling '%s'\n"
+"nu tillgänglig"
+
+#: src/challenges/challenge.cpp:124
+#, c-format
+msgid ""
+"New difficulty\n"
+"'%s'\n"
+"now available"
+msgstr ""
+"Ny svårighetsgrad\n"
+"'%s'\n"
+"är nu tillgänglig"
+
+#: src/kart.cpp:400
+msgid "New fastest lap"
+msgstr "Nytt snabbaste varv"
+
+#: src/challenges/challenge.cpp:118
+#, c-format
+msgid ""
+"New game mode\n"
+"'%s'\n"
+"now available"
+msgstr ""
+"Nytt spelsätt\n"
+"'%s'\n"
+"är nu tillgängligt"
+
+#: src/challenges/challenge.cpp:114
+#, c-format
+msgid ""
+"New track '%s'\n"
+"now available"
+msgstr ""
+"Ny bana '%s'\n"
+"är nu tillgänglig"
+
+#: src/gui/help_page_one.cpp:144
+#: src/gui/help_page_two.cpp:118
+msgid "Next help screen"
+msgstr "Nästa hjälpskärm"
+
+#: src/gui/grand_prix_select.cpp:71
+#: src/gui/grand_prix_select.cpp:76
+msgid "No Grand Prix selected"
+msgstr "Ingen grand prix-tävling vald"
+
+#: src/gui/track_sel.cpp:86
+msgid "No track selected"
+msgstr "Ingen bana vald"
+
+#: src/gui/race_options.cpp:281
+#: src/gui/race_options.cpp:285
+msgid "Novice"
+msgstr "Nybörjare"
+
+#: src/gui/race_options.cpp:80
+msgid "Number of karts"
+msgstr "Antal gokarter"
+
+#: src/gui/race_options.cpp:106
+msgid "Number of laps"
+msgstr "Antal varv"
+
+#: src/user_config.cpp:488
+msgid "Old config file found, check your key bindings!"
+msgstr "Gammal konfigureringsfil hittad, kontrollera dina tangentkontroller"
+
+#: data/tracks/olivermath/olivermath.track:4
+msgid "Oliver's Math Class"
+msgstr "Olivers matematikklass"
+
+#: data/tracks/beach/beach.track:4
+msgid "On the Beach"
+msgstr "På stranden"
+
+#: src/gui/main_menu.cpp:55
+#: src/gui/options.cpp:40
+#: src/gui/race_menu.cpp:50
+msgid "Options"
+msgstr "Inställningar"
+
+#: src/gui/help_page_two.cpp:100
+msgid "Parachute - slows down all karts in a better position!"
+msgstr "Fallskärm - saktar ned alla gokarter i en bättre position!"
+
+#: src/gui/race_menu.cpp:47
+msgid "Paused"
+msgstr "Pausat"
+
+#: src/gui/race_gui.cpp:974
+msgid "Penalty time!!"
+msgstr "Strafftid!!"
+
+#: data/gp1.cup:4
+msgid "Penguin Playground"
+msgstr "Penguin Playground"
+
+#: src/gui/player_controls.cpp:251
+msgid "Player "
+msgstr "Spelare"
+
+#: src/gui/char_sel.cpp:68
+#, c-format
+msgid "Player %d, choose a driver"
+msgstr "Spelare %d, välj en förare"
+
+#: src/gui/config_controls.cpp:45
+msgid "Player 1"
+msgstr "Spelare 1"
+
+#: src/gui/config_controls.cpp:46
+msgid "Player 2"
+msgstr "Spelare 2"
+
+#: src/gui/config_controls.cpp:47
+msgid "Player 3"
+msgstr "Spelare 3"
+
+#: src/gui/config_controls.cpp:48
+msgid "Player 4"
+msgstr "Spelare 4"
+
+#: src/gui/options.cpp:41
+msgid "Player Config"
+msgstr "Konfigurera spelare"
+
+#: src/gui/player_controls.cpp:80
+msgid "Player name"
+msgstr "Spelares namn"
+
+#: src/gui/display_res_confirm.cpp:59
+msgid "Press <ESC> to Cancel"
+msgstr "Tryck <ESC> för att avbryta"
+
+#: src/gui/config_controls.cpp:52
+#: src/gui/config_display.cpp:101
+#: src/gui/config_sound.cpp:63
+#: src/gui/game_mode.cpp:84
+#: src/gui/grand_prix_select.cpp:87
+#: src/gui/num_players.cpp:45
+#: src/gui/options.cpp:57
+#: src/gui/player_controls.cpp:112
+#: src/gui/race_options.cpp:134
+msgid "Press <ESC> to go back"
+msgstr "Tryck <ESC> för att gå tillbaka"
+
+#: src/gui/player_controls.cpp:156
+msgid "Press key"
+msgstr "Tryck knapp"
+
+#: src/gui/help_page_three.cpp:83
+msgid "Previous help screen"
+msgstr "Föregående hjälpskärm"
+
+#: src/gui/help_page_two.cpp:114
+msgid "Previous screen"
+msgstr "Föregående skärm"
+
+#: src/gui/game_mode.cpp:58
+msgid "Quick Race"
+msgstr "Snabblopp"
+
+#: src/gui/help_page_three.cpp:62
+msgid "Quick race: Pick a single track, shortest time wins.         "
+msgstr "Snabblopp: Välj en enda bana, snabbast tid vinner."
+
+#: src/gui/main_menu.cpp:56
+msgid "Quit"
+msgstr "Avsluta"
+
+#: src/gui/race_gui.cpp:746
+msgid "REV"
+msgstr "REV"
+
+#: data/tracks/race/race.track:4
+msgid "Race Track"
+msgstr "Kapplöpningsbana"
+
+#: src/gui/race_results_gui.cpp:148
+msgid "Race in this track again"
+msgstr "Kör denna bana igen"
+
+#: src/gui/race_results_gui.cpp:54
+msgid "Race results"
+msgstr "Loppresultat"
+
+#: src/gui/race_options.cpp:283
+msgid "Racer"
+msgstr "Racer"
+
+#: src/gui/race_gui.cpp:930
+msgid "Ready!"
+msgstr "Klara!"
+
+#: src/gui/player_controls.cpp:66
+msgid "Rescue"
+msgstr "Rädda"
+
+#: src/gui/race_menu.cpp:52
+msgid "Restart Race"
+msgstr "Starta om bana"
+
+#: src/gui/race_results_gui.cpp:48
+msgid "Result"
+msgstr "Resultat"
+
+#: src/gui/race_menu.cpp:49
+msgid "Return To Race"
+msgstr "Återvänd till bana"
+
+#: src/gui/player_controls.cpp:64
+msgid "Right"
+msgstr "Höger"
+
+#: data/gp2.cup:5
+msgid "Second grand prix"
+msgstr "Andra grand prix-tävlingen"
+
+#: src/gui/race_gui.cpp:939
+msgid "Set!"
+msgstr "Färdiga!"
+
+#: src/gui/race_menu.cpp:57
+#: src/gui/race_results_gui.cpp:153
+msgid "Setup New Race"
+msgstr "Ordna ett nytt lopp"
+
+#: data/tracks/sandtrack/sandtrack.track:4
+msgid "Shifting Sands"
+msgstr "Shifting Sands"
+
+#: src/gui/main_menu.cpp:46
+msgid "Single Player"
+msgstr "Enspelarläge"
+
+#: src/gui/race_options.cpp:284
+msgid "Skidding Preview"
+msgstr "Sladdningsförhandstitt"
+
+#: data/gp3.cup:4
+msgid "Snag Drive"
+msgstr "Snag Drive"
+
+#: data/tracks/snowtuxpeak/snowtuxpeak.track:4
+msgid "SnowTux Peak"
+msgstr "SnowTux Peak"
+
+#: src/gui/options.cpp:52
+msgid "Sound"
+msgstr "Ljud"
+
+#: src/gui/config_sound.cpp:40
+msgid "Sound Settings"
+msgstr "Ljudinställningar"
+
+#: data/tracks/startrack/startrack.track:4
+msgid "Star Track"
+msgstr "Stjärnbana"
+
+#: src/gui/race_options.cpp:129
+msgid "Start race"
+msgstr "Starta lopp"
+
+#: data/tracks/subseatrack/subseatrack.track:4
+msgid "Sub Sea"
+msgstr "Under vatten"
+
+#: data/tracks/islandtrack/islandtrack.track:4
+msgid "The Island"
+msgstr "Ön"
+
+#: src/gui/grand_prix_ending.cpp:107
+#: src/gui/leader_result.cpp:109
+#, c-format
+msgid "The winner is %s!"
+msgstr "Vinnaren är %s!"
+
+#: data/gp3.cup:5
+msgid "Third grand prix"
+msgstr "Tredje grand prix-tävlingen"
+
+#: src/gui/num_players.cpp:39
+msgid "Three Players"
+msgstr "Tre spelare"
+
+#: src/gui/game_mode.cpp:62
+msgid "Time Trial"
+msgstr "Tidsförsök"
+
+#: src/gui/help_page_three.cpp:67
+msgid "Time Trial: As quick race, but no items.                       "
+msgstr "Tidsförsök: Som snabblopp, men inga föremål"
+
+#: src/gui/help_page_two.cpp:61
+msgid "To help you win, there are certain collectables you can grab:"
+msgstr "För att hjälpa dig att vinna finns det vissa samlarföremål du kan ta:"
+
+#: data/gp2.cup:4
+msgid "To the Moon and Back"
+msgstr "Till månen och tillbaka"
+
+#: src/gui/config_sound.cpp:45
+#: src/gui/config_sound.cpp:90
+msgid "Turn off music"
+msgstr "Stäng av musik"
+
+#: src/gui/config_sound.cpp:54
+#: src/gui/config_sound.cpp:103
+msgid "Turn off sound effects"
+msgstr "Stäng av ljudeffekter"
+
+#: src/gui/config_sound.cpp:49
+#: src/gui/config_sound.cpp:84
+msgid "Turn on music"
+msgstr "Slå på musik"
+
+#: src/gui/config_sound.cpp:58
+#: src/gui/config_sound.cpp:98
+msgid "Turn on sound effects"
+msgstr "Slå på ljudeffekter"
+
+#: data/tracks/tuxtrack/tuxtrack.track:4
+msgid "Tux Tollway"
+msgstr "Tux Tollway"
+
+#: src/gui/num_players.cpp:38
+msgid "Two Players"
+msgstr "Två spelare"
+
+#: data/tracks/volcano/volcano.track:4
+msgid "Volcano"
+msgstr "Vulkan"
+
+#: src/player_kart.cpp:264
+msgid "WRONG WAY!"
+msgstr "FEL VÄG!"
+
+#: src/gui/player_controls.cpp:65
+msgid "Wheelie"
+msgstr "Stegring"
+
+#: src/challenges/penguin_playground_gp.cpp:25
+msgid ""
+"Win Penguin Playground Grand\n"
+"Prix"
+msgstr ""
+"Vinn grand prix-tävlingen\n"
+"på Penguin Playground"
+
+#: src/challenges/penguin_playground_gp.cpp:27
+msgid ""
+"Win Penguin Playground Grand\n"
+"Prix with 3 'Racer' Level AI karts."
+msgstr ""
+"Vinn grand prix-tävlingen\n"
+"på Penguin Playground med\n"
+"tre AI-motståndare på 'racer'nivå."
+
+#: src/challenges/moon_and_back_gp.cpp:25
+msgid ""
+"Win To the Moon and Back\n"
+"Grand Prix"
+msgstr ""
+"Vinn grand prix-tävlingen på\n"
+"Till månen och tillbaka"
+
+#: src/challenges/tollway_head2head.cpp:27
+msgid ""
+"Win a 1 lap Head to Head\n"
+"on Tux Tollway against 1 'Racer'\n"
+"level AI kart."
+msgstr ""
+"Vinn ett Head to Head-varv\n"
+"på Tux Tollway mot en\n"
+"AI-motståndare på 'racer'nivå."
+
+#: src/challenges/jungle_follow.cpp:27
+msgid ""
+"Win a Follow the Leader race\n"
+"with 3 AI karts\n"
+"in the Amazonian Jungle."
+msgstr ""
+"Vinn ett Följ ledaren-lopp\n"
+"med tre AI-motståndare\n"
+"på Amasondjungeln."
+
+#: src/challenges/island_follow.cpp:27
+msgid ""
+"Win a Follow the Leader race\n"
+"with 3 AI karts\n"
+"on a Desert Island."
+msgstr ""
+"Vinn ett Följ ledaren-lopp\n"
+"med tre AI-motståndare\n"
+"på Ökenön."
+
+#: src/challenges/tollway_head2head.cpp:25
+msgid ""
+"Win a Head to Head on\n"
+"Tux Tollway"
+msgstr ""
+"Vinn ett Head to Head-lopp\n"
+"på Tux Tollway"
+
+#: src/challenges/worlds_end_gp.cpp:25
+msgid ""
+"Win the At World's End\n"
+"Grand Prix"
+msgstr ""
+"Vinn grand prix-tävlingen\n"
+"på Vid världens ände"
+
+#: src/challenges/moon_and_back_gp.cpp:27
+msgid ""
+"Win the To the Moon and Back\n"
+"Grand Prix with 3 'Racer'\n"
+"Level AI karts."
+msgstr ""
+"Vinn grand prix-tävlingen på\n"
+"Till månen och tillbaka med\n"
+"tre AI-motståndare på 'racer'nivå."
+
+#: src/gui/config_display.cpp:71
+msgid "Window mode"
+msgstr "Fönsterläge"
+
+#: src/world.cpp:538
+msgid "You finished"
+msgstr "Du kom i mål"
+
+#: src/world.cpp:617
+msgid ""
+"You have been\n"
+"eliminated!"
+msgstr ""
+"Du har blivit\n"
+"eliminerad!"
+
+#: src/world.cpp:537
+msgid "You won"
+msgstr "Du vann"
+
+#: src/gui/help_page_two.cpp:92
+msgid "Zipper - speed boost"
+msgstr "Zipper - hastighetsökare"
+
+#: src/user_config.cpp:844
+#, c-format
+msgid "joy %d axis %d  %c"
+msgstr "joy %d axek %d  %c"
+
+#: src/user_config.cpp:848
+#, c-format
+msgid "joy %d btn %d"
+msgstr "joy %d btn %d"
+
+#: src/user_config.cpp:851
+#, c-format
+msgid "joy %d hat %d"
+msgstr "joy %d hat %d"
+
+#: src/user_config.cpp:857
+#, c-format
+msgid "mouse axis %d %c"
+msgstr "musaxel  %d %c"
+
+#: src/user_config.cpp:854
+#, c-format
+msgid "mouse btn %d"
+msgstr "mus btn %d"
+
+#: src/user_config.cpp:838
+#: src/user_config.cpp:883
+#, c-format
+msgid "not set"
+msgstr "inte konfigurerat"
+
+#: src/world.cpp:540
+msgid "the race!"
+msgstr "loppet!"
+

data/supertuxkart_32.xpm

@@ -1,305 +1,226 @@
 /* XPM */
-static char * tux_icon_32x32_xpm[] = {
+static char * supertuxkart_32_xpm[] = {
-"32 32 270 2",
+"32 32 191 2",
 "  	c None",
-". 	c #040204",
+". 	c #000000",
-"+ 	c #0C0B0B",
+"+ 	c #C4C4C4",
-"@ 	c #121212",
+"@ 	c #939392",
-"# 	c #050405",
+"# 	c #888887",
-"$ 	c #060406",
+"$ 	c #BDBCB4",
-"% 	c #3C3B3B",
+"% 	c #FACA00",
-"& 	c #A1A1A1",
+"& 	c #CFA400",
-"* 	c #242224",
+"* 	c #262315",
-"= 	c #262626",
+"= 	c #850303",
-"- 	c #7E7F7F",
+"- 	c #920000",
-"; 	c #303031",
+"; 	c #8A0002",
-"> 	c #424243",
+"> 	c #820000",
-", 	c #2E2D2E",
+", 	c #860000",
-"' 	c #5A5958",
+"' 	c #860001",
-") 	c #686868",
+") 	c #700000",
-"! 	c #505050",
+"! 	c #050200",
-"~ 	c #4B4A4B",
+"~ 	c #D2AB00",
-"{ 	c #1C1A1B",
+"{ 	c #D9B100",
-"] 	c #5A5750",
+"] 	c #D4AD00",
-"^ 	c #2B261B",
+"^ 	c #E6B900",
-"/ 	c #4C4635",
+"/ 	c #C84C4A",
-"( 	c #777676",
+"( 	c #B90000",
-"_ 	c #202020",
+"_ 	c #B70000",
-": 	c #D9920C",
+": 	c #C32D2B",
-"< 	c #3B2E09",
+"< 	c #A50000",
-"[ 	c #9C810A",
+"[ 	c #B40000",
-"} 	c #BD9607",
+"} 	c #AD0000",
-"| 	c #9D7207",
+"| 	c #AE0004",
-"1 	c #19120A",
+"1 	c #AC0000",
-"2 	c #060405",
+"2 	c #A30106",
-"3 	c #583814",
+"3 	c #FEFFFF",
-"4 	c #D47B1E",
+"4 	c #E8C115",
-"5 	c #C46510",
+"5 	c #E9C019",
-"6 	c #DC9C0C",
+"6 	c #FFFFFF",
-"7 	c #FCEC0C",
+"7 	c #2E2D2B",
-"8 	c #CD870D",
+"8 	c #462C1D",
-"9 	c #080608",
+"9 	c #F7F7F7",
-"0 	c #807028",
+"0 	c #FAFAF8",
-"a 	c #D7BB1A",
+"a 	c #FAFAFA",
-"b 	c #E2B20B",
+"b 	c #434343",
-"c 	c #C8930A",
+"c 	c #262726",
-"d 	c #7E5A0C",
+"d 	c #6A6A6A",
-"e 	c #262322",
+"e 	c #F6F6F6",
-"f 	c #050305",
+"f 	c #EEECEC",
-"g 	c #985614",
+"g 	c #FEFDFD",
-"h 	c #BC600F",
+"h 	c #020202",
-"i 	c #D4940C",
+"i 	c #575857",
-"j 	c #FCE30C",
+"j 	c #E1E2E1",
-"k 	c #A26F16",
+"k 	c #0C0C0C",
-"l 	c #313131",
+"l 	c #1E1F1E",
-"m 	c #3E3D3E",
+"m 	c #F0C9B3",
-"n 	c #BEAC48",
+"n 	c #EEEEEE",
-"o 	c #E8C616",
+"o 	c #232323",
-"p 	c #EBB40D",
+"p 	c #F4F4F4",
-"q 	c #B0810F",
+"q 	c #6B6B6B",
-"r 	c #C0B398",
+"r 	c #040404",
-"s 	c #606060",
+"s 	c #070807",
-"t 	c #070607",
+"t 	c #262626",
-"u 	c #1A0E06",
+"u 	c #141514",
-"v 	c #AA560E",
+"v 	c #C0A291",
-"w 	c #CD820C",
+"w 	c #010100",
-"x 	c #F8C40C",
+"x 	c #5A5A5A",
-"y 	c #AA7316",
+"y 	c #474747",
-"z 	c #2C2C2B",
+"z 	c #B5B5B5",
-"A 	c #072907",
+"A 	c #595959",
-"B 	c #040804",
+"B 	c #10100F",
-"C 	c #949594",
+"C 	c #6F5447",
-"D 	c #D8CE93",
+"D 	c #CACACA",
-"E 	c #DEBA15",
+"E 	c #0A0A0A",
-"F 	c #C89914",
+"F 	c #8C8C8C",
-"G 	c #D2BEA4",
+"G 	c #8E8E8E",
-"H 	c #F8F8F8",
+"H 	c #030303",
-"I 	c #C4C4C4",
+"I 	c #BB0000",
-"J 	c #121112",
+"J 	c #CB0000",
-"K 	c #4B2608",
+"K 	c #F0F0F0",
-"L 	c #EEB50C",
+"L 	c #575757",
-"M 	c #F2CC0C",
+"M 	c #8E0000",
-"N 	c #DD970C",
+"N 	c #6A0000",
-"O 	c #452B1A",
+"O 	c #390000",
-"P 	c #095009",
+"P 	c #B60000",
-"Q 	c #0B6A0B",
+"Q 	c #F9F9F9",
-"R 	c #083608",
+"R 	c #FBFBFA",
-"S 	c #3A3D3A",
+"S 	c #FAFAFB",
-"T 	c #BEBEBE",
+"T 	c #D4D4D4",
-"U 	c #E5E5E4",
+"U 	c #E6E6E6",
-"V 	c #F7F6F7",
+"V 	c #656565",
-"W 	c #F4F4F4",
+"W 	c #6E0000",
-"X 	c #F5F5F5",
+"X 	c #9E0000",
-"Y 	c #F6F6F6",
+"Y 	c #A40000",
-"Z 	c #C2C2C2",
+"Z 	c #220000",
-"` 	c #1A191A",
+"` 	c #464646",
-" .	c #080404",
+" .	c #A10000",
-"..	c #8D550A",
+"..	c #9F0000",
-"+.	c #FCD80C",
+"+.	c #B80000",
-"@.	c #EEB30C",
+"@.	c #560000",
-"#.	c #C5740C",
+"#.	c #242424",
-"$.	c #051905",
+"$.	c #FBFCFF",
-"%.	c #0A590A",
+"%.	c #F8F8F8",
-"&.	c #6D8472",
+"&.	c #FEFEFE",
-"*.	c #999999",
+"*.	c #ACB4D2",
-"=.	c #9E9E9D",
+"=.	c #A95A01",
-"-.	c #B6B6B5",
+"-.	c #D97B00",
-";.	c #CCCCCB",
+";.	c #190000",
-">.	c #D8D9C4",
+">.	c #4A0000",
-",.	c #CECEB2",
+",.	c #A60000",
-"'.	c #A5A683",
+"'.	c #BC0000",
-").	c #44441A",
+").	c #DB0000",
-"!.	c #393809",
+"!.	c #B49500",
-"~.	c #241706",
+"~.	c #E9BD00",
-"{.	c #D08A0C",
+"{.	c #EABF00",
-"].	c #FCE50C",
+"].	c #E8BA00",
-"^.	c #F3C30C",
+"^.	c #EDCF59",
-"/.	c #CE7D0D",
+"/.	c #FCFFFF",
-"(.	c #0C0A1D",
+"(.	c #CCAA11",
-"_.	c #0A08F9",
+"_.	c #BF9C01",
-":.	c #3331B4",
+":.	c #E9BF00",
-"<.	c #54528D",
+"<.	c #E7BC00",
-"[.	c #6564DE",
+"[.	c #F4DF00",
-"}.	c #8B8A98",
+"}.	c #9E0200",
-"|.	c #C8C86F",
+"|.	c #5B0000",
-"1.	c #D1D07D",
+"1.	c #A20000",
-"2.	c #DDDD90",
+"2.	c #EFC800",
-"3.	c #A7A865",
+"3.	c #EDC500",
-"4.	c #424013",
+"4.	c #EECA00",
-"5.	c #1C0B06",
+"5.	c #EDCB00",
-"6.	c #EFA70C",
+"6.	c #F0CF00",
-"7.	c #FCF12A",
+"7.	c #F2D700",
-"8.	c #FCEC1D",
+"8.	c #4D4702",
-"9.	c #F6CC0C",
+"9.	c #C36800",
-"0.	c #B26C0D",
+"0.	c #A82400",
-"a.	c #5D3908",
+"a.	c #980000",
-"b.	c #121045",
+"b.	c #C20000",
-"c.	c #0402F8",
+"c.	c #640000",
-"d.	c #262455",
+"d.	c #430000",
-"e.	c #121147",
+"e.	c #0E0000",
-"f.	c #4746AE",
+"f.	c #C10000",
-"g.	c #F7F7F7",
+"g.	c #9C0000",
-"h.	c #BFBFBF",
+"h.	c #A30200",
-"i.	c #100F10",
+"i.	c #680000",
-"j.	c #0E0505",
+"j.	c #A00000",
-"k.	c #F1A40C",
+"k.	c #310000",
-"l.	c #FCF744",
+"l.	c #2D2D2D",
-"m.	c #FCE82C",
+"m.	c #A70000",
-"n.	c #F7C40C",
+"n.	c #E6EDED",
-"o.	c #80480A",
+"o.	c #000101",
-"p.	c #070404",
+"p.	c #A1A1A1",
-"q.	c #3A0608",
+"q.	c #010101",
-"r.	c #0D0861",
+"r.	c #B50000",
-"s.	c #0402EE",
+"s.	c #A30000",
-"t.	c #675B29",
+"t.	c #B30000",
-"u.	c #564872",
+"u.	c #5C0000",
-"v.	c #6764AC",
+"v.	c #B00000",
-"w.	c #E8E8E8",
+"w.	c #9D0000",
-"x.	c #2C2B2C",
+"x.	c #A80000",
-"y.	c #C27A0C",
+"y.	c #AA0000",
-"z.	c #FBE40C",
+"z.	c #900000",
-"A.	c #FAD00D",
+"A.	c #212120",
-"B.	c #EDA60C",
+"B.	c #150000",
-"C.	c #492607",
+"C.	c #A90000",
-"D.	c #710A0C",
+"D.	c #AB0000",
-"E.	c #2F057E",
+"E.	c #B20000",
-"F.	c #060493",
+"F.	c #B10000",
-"G.	c #B8AC8D",
+"G.	c #2E2E2E",
-"H.	c #5046A0",
+"H.	c #AF0000",
-"I.	c #0402F9",
+"I.	c #AE0000",
-"J.	c #8886A9",
+"J.	c #BE4E4E",
-"K.	c #F0EFF0",
+"K.	c #DD9C9C",
-"L.	c #9C600B",
+"L.	c #F8FFFF",
-"M.	c #F6C10E",
+"M.	c #F9FFFF",
-"N.	c #F7B60C",
+"N.	c #B91A1A",
-"O.	c #C17D0B",
+"O.	c #B52323",
-"P.	c #720A0C",
+"P.	c #C46161",
-"Q.	c #2C0597",
+"Q.	c #D17D7D",
-"R.	c #3B3A4B",
+"R.	c #E4C2C2",
-"S.	c #F3F3F3",
+"S.	c #EFFBFB",
-"T.	c #7271AE",
+"T.	c #F1FFFF",
-"U.	c #ACACB6",
+"U.	c #F0FCFC",
-"V.	c #F5F6F5",
+"V.	c #F0F2F2",
-"W.	c #DDDEDD",
+"W.	c #F3F2F1",
-"X.	c #161516",
+"X.	c #F4F1F1",
-"Y.	c #6C4408",
+"Y.	c #F1EFEF",
-"Z.	c #E08F0C",
+"Z.	c #ECF2F2",
-"`.	c #E4960C",
+"`.	c #EAEDED",
-" +	c #E1910C",
+" +	c #E9EBEB",
-".+	c #BE7B0B",
+".+	c #EBEAEA",
-"++	c #1E0406",
+"++	c #EAE8E8",
-"@+	c #6F0A0C",
+"@+	c #EFEDEC",
-"#+	c #200470",
+"#+	c #F0ECEA",
-"$+	c #8E8E8E",
+"$+	c #F1F0F1",
-"%+	c #9190AE",
+"%+	c #E7E6E7",
-"&+	c #0A08D6",
+"                                                                ",
-"*+	c #C8C7CE",
+"                                                                ",
-"=+	c #EFEFEF",
+"                                                                ",
-"-+	c #ECECEC",
+"                                                                ",
-";+	c #EAEAE9",
+"                                                                ",
-">+	c #858685",
+"                          . . . .                               ",
-",+	c #210406",
+"                          . . . .                               ",
-"'+	c #72160A",
+"                        . . + @ # .                             ",
-")+	c #A64A0C",
+"                        . . $ % & *                             ",
-"!+	c #9B4F0C",
+"          = - ; > , ' ) . ! ~ { ] ^ / (                         ",
-"~+	c #E3920C",
+"      _ : < [ } | 1 2   . . 3 4 5 6                             ",
-"{+	c #C07E0B",
+"              7       8 . . 9 0 0 a b                           ",
-"]+	c #050204",
+"              c       . . d 9 e 6 f g h                         ",
-"^+	c #180305",
+"          i j k l   m h . n 6 o p 6 q . .                       ",
-"/+	c #6B0A0C",
+"          r s t u . v w . . x y z n A . .                       ",
-"(+	c #740A0C",
+"          B .   . . C . . . . D E . F G H . . .                 ",
-"_+	c #7A0A0C",
+"  . . . . . .   I J . . 6 6 K L 6 . r 6 M N . . .               ",
-":+	c #800A0C",
+"  . . . . . O < P P . . Q R S 6 T U V 6 W X Y Z .               ",
-"<+	c #35216F",
+"  ` . . . .  . ...+.@.. #.$.6 $.%.&.. *.=.-.X ;.)               ",
-"[+	c #AFA68D",
+"  . . . . >.Y ,. .'.).. !.~.{.].^./.(._.{.:.<.[.}.              ",
-"}+	c #9D9A98",
+"  . . . . |...X  .1. .2.3.4.5.6.7.8.6.. 9.0.a.< b.. . . . .     ",
-"|+	c #1614BA",
+"  . . . . . 1 W c.d.e.. f.1. .Y  .g.h.i.( j.Y j.k.. l.. . . .   ",
-"1+	c #A68184",
+"  . . . . . . . . . . . . j. .Y  .<  .1.1 1.1.1.m.. n.o.. . . . ",
-"2+	c #AF8484",
+"            . p.q.. . . . r.,.j.j.< X < m.j.1.s.1.j.s._ t.u.. . ",
-"3+	c #A66F6F",
+"            . d q.. . . . v.1.< j.Y j.g.m.j.1... ...w.s.< x.y.z.",
-"4+	c #8A494A",
+"            A.q.. . B.b.,.C.,.D...1.,. .s.1.1.Y D.1 E.r.E.F.[ F.",
-"5+	c #650D0E",
+"            G.. . } x.x.} E.t.t.F.F.H.I.} I.I.H.1 1 < x.J.K.L.M.",
-"6+	c #820A0C",
+"              . . 6 N.v.H.1 C.x.x.y.O.P.Q.R.S.T.U.V.W.X.        ",
-"7+	c #5E0A0C",
+"                    Y.Z.`. +.+++@+#+$+%+                        ",
-"8+	c #520A0C",
-"9+	c #120305",
-"0+	c #6C090B",
-"a+	c #7E0A0C",
-"b+	c #830F10",
-"c+	c #D6A623",
-"d+	c #DAC180",
-"e+	c #DADADA",
-"f+	c #C69F23",
-"g+	c #4A366F",
-"h+	c #760A0C",
-"i+	c #701212",
-"j+	c #D51F1E",
-"k+	c #BD1919",
-"l+	c #A51314",
-"m+	c #8D0D0E",
-"n+	c #6C0935",
-"o+	c #886665",
-"p+	c #614E2E",
-"q+	c #A59670",
-"r+	c #F2BE0F",
-"s+	c #88591C",
-"t+	c #5D0A0C",
-"u+	c #120406",
-"v+	c #5A0F10",
-"w+	c #F02624",
-"x+	c #E22221",
-"y+	c #C62026",
-"z+	c #931854",
-"A+	c #7A2349",
-"B+	c #80444C",
-"C+	c #5D163E",
-"D+	c #780A0C",
-"E+	c #3B080A",
-"F+	c #420C0D",
-"G+	c #EE2624",
-"H+	c #D9201F",
-"I+	c #C11A1A",
-"J+	c #A91414",
-"K+	c #900E0F",
-"L+	c #830A0C",
-"M+	c #610A0C",
-"N+	c #290E10",
-"O+	c #E62422",
-"P+	c #C31C1B",
-"Q+	c #550F11",
-"R+	c #2C292A",
-"S+	c #DE2322",
-"T+	c #0A0507",
-"U+	c #E52422",
 "                                                                ",
 "                                                                ",
-"                              . . . . .                         ",
-"                              . . . . . .                       ",
-"                            . . . . . . .                       ",
-"                            + @ . # $ . .                       ",
-"                            % & * = - ; .                       ",
-"                            > , ' ) ! ~ .                       ",
-"                            { ] ^ / ( _ .         :             ",
-"                            < [ } | 1 2 . 3 4 5 6 7 8           ",
-"                          9 0 a b c d e f . g h i j k l         ",
-"                    . . . m n o p q r s t . u v w x y z         ",
-"                  A B . $ C D E F G H I J . . K L M N O         ",
-"                . P Q R S T U V W X Y Z ` .  ...+.7 @.#.        ",
-"                  . $.%.&.*.=.-.;.>.,.'.).!.~.{.].7 ^./.        ",
-"                  . . (._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.      ",
-"                  . . b.c.d.e.c.f.g.H H h.i.j.k.l.m.n.o.p.. .   ",
-"                  . q.r.s.t.u.c.v.X H H w.x.. y.z.A.B.C.. . .   ",
-"                    D.E.F.G.H.I.J.X H H K.x.. L.M.N.O. .. . .   ",
-"    . . . . .     P.P.Q.R.S.T.s.U.S.W V.W.X.Y.Z.`. +.+. . . .   ",
-"  . . . . . . ++@+P.P.#+$+g.%+&+*+=+-+;+>+,+'+)+!+~+{+]+. . .   ",
-"  . . . . . ^+/+(+_+:+<+[+V }+|+1+2+3+4+5+6+6+7+8+          .   ",
-"  . . . . 9+0+a+6+6+b+c+d+e+f+g+6+6+6+6+6+6+h+8+                ",
-"  . . . . i+j+k+l+m+n+o+p+q+r+s+6+6+6+6+6+6+t+u+. .             ",
-"  . . . . v+w+w+w+w+x+y+z+A+B+C+6+6+6+6+6+D+E+. . . . . .       ",
-"      . . F+w+w+w+w+w+w+w+w+G+H+I+J+K+L+6+M+N+. . . . . .       ",
-"            w+w+w+w+w+w+w+w+w+w+w+w+w+O+P+Q+R+. . . . . .       ",
-"                      w+w+w+w+w+w+w+w+w+S+8+T+. . . . . .       ",
-"                              w+w+w+w+w+S+8+. . . . . . .       ",
-"                                      w+U+  . . . . . . .       ",
-"                                              . . . . .         ",
 "                                                                "};

data/supertuxkart_desktop.template

@@ -1,13 +1,15 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Supertuxkart
-Icon=supertuxkart_64.xpm
+Version=0.5
+Icon=PREFIX/share/pixmaps/supertuxkart_64.xpm
 Comment=A kart racing game
 Comment[fr_FR]=Un jeu de karting
 Comment[ro_RO]=Un joc de curse cu carturi
-Exec=supertuxkart --log=file
+Comment[de_DE]=Ein Kart-Rennspiel
+Exec=PREFIX/games/supertuxkart --log=file
 Terminal=false
 StartupNotify=false
 Type=Application
-TryExec=supertuxkart
+TryExec=PREFIX/games/supertuxkart
-Categories=3DGraphics;Game;ActionGame;Simulation;SportsGame;
+Categories=Game;ArcadeGame

src/bullet/src/BulletDynamics/ConstraintSolver/btUprightConstraint.cpp

@@ -143,7 +143,6 @@ void btUprightConstraint::solveConstraint(btScalar    timeStep)
     if(m_disable_time>0.0f)
     {
         m_disable_time -= timeStep;
-        printf("m_disable %f timestep %f\n", m_disable_time, timeStep);
         if(m_disable_time>0.0f) return;
     }
 

src/bullet/src/Makefile.am

@@ -187,7 +187,6 @@ libbulletdynamics_a_SOURCES	= \
 	BulletDynamics/ConstraintSolver/btSorLcp.cpp				 \
 	BulletDynamics/ConstraintSolver/btSorLcp.h				 \
 	BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.h	 \
-	BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.cpp	 \
 	BulletDynamics/ConstraintSolver/btOdeJoint.h				 \
 	BulletDynamics/ConstraintSolver/btOdeTypedJoint.h			 \
 	BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp		 \

src/challenges/challenge.cpp

@@ -79,7 +79,7 @@ void Challenge::addUnlockModeReward(std::string internal_mode_name, std::string
 void Challenge::addUnlockGPReward(std::string gp_name)
 {
     UnlockableFeature feature;
-    feature.name = gp_name;
+    feature.name = _(gp_name.c_str());
     feature.type = UNLOCK_GP;
     m_feature.push_back(feature);
 }

src/challenges/energy_math_class.cpp

@@ -25,8 +25,8 @@
 
 EnergyMathClass::EnergyMathClass() : Challenge("energymathclass", _("Collect Coins in Math Class"))
 {
-    setChallengeDescription(_("Collect at least 6 coins\non three laps of\nOliver's Math Class\nin under 1 minute."));
+    setChallengeDescription(_("Collect at least 6 points\nworth of coins\non three laps of\nOliver's Math Class\nin under 1 minute."));
-    addUnlockModeReward("grandprix", _("Grand Prix"));
+    addUnlockTrackReward("crescentcrossing");
 }   // EnergyMathClass
 
 //-----------------------------------------------------------------------------

src/challenges/moon_and_back_gp.cpp

@@ -46,7 +46,7 @@ void MoonAndBackGP::setRace() const {
 bool MoonAndBackGP::grandPrixFinished()
 {
     if (race_manager->getRaceMode()  != RaceManager::RM_GRAND_PRIX  ||
-        race_manager->getGrandPrix()->getName() != "To the Moon and Back" ||
+        race_manager->getGrandPrix()->getName() != _("To the Moon and Back") ||
         race_manager->getDifficulty()!= RaceManager::RD_HARD        ||
         race_manager->getNumKarts()   < 4                           ||
         race_manager->getNumPlayers() > 1) return false;

src/challenges/penguin_playground_gp.cpp

@@ -27,7 +27,6 @@ PenguinPlaygroundGP::PenguinPlaygroundGP() : Challenge("penguinplaygroundgp", _(
     setChallengeDescription(_("Win Penguin Playground Grand\nPrix with 3 'Racer' Level AI karts."));
     addUnlockModeReward("followleader", _("Follow the Leader"));
     // The energymathclass challenge must be done, otherwise GP can't be selected
-    addDependency("energymathclass");
 }
 
 //-----------------------------------------------------------------------------
@@ -44,7 +43,7 @@ void PenguinPlaygroundGP::setRace() const {
 bool PenguinPlaygroundGP::grandPrixFinished()
 {
     if (race_manager->getRaceMode()  != RaceManager::RM_GRAND_PRIX  ||
-        race_manager->getGrandPrix()->getName() != "Penguin Playground" ||
+        race_manager->getGrandPrix()->getName() != _("Penguin Playground") ||
         race_manager->getDifficulty()!= RaceManager::RD_HARD        ||
         race_manager->getNumKarts()   < 4                           ||
         race_manager->getNumPlayers() > 1) return false;

src/challenges/worlds_end_gp.cpp

@@ -51,7 +51,7 @@ void WorldsEndGP::setRace() const {
 bool WorldsEndGP::grandPrixFinished()
 {
     if (race_manager->getRaceMode()  != RaceManager::RM_GRAND_PRIX  ||
-        race_manager->getGrandPrix()->getName() != "At world's end" ||
+        race_manager->getGrandPrix()->getName() != _("At world's end") ||
         race_manager->getDifficulty()!= RaceManager::RD_HARD        ||
         race_manager->getNumKarts()   < 4                           ||
         race_manager->getNumPlayers() > 1) return false;

src/gui/char_sel.cpp

@@ -82,7 +82,7 @@ CharSel::CharSel(int whichPlayer)
             if(unlock_manager->isLocked(kp->getIdent())) continue;
 
             widget_manager->addImgButtonWgt( WTOK_RACER0 + i, 8, 11,
-                kp->getIconFile() );
+                                             kp->getIconFile() );
         }
     }
 
@@ -227,7 +227,7 @@ void CharSel::select()
     }
 
     if (race_manager->getRaceMode() == RaceManager::RM_GRAND_PRIX)
-        menu_manager->pushMenu(MENUID_RACE_OPTIONS);
+        menu_manager->pushMenu(MENUID_GRANDPRIXSELECT);
     else
         menu_manager->pushMenu(MENUID_TRACKSEL);
 }   // select

src/gui/game_mode.cpp

@@ -70,11 +70,14 @@ GameMode::GameMode()
     if(unlock_manager->isLocked("followleader"))
     {
         widget_manager->hideWgtText( WTOK_FOLLOW_LEADER );
-        widget_manager->deactivateWgt( WTOK_FOLLOW_LEADER );
 
-        widget_manager->setWgtColor( WTOK_FOLLOW_LEADER, WGT_WHITE);
+//        widget_manager->deactivateWgt( WTOK_FOLLOW_LEADER );
+
+        widget_manager->setWgtColor( WTOK_FOLLOW_LEADER, WGT_GRAY);
         widget_manager->setWgtTexture( WTOK_FOLLOW_LEADER, "gui_lock.rgb", false );
         widget_manager->showWgtTexture( WTOK_FOLLOW_LEADER );
+        widget_manager->setWgtText(WTOK_FOLLOW_LEADER,
+                                        _("Fulfil challenge to unlock"));
     }
 
     widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 1, 7);
@@ -103,15 +106,24 @@ void GameMode::select()
     {
     case WTOK_GP:
         race_manager->setRaceMode(RaceManager::RM_GRAND_PRIX);
-        menu_manager->pushMenu(MENUID_GRANDPRIXSELECT);
+        menu_manager->pushMenu(MENUID_CHARSEL_P1);
         break;
     case WTOK_QUICKRACE:
         race_manager->setRaceMode(RaceManager::RM_QUICK_RACE);
         menu_manager->pushMenu(MENUID_CHARSEL_P1);
         break;
     case WTOK_FOLLOW_LEADER:
-        race_manager->setRaceMode(RaceManager::RM_FOLLOW_LEADER);
+        if(unlock_manager->isLocked("followleader"))
-        menu_manager->pushMenu(MENUID_CHARSEL_P1);
+        {
+            widget_manager->showWgtText( WTOK_FOLLOW_LEADER );
+            widget_manager->setWgtTextColor( WTOK_FOLLOW_LEADER, WGT_TRANS_GRAY);
+            widget_manager->setWgtColor( WTOK_FOLLOW_LEADER, WGT_TRANS_GRAY);
+        }
+        else
+        {
+            race_manager->setRaceMode(RaceManager::RM_FOLLOW_LEADER);
+            menu_manager->pushMenu(MENUID_CHARSEL_P1);
+        }
         break;
     case WTOK_TIMETRIAL:
         race_manager->setRaceMode(RaceManager::RM_TIME_TRIAL);

src/gui/grand_prix_select.cpp

@@ -61,7 +61,7 @@ GrandPrixSelect::GrandPrixSelect() : m_curr_track_img(0), m_clock(0.0f)
                 CupData cup(*i);
                 if(unlock_manager->isLocked(cup.getName())) continue;
                 m_all_cups.push_back(cup);
-                widget_manager->addTextButtonWgt(WTOK_FIRSTPRIX + nId, 40, 7, cup.getName() );
+                widget_manager->addTextButtonWgt(WTOK_FIRSTPRIX + nId, 60, 7, cup.getName() );
                 nId++;
             }   // if
         }   // for i
@@ -74,7 +74,7 @@ GrandPrixSelect::GrandPrixSelect() : m_curr_track_img(0), m_clock(0.0f)
     widget_manager->breakLine();
     widget_manager->breakLine();
 
-    widget_manager->addTextWgt( WTOK_TRACKS, 40, 40, _("No Grand Prix selected"));
+    widget_manager->addTextWgt( WTOK_TRACKS, 60, 40, _("No Grand Prix selected"));
     widget_manager->enableWgtScroll( WTOK_TRACKS );
     widget_manager->setWgtYScrollSpeed( WTOK_TRACKS, -60 );
 

src/gui/help_page_one.cpp

@@ -34,12 +34,10 @@ enum WidgetTokens
     WTOK_MSG3,
     WTOK_MSG4,
     WTOK_MSG5,
+    WTOK_MSG6,
+    WTOK_MSG7,
 
-    WTOK_FIRST_KEYNAME,
+    WTOK_LOCK,
-    WTOK_LAST_KEYNAME = WTOK_FIRST_KEYNAME + KA_LAST,
-
-    WTOK_FIRST_KEYBINDING,
-    WTOK_LAST_KEYBINDING = WTOK_FIRST_KEYBINDING + KA_LAST,
 
     WTOK_SECOND_PAGE,
     WTOK_QUIT
@@ -107,37 +105,41 @@ HelpPageOne::HelpPageOne()
     widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 100, 15);
     widget_manager->breakLine();
 
-    widget_manager->addTextWgt(WTOK_MSG4, 100, 10,
+    widget_manager->addTextWgt(WTOK_MSG4, 100, 13,
 //Next line starts at column 0 to avoid spaces in the GUI
 _("At high speeds wheelies drive you faster, but you can't steer. If you\n\
 get stuck or fall too far, use the rescue button to get back on track."));
     widget_manager->setWgtResizeToText( WTOK_MSG4, false );
     widget_manager->breakLine();
 
-    widget_manager->addTextWgt(WTOK_MSG5, 70, 7,
+    widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 100, 1);
-        _("Check the current key bindings for the first player"));
     widget_manager->breakLine();
 
-    widget_manager->switchOrder();
+    widget_manager->addTextWgt(WTOK_MSG5, 80, 10,
-    /*The keybindings are placed with loops because it allows to change the
+        _("The current key bindings can be seen/changed in the\nOptions->Player Config menu."));
-     * number of kart actions without changing this screen. */
+    widget_manager->breakLine();
-    for(int i = WTOK_FIRST_KEYNAME; i <= WTOK_LAST_KEYNAME; ++i)
+    widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 100, 1);
-    {
-        widget_manager->addTextWgt( i, 20, 4,
-            _(sKartAction2String[i - WTOK_FIRST_KEYNAME]) );
-        widget_manager->setWgtRoundCorners( i, WGT_AREA_LFT );
-    }
     widget_manager->breakLine();
 
-    widget_manager->switchOrder();
+    widget_manager->addTextWgt(WTOK_MSG6, 100, 17,
-    for(int i = WTOK_FIRST_KEYBINDING; i <= WTOK_LAST_KEYBINDING; ++i)
+_("Collecting coins increases the number of collectables you receive.\n\
-    {
+After 5 silver coins, each blue box will yield 2 collectables,\nafter 10,\
-        widget_manager->addTextWgt( i, 20, 4,
+ 3 collectables and so on.\nEach gold coin is worth 3 silver coins, \
-            user_config->getMappingAsString( 0,
+so look out for them!"));
-            (KartAction)(i - WTOK_FIRST_KEYBINDING)).c_str());
+    widget_manager->setWgtResizeToText( WTOK_MSG6, false);
-        widget_manager->setWgtRoundCorners( i, WGT_AREA_RGT );
-    }
     widget_manager->breakLine();
+    widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 100, 1);
+    widget_manager->breakLine();
+
+    widget_manager->addTextWgt(WTOK_MSG7, 87, 8,
+_("If you see a button with a lock like the one to the right,\n\
+you need to complete a challenge to unlock it."));
+
+    widget_manager->addImgWgt(WTOK_LOCK, 6, 8, 0);
+    widget_manager->setWgtTexture(WTOK_LOCK, "gui_help_lock.rgb", false);
+    widget_manager->breakLine();
+
+    widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 100, 1);
     widget_manager->breakLine();
 
     /*Buttons at the bottom*/

src/gui/help_page_three.cpp

@@ -50,7 +50,7 @@ HelpPageThree::HelpPageThree()
 
     if(!unlock_manager->isLocked("grandprix"))
     {
-        widget_manager->addTextWgt( WTOK_TXT1, 100, 10,
+        widget_manager->addTextWgt( WTOK_TXT1, 100, 15,
             _("Grand Prix: Win victory points \n\
 by racing through a group of tracks,  \n\
 most points wins (shortest time in case of a tie!)          "));
@@ -58,24 +58,24 @@ most points wins (shortest time in case of a tie!)          "));
         widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 100, 1 );
     }
 
-    widget_manager->addTextWgt( WTOK_TXT2, 100, 10,
+    widget_manager->addTextWgt( WTOK_TXT2, 100, 15,
         _("Quick race: Pick a single track, shortest time wins.         "));
         widget_manager->setWgtTextSize( WTOK_TXT2, WGT_FNT_SML );
     widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 100, 1 );
 
-    widget_manager->addTextWgt( WTOK_TXT3, 100, 10,
+    widget_manager->addTextWgt( WTOK_TXT3, 100, 15,
         _("Time Trial: As quick race, but no items.                       "));
         widget_manager->setWgtTextSize( WTOK_TXT3, WGT_FNT_SML );
     widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 100, 1 );
 
     if(!unlock_manager->isLocked("followleader"))
     {
-        widget_manager->addTextWgt( WTOK_TXT4, 100, 10,
+        widget_manager->addTextWgt( WTOK_TXT4, 100, 15,
             _("Follow the leader: Stay behind the leader kart.                 \n\
 When the countdown reaches zero, a kart ahead\n\
 of the leader or the last kart is eliminated."));
         widget_manager->setWgtTextSize( WTOK_TXT4, WGT_FNT_SML );
-        widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 100, 1 );
+        widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 100, 13 );
     }
 
     /*Buttons at the bottom*/

src/gui/main_menu.cpp

@@ -43,25 +43,25 @@ MainMenu::MainMenu()
 {
     widget_manager->switchOrder();
 
-    widget_manager->addTextButtonWgt( WTOK_SINGLE, 25, 7, _("Single Player") );
+    const int WIDTH=30;
-    widget_manager->setWgtResizeToText( WTOK_SINGLE, false );
+    widget_manager->addTextButtonWgt( WTOK_SINGLE, WIDTH, 7, _("Single Player") );
-    widget_manager->addTextButtonWgt( WTOK_MULTI, 25, 7, _("Multiplayer") );
+    widget_manager->addTextButtonWgt( WTOK_MULTI, WIDTH, 7, _("Multiplayer") );
 
     std::vector<const Challenge*> all_challenges=unlock_manager->getActiveChallenges();
     if(all_challenges.size()>0)
     {
-        widget_manager->addTextButtonWgt( WTOK_CHALLENGES, 25, 7, _("Challenges") );
+        widget_manager->addTextButtonWgt( WTOK_CHALLENGES, WIDTH, 7, _("Challenges") );
     }
 
-    widget_manager->addTextButtonWgt( WTOK_OPTIONS, 25, 7, _("Options") );
+    widget_manager->addTextButtonWgt( WTOK_OPTIONS, WIDTH, 7, _("Options") );
-    widget_manager->addTextButtonWgt( WTOK_QUIT, 25, 7, _("Quit") );
+    widget_manager->addTextButtonWgt( WTOK_QUIT, WIDTH, 7, _("Quit") );
 
-    widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, 25, 7 );
+    widget_manager->addEmptyWgt( WidgetManager::WGT_NONE, WIDTH, 7 );
 
-    widget_manager->addTextButtonWgt( WTOK_HELP, 25, 7, _("Help") );
+    widget_manager->addTextButtonWgt( WTOK_HELP, WIDTH, 7, _("Help") );
     widget_manager->setWgtTextSize( WTOK_HELP, WGT_FNT_SML );
 
-    widget_manager->addTextButtonWgt( WTOK_CREDITS, 25, 7, _("Credits") );
+    widget_manager->addTextButtonWgt( WTOK_CREDITS, WIDTH, 7, _("Credits") );
     widget_manager->setWgtTextSize( WTOK_CREDITS, WGT_FNT_SML );
 
     if(user_config->getWarning()!="")

src/gui/menu_manager.cpp

@@ -78,11 +78,13 @@ MenuManager::~MenuManager()
   */
 void MenuManager::pushMenu(MenuManagerIDs id)
 {
-	// If there is already an element then this is the one for the menu
+    // If we store the selected widget when we have send the order to change
-	// which is still visible. We store its currently selected widget
+    // the menu but haven't done it, we would change the previous menu, not
-	// therein.
+    // the current menu.
-	if (m_menu_stack.size())
+	if ( m_menu_stack.size() && m_change_menu != true )
+    {
 		m_menu_stack.back().second = widget_manager->getSelectedWgt();
+    }
 
 	// used to suppress select-sound on startup
     static bool is_startup = true;

src/gui/race_options.cpp

@@ -51,19 +51,25 @@ enum WidgetTokens
     WTOK_QUIT
 };
 
-RaceOptions::RaceOptions() :
+RaceOptions::RaceOptions() 
-             m_difficulty(race_manager->getDifficulty()),
-             m_num_karts(race_manager->getNumKarts()),
-             m_num_laps(race_manager->getNumLaps())
 {
+    m_difficulty=race_manager->getDifficulty();
+    // FIXME: no medium AI atm
+    if(m_difficulty==RaceManager::RD_MEDIUM) m_difficulty=RaceManager::RD_HARD;
+    m_num_karts=race_manager->getNumKarts();
+    m_num_laps=race_manager->getNumLaps();
+
+    const int DESC_WIDTH=48;
+    const int ITEM_WIDTH=35;
+
     // Difficulty
     // ==========
-    widget_manager->addTextWgt( WTOK_DIFFICULTY_TITLE, 38, 7, _("Difficulty") );
+    widget_manager->addTextWgt( WTOK_DIFFICULTY_TITLE, DESC_WIDTH, 7, _("Difficulty") );
     widget_manager->hideWgtRect(WTOK_DIFFICULTY_TITLE);
     widget_manager->setWgtTextSize(WTOK_DIFFICULTY_TITLE, WGT_FNT_LRG);
     widget_manager->addTextButtonWgt( WTOK_DIFFICULTY_DOWN, 3, 7, " < " );
 
-    widget_manager->addTextWgt( WTOK_DIFFICULTY, 32, 7, getDifficultyString(m_difficulty));
+    widget_manager->addTextWgt( WTOK_DIFFICULTY, ITEM_WIDTH, 7, getDifficultyString(m_difficulty));
     widget_manager->setWgtBorderPercentage( WTOK_DIFFICULTY, 10 );
     widget_manager->showWgtBorder( WTOK_DIFFICULTY );
     widget_manager->hideWgtRect( WTOK_DIFFICULTY );
@@ -74,14 +80,14 @@ RaceOptions::RaceOptions() :
 
     // Number of karts
     // ===============
-    widget_manager->addTextWgt( WTOK_KARTS_TITLE, 38, 7, _("Number of karts") );
+    widget_manager->addTextWgt( WTOK_KARTS_TITLE, DESC_WIDTH, 7, _("Number of karts") );
     widget_manager->hideWgtRect(WTOK_KARTS_TITLE);
     widget_manager->setWgtTextSize(WTOK_KARTS_TITLE, WGT_FNT_LRG);
     widget_manager->addTextButtonWgt( WTOK_KARTS_DOWN, 3, 7, " < " );
 
     char string_num_karts[MAX_MESSAGE_LENGTH];
     snprintf(string_num_karts, MAX_MESSAGE_LENGTH, "%d", m_num_karts);
-    widget_manager->addTextWgt( WTOK_KARTS, 32, 7, string_num_karts );
+    widget_manager->addTextWgt( WTOK_KARTS, ITEM_WIDTH, 7, string_num_karts );
     widget_manager->setWgtBorderPercentage( WTOK_KARTS, 10 );
     widget_manager->showWgtBorder( WTOK_KARTS );
     widget_manager->hideWgtRect( WTOK_KARTS );
@@ -95,14 +101,14 @@ RaceOptions::RaceOptions() :
     if( race_manager->getRaceMode() != RaceManager::RM_GRAND_PRIX   &&
         race_manager->getRaceMode() != RaceManager::RM_FOLLOW_LEADER   )
     {
-        widget_manager->addTextWgt( WTOK_LAPS_TITLE, 38, 7, _("Number of laps") );
+        widget_manager->addTextWgt( WTOK_LAPS_TITLE, DESC_WIDTH, 7, _("Number of laps") );
         widget_manager->hideWgtRect(WTOK_LAPS_TITLE);
         widget_manager->setWgtTextSize(WTOK_LAPS_TITLE, WGT_FNT_LRG);
         widget_manager->addTextButtonWgt( WTOK_LAPS_DOWN, 3, 7, " < " );
 
         char string_num_laps[MAX_MESSAGE_LENGTH];
         snprintf(string_num_laps, MAX_MESSAGE_LENGTH, "%d", m_num_laps);
-        widget_manager->addTextWgt( WTOK_LAPS, 32, 7, string_num_laps );
+        widget_manager->addTextWgt( WTOK_LAPS, ITEM_WIDTH, 7, string_num_laps );
         widget_manager->setWgtBorderPercentage( WTOK_LAPS, 10 );
         widget_manager->showWgtBorder( WTOK_LAPS );
         widget_manager->hideWgtRect( WTOK_LAPS );

src/gui/start_race_feedback.cpp

@@ -28,7 +28,7 @@ enum WidgetTokens
     WTOK_MSG
 };
 
-StartRaceFeedback::StartRaceFeedback()
+StartRaceFeedback::StartRaceFeedback() : m_updated( false )
 {
     //Add some feedback so people know they are going to start the race
     widget_manager->reset();
@@ -50,8 +50,7 @@ void StartRaceFeedback::update(float DELTA)
 
     //I consider that in this case, a static variable is cleaner than a
     //member variable of this class. -Coz
-    static bool updated = false;
+    if( m_updated == true ) race_manager->startNew();
-    if( updated == true ) race_manager->startNew();
+    else m_updated = true;
-    else updated = true;
 }
 

src/gui/start_race_feedback.hpp

@@ -22,6 +22,8 @@
 
 class StartRaceFeedback: public BaseGUI
 {
+    bool m_updated;
+
 public:
     StartRaceFeedback();
     ~StartRaceFeedback();

src/gui/track_sel.cpp

@@ -63,11 +63,12 @@ TrackSel::TrackSel()
         if(!isAvailable)
         {
             widget_manager->hideWgtText(WTOK_TRACK0 + i);
-            widget_manager->deactivateWgt(WTOK_TRACK0 + i);
+//            widget_manager->deactivateWgt(WTOK_TRACK0 + i);
 
-            widget_manager->setWgtColor( WTOK_TRACK0 + i, WGT_WHITE);
+            widget_manager->setWgtColor( WTOK_TRACK0 + i, WGT_GRAY );
             widget_manager->setWgtTexture( WTOK_TRACK0 + i, "gui_lock.rgb", false );
             widget_manager->showWgtTexture( WTOK_TRACK0 + i );
+            widget_manager->setWgtText(WTOK_TRACK0+i, _("Fulfil challenge to unlock"));
         }
         if( i%2 != 0 ) widget_manager->breakLine();
         else if (i + 1 == track_manager->getTrackCount() )
@@ -104,71 +105,77 @@ void TrackSel::update(float dt)
         SELECTED_TRACK < (int)track_manager->getTrackCount() )
     {
         const Track* TRACK = track_manager->getTrack( SELECTED_TRACK );
-        const std::string& description = TRACK->getDescription();
+        bool isAvailable = !unlock_manager->isLocked(TRACK->getIdent());
-        if(description!="")
-        {
-            widget_manager->setWgtText( WTOK_AUTHOR, TRACK->getDescription() );
-        }
-        else
-        {
-            char designedby[MAX_MESSAGE_LENGTH];
-            snprintf(designedby, MAX_MESSAGE_LENGTH, 
-                     "Designed by %s", TRACK->getDesigner().c_str());
-            widget_manager->setWgtText( WTOK_AUTHOR, designedby );
-        }
-        const std::string& screenshot = TRACK->getScreenshotFile();
-        const std::string& topview    = TRACK->getTopviewFile();
 
-        if( !screenshot.empty() && !topview.empty() )
+        if( isAvailable )
         {
-            widget_manager->setWgtColor( WTOK_IMG0, WGT_WHITE);
-            widget_manager->showWgtRect( WTOK_IMG0 );
-            widget_manager->setWgtTexture( WTOK_IMG0, screenshot.c_str() );
-            widget_manager->showWgtTexture( WTOK_IMG0 );
-            widget_manager->hideWgtTrack( WTOK_IMG0 );
 
-            widget_manager->setWgtColor( WTOK_IMG1, WGT_WHITE);
+            const std::string& description = TRACK->getDescription();
-            widget_manager->showWgtRect( WTOK_IMG1 );
+            if(description!="")
-            widget_manager->setWgtTexture( WTOK_IMG1, topview.c_str() );
+            {
-            widget_manager->showWgtTexture( WTOK_IMG1 );
+                widget_manager->setWgtText( WTOK_AUTHOR, TRACK->getDescription() );
-            widget_manager->hideWgtTrack( WTOK_IMG1 );
+            }
-        }
+            else
-        else if( topview.empty() )
+            {
-        {
+                char designedby[MAX_MESSAGE_LENGTH];
-            widget_manager->setWgtColor( WTOK_IMG0, WGT_WHITE);
+                snprintf(designedby, MAX_MESSAGE_LENGTH, 
-            widget_manager->showWgtRect( WTOK_IMG0 );
+                         "Designed by %s", TRACK->getDesigner().c_str());
-            widget_manager->setWgtTexture( WTOK_IMG0, screenshot.c_str() );
+                widget_manager->setWgtText( WTOK_AUTHOR, designedby );
-            widget_manager->showWgtTexture( WTOK_IMG0 );
+            }
-            widget_manager->hideWgtTrack( WTOK_IMG0 );
+            const std::string& screenshot = TRACK->getScreenshotFile();
+            const std::string& topview    = TRACK->getTopviewFile();
 
-            widget_manager->hideWgtRect( WTOK_IMG1 );
+            if( !screenshot.empty() && !topview.empty() )
-            widget_manager->hideWgtTexture( WTOK_IMG1 );
+            {
-            widget_manager->setWgtTrackNum( WTOK_IMG1, SELECTED_TRACK );
+                widget_manager->setWgtColor( WTOK_IMG0, WGT_WHITE);
-            widget_manager->showWgtTrack( WTOK_IMG1 );
+                widget_manager->showWgtRect( WTOK_IMG0 );
-        }
+                widget_manager->setWgtTexture( WTOK_IMG0, screenshot.c_str() );
-        else if( screenshot.empty() )
+                widget_manager->showWgtTexture( WTOK_IMG0 );
-        {
+                widget_manager->hideWgtTrack( WTOK_IMG0 );
-            widget_manager->hideWgtRect( WTOK_IMG0 );
-            widget_manager->hideWgtTexture( WTOK_IMG0 );
-            widget_manager->setWgtTrackNum( WTOK_IMG0, SELECTED_TRACK );
-            widget_manager->showWgtTrack( WTOK_IMG0 );
 
-            widget_manager->setWgtColor( WTOK_IMG1, WGT_WHITE);
+                widget_manager->setWgtColor( WTOK_IMG1, WGT_WHITE);
-            widget_manager->showWgtRect( WTOK_IMG1 );
+                widget_manager->showWgtRect( WTOK_IMG1 );
-            widget_manager->setWgtTexture( WTOK_IMG1, topview.c_str() );
+                widget_manager->setWgtTexture( WTOK_IMG1, topview.c_str() );
-            widget_manager->showWgtTexture( WTOK_IMG1 );
+                widget_manager->showWgtTexture( WTOK_IMG1 );
-            widget_manager->hideWgtTrack( WTOK_IMG1 );
+                widget_manager->hideWgtTrack( WTOK_IMG1 );
-        }
+            }
-        else //if( screenshot.empty() && topview.empty() )
+            else if( topview.empty() )
-        {
+            {
-            widget_manager->hideWgtRect( WTOK_IMG0 );
+                widget_manager->setWgtColor( WTOK_IMG0, WGT_WHITE);
-            widget_manager->hideWgtTexture( WTOK_IMG0 );
+                widget_manager->showWgtRect( WTOK_IMG0 );
-            widget_manager->setWgtTrackNum( WTOK_IMG0, SELECTED_TRACK );
+                widget_manager->setWgtTexture( WTOK_IMG0, screenshot.c_str() );
-            widget_manager->showWgtTrack( WTOK_IMG0 );
+                widget_manager->showWgtTexture( WTOK_IMG0 );
+                widget_manager->hideWgtTrack( WTOK_IMG0 );
 
-            widget_manager->hideWgtRect( WTOK_IMG1 );
+                widget_manager->hideWgtRect( WTOK_IMG1 );
-            widget_manager->hideWgtTexture( WTOK_IMG1 );
+                widget_manager->hideWgtTexture( WTOK_IMG1 );
-            widget_manager->hideWgtTrack( WTOK_IMG1 );
+                widget_manager->setWgtTrackNum( WTOK_IMG1, SELECTED_TRACK );
+                widget_manager->showWgtTrack( WTOK_IMG1 );
+            }
+            else if( screenshot.empty() )
+            {
+                widget_manager->hideWgtRect( WTOK_IMG0 );
+                widget_manager->hideWgtTexture( WTOK_IMG0 );
+                widget_manager->setWgtTrackNum( WTOK_IMG0, SELECTED_TRACK );
+                widget_manager->showWgtTrack( WTOK_IMG0 );
+
+                widget_manager->setWgtColor( WTOK_IMG1, WGT_WHITE);
+                widget_manager->showWgtRect( WTOK_IMG1 );
+                widget_manager->setWgtTexture( WTOK_IMG1, topview.c_str() );
+                widget_manager->showWgtTexture( WTOK_IMG1 );
+                widget_manager->hideWgtTrack( WTOK_IMG1 );
+            }
+            else //if( screenshot.empty() && topview.empty() )
+            {
+                widget_manager->hideWgtRect( WTOK_IMG0 );
+                widget_manager->hideWgtTexture( WTOK_IMG0 );
+                widget_manager->setWgtTrackNum( WTOK_IMG0, SELECTED_TRACK );
+                widget_manager->showWgtTrack( WTOK_IMG0 );
+
+                widget_manager->hideWgtRect( WTOK_IMG1 );
+                widget_manager->hideWgtTexture( WTOK_IMG1 );
+                widget_manager->hideWgtTrack( WTOK_IMG1 );
+            }
         }
     }
 
@@ -184,9 +191,22 @@ void TrackSel::select()
     {
         return;   // not clicked on a track, ignore
     }
+
     const Track* TRACK = track_manager->getTrack(CLICKED_TOKEN - WTOK_TRACK0);
-    race_manager->setTrack(TRACK->getIdent());
+    bool isAvailable = !unlock_manager->isLocked(TRACK->getIdent());
-    menu_manager->pushMenu(MENUID_RACE_OPTIONS);
+
+    if( isAvailable )
+    {
+        race_manager->setTrack(TRACK->getIdent());
+        menu_manager->pushMenu(MENUID_RACE_OPTIONS);
+    }
+
+    else
+    {
+        widget_manager->showWgtText( CLICKED_TOKEN );
+        widget_manager->setWgtTextColor( CLICKED_TOKEN, WGT_TRANS_GRAY);
+        widget_manager->setWgtColor( CLICKED_TOKEN, WGT_TRANS_GRAY);
+    }
 }   // select
 
 /* EOF */

src/ide/vc8/supertuxkart.vcproj

@@ -522,7 +522,7 @@
 				Optimization="0"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="./../../../src;"$(PLIB_PATH)";"$(SDL_PATH)\include";"$(ALUT_PATH)\include";"$(OGG_PATH)\include";"$(VORBIS_PATH)\include";"$(OPENAL_PATH)\include";"$(OPENAL_PATH)\include\AL";../../../src/bullet/src;"$(GLUT_PATH)\include";"$(GETTEXT_PATH)/include""
-				PreprocessorDefinitions="BT_NO_PROFILE;HAVE_OPENAL;HAVE_OGGVORBIS;_DEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"0.4alpha\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;PACKAGE=\"supertuxkart\";HAS_GETTEXT"
+				PreprocessorDefinitions="BT_NO_PROFILE;HAVE_OPENAL;HAVE_OGGVORBIS;_DEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"0.5\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;PACKAGE=\"supertuxkart\";HAS_GETTEXT"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -611,7 +611,7 @@
 				Name="VCCLCompilerTool"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="./../../../src;"$(PLIB_PATH)";"$(SDL_PATH)\include";"$(ALUT_PATH)\include";"$(OGG_PATH)\include";"$(VORBIS_PATH)\include";"$(OPENAL_PATH)\include";"$(OPENAL_PATH)\include\AL";../../../src/bullet/src;"$(GLUT_PATH)\include""
-				PreprocessorDefinitions="HAVE_OPENAL;HAVE_OGGVORBIS;NDEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"0.4alpha\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;BT_NO_PROFILE"
+				PreprocessorDefinitions="HAVE_OPENAL;HAVE_OGGVORBIS;NDEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"0.5\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;BT_NO_PROFILE;PACKAGE=\"supertuxkart\";HAS_GETTEXT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -629,7 +629,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib user32.lib gdi32.lib winmm.lib advapi32.lib SDL.lib SDLmain.lib OpenAL32.lib alut.lib libogg.lib libvorbis.lib libvorbisfile.lib sg.lib ssg.lib ul.lib ssgAux.lib fnt.lib"
+				AdditionalDependencies="opengl32.lib user32.lib gdi32.lib winmm.lib advapi32.lib SDL.lib SDLmain.lib OpenAL32.lib alut.lib libogg.lib libvorbis.lib libvorbisfile.lib sg.lib ssg.lib ul.lib ssgAux.lib fnt.lib intl.lib"
 				OutputFile="./../../../$(ProjectName)_bullet.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(SDL_PATH)\lib&quot;;&quot;$(PLIB_PATH)\plib&quot;;&quot;$(OPENAL_PATH)\libs\Win32&quot;;&quot;$(ALUT_PATH)\lib&quot;;&quot;$(OGG_PATH)\win32\VS2003\libogg\Release&quot;;&quot;$(VORBIS_PATH)\win32\VS2005\libvorbis\Release&quot;;&quot;$(VORBIS_PATH)\win32\VS2005\libvorbisfile\Release&quot;;&quot;$(GLUT_PATH)&quot;"

src/kart.cpp

@@ -570,10 +570,15 @@ void Kart::update(float dt)
     }
 
     btTransform trans=getTrans();
-    // Add a certain epsilon (0.1) to the height of the kart. This avoids
+    // Add a certain epsilon (0.2) to the height of the kart. This avoids
     // problems of the ray being cast from under the track (which happened
     // e.g. on tux tollway when jumping down from the ramp).
-    btVector3 pos_plus_epsilon = trans.getOrigin()+btVector3(0,0,0.1f);
+    // FIXME: this should be more thoroughly fixed, the constant is probably
+    // dependent on the wheel size, suspension data etc.: when jumping,
+    // the wheel suspension will be fully compressed, resulting in the
+    // ray to start too low (under the track).
+    btVector3 pos_plus_epsilon = trans.getOrigin()+btVector3(0,0,0.2f);
+    //btVector3 pos_plus_epsilon (-56.6874237, -137.48851, -3.06826854);
     TerrainInfo::update(pos_plus_epsilon);
 
     const Material* material=getMaterial();

src/main.cpp

@@ -167,7 +167,8 @@ int handleCmdLine(int argc, char **argv)
                 race_manager->setDifficulty(RaceManager::RD_EASY);
                 break;
             case 2:
-                race_manager->setDifficulty(RaceManager::RD_MEDIUM);
+                // FIXME: no medium AI atm race_manager->setDifficulty(RaceManager::RD_MEDIUM);
+                race_manager->setDifficulty(RaceManager::RD_HARD);
                 break;
             case 3:
                 race_manager->setDifficulty(RaceManager::RD_HARD);
@@ -417,7 +418,7 @@ void InitTuxkart()
     race_manager->setNumPlayers(1);
     race_manager->setNumLaps   (3);
     race_manager->setRaceMode  (RaceManager::RM_QUICK_RACE);
-    race_manager->setDifficulty(RaceManager::RD_MEDIUM);
+    race_manager->setDifficulty(RaceManager::RD_HARD);
 }
 
 //=============================================================================
@@ -498,15 +499,6 @@ int main(int argc, char *argv[] )
                 // Quickstart (-N)
                 // ===============
                 // all defaults are set in InitTuxkart()
-                //race_manager->setNumPlayers(1);
-                //race_manager->setNumKarts  (4);
-                //race_manager->setRaceMode  (RaceSetup::RM_QUICK_RACE);
-                //race_manager->setDifficulty(RD_MEDIUM);
-                //race_manager->setPlayerKart(0, kart_properties_manager->getKart("tuxkart")->getIdent());
-                //race_manager->setNumLaps   (3);
-                //race_manager->setTrack     ("tuxtrack");
-                //race_manager->setTrack     ("sandtrack");
-                //race_manager->setTrack     ("race");
                 race_manager->startNew();
             }
         }

src/player_kart.cpp

@@ -178,13 +178,11 @@ void PlayerKart::update(float dt)
         m_collectable.use() ;
         m_controls.fire = false;
     }
-#ifdef DEBUG
+
-    // Allow rescuing while still falling ... it's convenient for debugging, but
+    // We can't restrict rescue to fulfil isOnGround() (which would be more like
-    // not for a release
+    // MK), since e.g. in the City track it is possible for the kart to end
+    // up sitting on a brick wall, with all wheels in the air :((
     if ( m_controls.rescue )
-#else
-    if ( isOnGround()  &&  m_controls.rescue )
-#endif
     {
         sound_manager -> playSfx ( SOUND_BEEP ) ;
         forceRescue();

src/race_manager.cpp

@@ -1,3 +1,4 @@
+
 //  $Id$
 //
 //  SuperTuxKart - a fun racing game with go-kart
@@ -213,8 +214,9 @@ void RaceManager::exit_race()
     }
     scene->clear();
     delete world;
-    world = 0;
+    world          = 0;
-    m_active_race = false;    
+    m_track_number = 0;
+    m_active_race  = false;    
 }   // exit_Race
 
 //-----------------------------------------------------------------------------

src/robots/default_robot.cpp

@@ -71,6 +71,7 @@ DefaultRobot::DefaultRobot(const std::string& kart_name,
         m_min_steps = 1;
         break;
     case RaceManager::RD_HARD:
+    case RaceManager::RD_SKIDDING:
         m_wait_for_players = false;
         m_max_handicap_accel = 1.0f;
         m_fallback_tactic = FT_FAREST_POINT;

src/sdldrv.cpp

@@ -45,7 +45,7 @@
 
 #define DEADZONE_MOUSE 150
 #define DEADZONE_MOUSE_SENSE 200
-#define DEADZONE_JOYSTICK (1000)
+#define DEADZONE_JOYSTICK 2000
 
 #define MULTIPLIER_MOUSE 750
 

src/sound_manager.cpp

@@ -129,6 +129,12 @@ void SoundManager::addMusicToTracks()
     for(std::map<std::string,MusicInformation*>::iterator i=m_allMusic.begin();
                                                           i!=m_allMusic.end(); i++)
     {
+        if(!i->second) 
+        {
+            fprintf(stderr, "Can't find music file '%s' - ignored.\n",
+                    i->first.c_str());
+            continue;
+        }
         i->second->addMusicToTracks();
     }
 }   // addMusicToTracks

src/string_utils.cpp

@@ -19,6 +19,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <algorithm>
+#include <cstring>
 #include "string_utils.hpp"
 
 namespace StringUtils

src/widget_manager.cpp

@@ -89,6 +89,7 @@ bool WidgetManager::addWgt
     new_id.widget->m_round_corners = m_default_rect_round_corners;
     new_id.widget->m_rect_color = m_default_rect_color;
 
+    new_id.widget->m_enable_border = m_default_show_border;
     new_id.widget->m_border_percentage = m_default_border_percentage;
     new_id.widget->m_border_color = m_default_border_color;
 
@@ -121,36 +122,9 @@ bool WidgetManager::addWgt
 }
 
 //-----------------------------------------------------------------------------
-bool WidgetManager::switchOrder()
+void WidgetManager::switchOrder()
 {
-#if 0
-    const int LAST_ELEM = (int)m_elems.size() - 1;
-
-    if( LAST_ELEM > -1 )
-    {
-        if( m_elems[ LAST_ELEM ].type == ET_SWITCH )
-        {
-            const int LAST_WGT = (int)m_widgets.size() - 1;
-
-            if( LAST_WGT > -1 )
-            {
-                std::cerr << "WARNING: tried to switch the order twice " <<
-                    "in a row after widget with token " <<
-                    m_widgets[LAST_WGT].token << ".\n";
-            }
-            else
-            {
-                std::cerr << "WARNING: tried to switch the order twice " <<
-                    "in a row before the first widget.\n";
-            }
-            return false;
-        }
-    }
-#endif
-
     m_elems.push_back( WidgetElement( ET_SWITCH, 0 ));
-
-    return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -413,14 +387,6 @@ bool WidgetManager::layout(const WidgetArea POSITION)
         break;
     }
 
-/*TMP: CHECKS
- *4 wgts of different sizes
- *switch; 4 wgts of different sizes
- *4 wgts
- *
- *
- *
- */
     /* We have to give each widget it's pixel position and create their rect.
      * The position given to the widgets is their bottom left corner; since
      * OpenGL the bottom left corner of the screen for (0,0), it's easier
@@ -467,284 +433,6 @@ bool WidgetManager::layout(const WidgetArea POSITION)
             break;
         }
     }
-#if 0
-    int cursor_x = x;
-    int cursor_y = y;
-    WidgetID* curr_wgt = 0;
-
-    const int NUM_ELEMS = (int)m_elems.size();
-    int i;
-
-    for( i = pos; i < NUM_ELEMS; ++i )
-    {
-        switch( m_elems[ i ].type )
-        {
-        case ET_WGT:
-            curr_wgt = &m_widgets[ m_elems[ i ].pos ];
-
-            curr_wgt->widget->m_x = cursor_x;
-
-            //We have to give createRect() the bottom left corner
-            curr_wgt->widget->m_y = cursor_y - curr_wgt->widget->m_height;
-
-            if( !(curr_wgt->widget->createRect()) ) return false;
-
-            cursor_x += curr_wgt->widget->m_width;
-            break;
-
-        case ET_BREAK:
-            x += ( calcLineWidth( pos ) - calcLineWidth( i + 1 )) / 2;
-            std::cerr << pos << " " << calcLineWidth ( pos ) << " " << i << " " << calcLineWidth(i+1) << std::endl;
-            y = cursor_y - calcLineHeight( pos );
-            pos = i;
-            return true;
-
-        case ET_SWITCH:
-            ++i;
-            layoutColumn( cursor_x, cursor_y, i );
-            break;
-        }
-    }
-
-    pos = i;
-    return true;
-#endif
-
-
-#if 0
-    //The container is the line/row or column that contains a widget,
-    //including the starting position.
-    //A new value is pushed with each orientation switch, and popped with
-    //each break that closes a switch.
-    std::stack<int> container_x;
-    std::stack<int> container_y;
-    std::stack<int> container_pos;
-
-    int cursor_x = m_x + ( WGTS_WIDTH - calcLineWidth( 0 )) / 2;
-    int cursor_y = m_y;
-
-    container_x.push( cursor_x );
-    container_y.push( cursor_y );
-    container_pos.push( 0 );
-
-    WidgetID* curr_wgt = 0;
-
-    bool horizontal = true;
-    bool order_was_switched = false;
-
-    const int NUM_ELEMS = (int)m_elems.size();
-
-    for( int i = 0; i < NUM_ELEMS; ++i )
-    {
-        std::cerr << "I " << m_elems[i].type << " " << i << std::endl;
-        std::cerr << "x " << cursor_x << std::endl;
-        std::cerr << "y " << cursor_y << std::endl;
-        switch( m_elems[i].type )
-        {
-        case ET_WGT:
-            curr_wgt = &m_widgets[ m_elems[ i ].pos ];
-
-            curr_wgt->widget->m_x = cursor_x;
-
-            //We have to give createRect() the bottom left corner, not the
-            //top left corner
-            curr_wgt->widget->m_y = cursor_y - curr_wgt->widget->m_height;
-
-            if( !(curr_wgt->widget->createRect()) ) return false;
-
-            if( horizontal )
-            {
-                cursor_x += curr_wgt->widget->m_width;
-            }
-            else if( i + 1 < NUM_ELEMS )
-            {
-                switch( m_elems[ i + 1 ].type )
-                {
-                    case ET_WGT:
-                        cursor_x += ( curr_wgt->widget->m_width -
-                            m_widgets[ m_elems[ i + 1 ].pos ].widget->
-                            m_width ) / 2;
-                        break;
-
-                    case ET_SWITCH:
-                        cursor_x += ( curr_wgt->widget->m_width -
-                            calcLineWidth( i + 2 ) ) / 2;
-                        break;
-
-                    case ET_BREAK:
-                        break;
-                }
-
-                cursor_y -= curr_wgt->widget->m_height;
-            }
-            break;
-
-        case ET_BREAK:
-            assert( curr_wgt != 0 );
-
-            if( horizontal )
-            {
-                cursor_y -= calcLineHeight( container_pos.top() + 1 );
-            }
-
-            if( order_was_switched )
-            {
-                container_x.pop();
-                container_y.pop();
-                container_pos.pop();
-            }
-
-            if( horizontal )
-            {
-//                cursor_x.top() -= ( calcLineWidth( cursor_pos.top() ) +
-//                    calcLineWidth( i + 1 )) / 2;
-//                cursor_x.top() += ( calcLineWidth( cursor_pos.top() ) -
-//                    calcLineWidth( i + 1 )) / 2;
-                cursor_x = container_x.top() +
-                    ( calcLineWidth( container_pos.top() ) -
-                      calcLineWidth( i + 1 )) / 2;
-            }
-            else
-            {
-                cursor_x = container_x.top() +
-                    calcLineWidth( container_pos.top() ) -
-                    calcColumnWidth( i + 1 );
-                cursor_y = container_y.top();
-            }
-
-            if( order_was_switched )
-            {
-                horizontal = !horizontal;
-                if( container_x.size() < 2 ) order_was_switched = false;
-            }
-            break;
-
-        case ET_SWITCH:
-            horizontal = !horizontal;
-
-            container_x.push( cursor_x );
-            container_y.push( cursor_y );
-            container_pos.push( i );
-
-            if( horizontal )
-            {
-                //TODO: Check when the first line is smaller than the rest
-//                cursor_x = calcColumnWidth( i ) - calcLineWidth( i + 1 );
-            }
-            else if( i + 1 < NUM_ELEMS )
-            {
-                switch( m_elems[ i + 1 ].type )
-                {
-                    case ET_WGT:
-                        /*cursor_x += ( calcLineWidth( i ) -
-                            m_widgets[ m_elems[ i + 1 ].pos ].widget->
-                            m_width ) / 2;*/
-                        break;
-
-                    case ET_SWITCH:
-                        cursor_x += ( calcLineWidth( i ) -
-                            calcLineWidth( i + 2 ) ) / 2;
-                        break;
-
-                    case ET_BREAK:
-                        break;
-                }
-/*            {
-                cursor_x.top() += calcLineWidth( i ) - calcColumnWidth( i + 1 );*/
-            }
-
-            order_was_switched = true;
-            break;
-    }
-#endif
-#if 0
-    //Position the first widget, these coordinates are for the top left
-    //corner of the first widget.
-    int widget_x = m_x + ( WGTS_WIDTH - calcLineWidth( 0 )) / 2;
-    int widget_y = m_y;
-
-    const int NUM_ELEMS = (int)m_elems.size();
-    int line_pos = 0;
-    int column_pos = -1;
-    int curr_wgt = 0;
-
-    for( int i = 0; i < NUM_ELEMS; ++i )
-    {
-        switch( m_elems[i].type )
-        {
-        case ET_WGT:
-            curr_wgt = m_elems[i].pos;
-
-            if( column_pos != -1 )
-            {
-                //If we are inside a column, we need to recalculate the X
-                //position so the widget is centered around the column
-                const int CENTERED_POS = ( calcColumnWidth( column_pos ) -
-                    m_widgets[curr_wgt].widget->m_width) / 2;
-                widget_x += CENTERED_POS;
-            }
-
-            //Move the position to the widget's bottom left corner, since
-            //that's what the createRect() function expects.
-            widget_y -= m_widgets[curr_wgt].widget->m_height;
-
-            //Assign the widget's position
-            m_widgets[curr_wgt].widget->m_x = widget_x;
-            m_widgets[curr_wgt].widget->m_y = widget_y;
-
-            //Create widget's rect
-            if( !(m_widgets[curr_wgt].widget->createRect()) )
-            {
-                return false;
-            }
-
-            if( column_pos == -1 )
-            {
-                //If we are not inside a column, move the position to the
-                //top left corner of the next widget.
-                widget_x += m_widgets[curr_wgt].widget->m_width;
-                widget_y += m_widgets[curr_wgt].widget->m_height;
-            }
-            else
-            {
-                //If we are inside a column, we need to move back to the
-                //columns' X position
-                const int CENTERED_POS = ( calcColumnWidth( column_pos ) -
-                    m_widgets[curr_wgt].widget->m_width) / 2;
-                widget_x -= CENTERED_POS;
-            }
-
-            break;
-
-        case ET_BREAK:
-            if( column_pos == -1 )
-            {
-                //If we are not inside a column, move to the next line
-                const int CENTERED_POS = (WGTS_WIDTH -
-                    calcLineWidth( i+1 )) / 2;
-                widget_x = m_x + CENTERED_POS;
-
-                widget_y -= calcLineHeight(line_pos);
-
-                line_pos = i + 1;
-            }
-            else
-            {
-                //If we are inside a column, move to the next widget in the
-                //same line
-                widget_x += calcColumnWidth(column_pos);
-                widget_y += calcColumnHeight(column_pos);
-
-                column_pos = -1;
-            }
-            break;
-
-        case ET_COLUMN_START:
-            column_pos = i;
-            break;
-        }
-    }
-#endif
 
     //Select the first active widget by default
     setSelectedWgtToken( WGT_NONE );
@@ -854,7 +542,6 @@ bool WidgetManager::layoutColumn( int& x, int& y, int& pos )
 
         case ET_BREAK:
             x += calcColumnWidth( pos );
-//            y = ??? Unnecesary?;
             pos = i;
             return true;
 
@@ -867,206 +554,8 @@ bool WidgetManager::layoutColumn( int& x, int& y, int& pos )
 
     pos = i;
     return true;
-#if 0
-    for( int i = 0; i < NUM_ELEMS; ++i )
-    {
-        switch( m_elems[i].type )
-        {
-        case ET_WGT:
-            curr_wgt = &m_widgets[ m_elems[ i ].pos ];
-
-            curr_wgt->widget->m_x = cursor_x;
-
-            //We have to give createRect() the bottom left corner, not the
-            //top left corner
-            curr_wgt->widget->m_y = cursor_y - curr_wgt->widget->m_height;
-
-            if( !(curr_wgt->widget->createRect()) ) return false;
-
-            if( horizontal )
-            {
-                cursor_x += curr_wgt->widget->m_width;
-            }
-            else if( i + 1 < NUM_ELEMS )
-            {
-                switch( m_elems[ i + 1 ].type )
-                {
-                    case ET_WGT:
-                        cursor_x += ( curr_wgt->widget->m_width -
-                            m_widgets[ m_elems[ i + 1 ].pos ].widget->
-                            m_width ) / 2;
-                        break;
-
-                    case ET_SWITCH:
-                        cursor_x += ( curr_wgt->widget->m_width -
-                            calcLineWidth( i + 2 ) ) / 2;
-                        break;
-
-                    case ET_BREAK:
-                        break;
-                }
-
-                cursor_y -= curr_wgt->widget->m_height;
-            }
-            break;
-
-        case ET_BREAK:
-            assert( curr_wgt != 0 );
-
-            if( horizontal )
-            {
-                cursor_y -= calcLineHeight( container_pos.top() + 1 );
-            }
-
-            if( order_was_switched )
-            {
-                container_x.pop();
-                container_y.pop();
-                container_pos.pop();
-            }
-
-            if( horizontal )
-            {
-//                cursor_x.top() -= ( calcLineWidth( cursor_pos.top() ) +
-//                    calcLineWidth( i + 1 )) / 2;
-//                cursor_x.top() += ( calcLineWidth( cursor_pos.top() ) -
-//                    calcLineWidth( i + 1 )) / 2;
-                cursor_x = container_x.top() +
-                    ( calcLineWidth( container_pos.top() ) -
-                      calcLineWidth( i + 1 )) / 2;
-            }
-            else
-            {
-                cursor_x = container_x.top() +
-                    calcLineWidth( container_pos.top() ) -
-                    calcColumnWidth( i + 1 );
-                cursor_y = container_y.top();
-            }
-
-            if( order_was_switched )
-            {
-                horizontal = !horizontal;
-                if( container_x.size() < 2 ) order_was_switched = false;
-            }
-            break;
-
-        case ET_SWITCH:
-            horizontal = !horizontal;
-
-            container_x.push( cursor_x );
-            container_y.push( cursor_y );
-            container_pos.push( i );
-
-            if( horizontal )
-            {
-                //TODO: Check when the first line is smaller than the rest
-//                cursor_x = calcColumnWidth( i ) - calcLineWidth( i + 1 );
-            }
-            else if( i + 1 < NUM_ELEMS )
-            {
-                switch( m_elems[ i + 1 ].type )
-                {
-                    case ET_WGT:
-                        /*cursor_x += ( calcLineWidth( i ) -
-                            m_widgets[ m_elems[ i + 1 ].pos ].widget->
-                            m_width ) / 2;*/
-                        break;
-
-                    case ET_SWITCH:
-                        cursor_x += ( calcLineWidth( i ) -
-                            calcLineWidth( i + 2 ) ) / 2;
-                        break;
-
-                    case ET_BREAK:
-                        break;
-                }
-/*            {
-                cursor_x.top() += calcLineWidth( i ) - calcColumnWidth( i + 1 );*/
-            }
-
-            order_was_switched = true;
-            break;
-    }
-#endif
 }
 
-#if 0
-//-----------------------------------------------------------------------------
-int WidgetManager::calcLineWidth( const int START_ELEM ) const
-{
-    int curr_wgt;
-    int total_width = 0;
-    const int NUM_ELEMS = (int)m_elems.size();
-
-    for( int i = START_ELEM; i < NUM_ELEMS; ++i )
-    {
-        switch( m_elems[i].type )
-        {
-        case ET_WGT:
-            curr_wgt = m_elems[i].pos;
-            total_width += m_widgets[curr_wgt].widget->m_width;
-            break;
-
-        case ET_BREAK:
-            return total_width;
-
-        case ET_COLUMN_START:
-            total_width += calcColumnWidth(i);
-
-            while( i < NUM_ELEMS )
-            {
-                if( m_elems[i].type == ET_BREAK ) break;
-                ++i;
-            }
-            break;
-        }
-    }
-
-    return total_width;
-}
-
-//-----------------------------------------------------------------------------
-int WidgetManager::calcLineHeight( const int START_ELEM ) const
-{
-    int curr_wgt;
-    int line_height = 0;
-    int column_height;
-    const int NUM_ELEMS = (int)m_elems.size();
-
-    for( int i = START_ELEM; i < NUM_ELEMS; ++i )
-    {
-        switch( m_elems[i].type )
-        {
-        case ET_WGT:
-            curr_wgt = m_elems[i].pos;
-            if( line_height < m_widgets[curr_wgt].widget->m_height )
-            {
-                line_height = m_widgets[curr_wgt].widget->m_height;
-            }
-            break;
-
-        case ET_BREAK:
-            return line_height;
-
-        case ET_COLUMN_START:
-            column_height = calcColumnHeight(i);
-
-            if( line_height < column_height )
-            {
-                line_height = column_height;
-            }
-
-            while( i < NUM_ELEMS )
-            {
-                if( m_elems[i].type == ET_BREAK ) break;
-                ++i;
-            }
-        }
-    }
-
-    return line_height;
-}
-#endif
 
 /** This getLineWidth() function returns the width of the smallest
  *  rectangle that contains the widgets in the given line. It expects
@@ -1360,28 +849,6 @@ int WidgetManager::calcLineX( const int POS )
         }
     }
 
-/*
-            if( i + 1 < NUM_ELEMS )
-            {
-                switch( m_elems[ i + 1 ].type )
-                {
-                    case ET_WGT:
-                        cursor_x += ( curr_wgt->widget->m_width -
-                            m_widgets[ m_elems[ i + 1 ].pos ].widget->
-                            m_width ) / 2;
-                        break;
-
-                    case ET_SWITCH:
-                        cursor_x += ( curr_wgt->widget->m_width -
-                            calcLineWidth( i + 2 ) ) / 2;
-                        break;
-
-                    case ET_BREAK:
-                        break;
-                }*/
-
-
-
     return width;
 }
 
@@ -1392,17 +859,9 @@ int WidgetManager::calcColumnX( const int POS )
 
     WidgetID* curr_wgt = &m_widgets[ m_elems[ POS ].pos ];
 
-    switch( m_elems[ POS ].type )
+    if( m_elems[ POS ].type == ET_WGT )
     {
-        case ET_WGT:
+        return ( calcColumnWidth( POS ) - curr_wgt->widget->m_width ) / 2;
-            return ( calcColumnWidth( POS ) - curr_wgt->widget->m_width ) / 2;
-
-        case ET_SWITCH:
-            return ( curr_wgt->widget->m_width -
-                     calcLineWidth( POS + 1 )) / 2;
-
-        case ET_BREAK:
-            break;
     }
 
     return 0;

src/widget_manager.hpp

@@ -179,8 +179,10 @@ public:
     );
 
     bool breakLine();
-    bool switchOrder(); //This changes the orientation from horizontal to
+    void switchOrder(); //This changes the orientation from horizontal to
-                        //vertical. It's reverted at line breaks;
+                        //vertical. It's reverted at line breaks. There are
+                        //no situations where you cannot use a switch order
+                        //so it should always succeed.
 
     void reset();
 

src/world.cpp

@@ -63,6 +63,7 @@ World::World()
     delete world;
     world                 = this;
     m_phase               = SETUP_PHASE;
+    m_previous_phase      = SETUP_PHASE;  // initialise it just in case
     m_track               = NULL;
     m_clock               = 0.0f;
     m_faster_music_active = false;
@@ -269,11 +270,7 @@ void World::update(float dt)
             index[m_kart[i]->getPosition()-1] = i;
         }
 
-        // Don't record the time for the last kart, since it didn't finish
+        for(unsigned int pos=0; pos<m_kart.size(); pos++)
-        // the race - unless it's timetrial (then there is only one kart)
-        unsigned int karts_to_enter = (race_manager->getRaceMode()==RaceManager::RM_TIME_TRIAL) 
-                                    ? (unsigned int)m_kart.size() : (unsigned int)m_kart.size()-1;
-        for(unsigned int pos=0; pos<karts_to_enter; pos++)
         {
             // Only record times for player karts
             if(!m_kart[index[pos]]->isPlayerKart()) continue;
@@ -727,6 +724,7 @@ void World::restartRace()
 {
     m_clock               = 0.0f;
     m_phase               = SETUP_PHASE;
+    m_previous_phase      = SETUP_PHASE;
     m_faster_music_active = false;
     m_eliminated_karts    = 0;
     m_eliminated_players  = 0;
@@ -786,6 +784,7 @@ Kart* World::loadRobot(const std::string& kart_name, int position,
 void  World::pause()
 {
     sound_manager -> pauseMusic() ;
+    m_previous_phase = m_phase;
     m_phase = LIMBO_PHASE;
 }
 
@@ -793,7 +792,7 @@ void  World::pause()
 void  World::unpause()
 {
     sound_manager -> resumeMusic() ;
-    m_phase = RACE_PHASE;
+    m_phase = m_previous_phase;
 }
 
 /* EOF */

src/world.hpp

@@ -111,26 +111,31 @@ public:
 private:
     Karts       m_kart;
     std::vector<PlayerKart*>  m_player_karts;
-    float       m_finish_delay_start_time;
     Physics*    m_physics;
     float       m_fastest_lap;
     Kart*       m_fastest_kart;
     Highscores* m_highscores;
     Phase       m_phase;
+    Phase       m_previous_phase;      // used during the race popup menu
     float       m_clock;
+    float       m_finish_delay_start_time;
     int         m_eliminated_karts;    // number of eliminated karts
     int         m_eliminated_players;  // number of eliminated players
     std::vector<float>
                 m_leader_intervals;    // time till elimination in follow leader
     bool        m_faster_music_active; // true if faster music was activated
-    void  updateRacePosition( int k );
-    void  loadTrack();
-    void  updateRaceStatus(float dt);
-    void  resetAllKarts();
-    void  removeKart(int kart_number);
-    Kart* loadRobot(const std::string& kart_name, int position,
-                    sgCoord init_pos);
 
+    void  updateRacePosition(int k);
+    void  updateHighscores  ();
+    void  loadTrack         ();
+    void  updateRaceStatus  (float dt);
+    void  resetAllKarts     ();
+    void  removeKart        (int kart_number);
+    Kart* loadRobot         (const std::string& kart_name, int position,
+                             sgCoord init_pos);
+    void  updateLeaderMode  (float dt);
+    void  printProfileResultAndExit();
+    void  estimateFinishTimes();
 #ifdef HAVE_GHOST_REPLAY
 private:
     bool    saveReplayHumanReadable( std::string const &filename ) const;