--- a/share/hedgewars/Data/Locale/de.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Locale/de.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -1,9 +1,27 @@
 locale = {
+	["Aiming Practice"] = "Zielübung", --Bazooka, Shotgun, SniperRifle
+	["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Eliminiere alle Ziele bevor die Zeit ausläuft.|Du hast in dieser Mission unbegrenzte Munition.", --Bazooka, Shotgun, SniperRifle
+	["Oh no! Time's up! Just try again."] = "Oh nein! Die Zeit ist um! Versuche es nochmal.", --Bazooka, Shotgun, SniperRifle
+	["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Gratulation! Du hast alle Ziele innerhalb der|verfügbaren Zeit ausgeschaltet.", --Bazooka, Shotgun, SniperRifle
+	["Hunter"] = "Jäger", --Bazooka, Shotgun, SniperRifle
+	["Bazooka Training"] = "Bazooka-Training",
+	["'Zooka Team"] = "Die Knalltüten",
+	["Shotgun Training"] = "Schrotflinten-Training",
+	["Shotgun Team"] = "Entrenamiento con escopeta",
+	["Sniper Training"] = "Scharfschützen-Training",
+	["Sniperz"] = "Heckenschützen",
+	["Not So Friendly Match"] = "Kein-so-Freundschaftsspiel", -- Basketball, Knockball
+	["%s is out and Team %d|scored a point!| |Score:"] = "%s ist draußen und Team %d|erhält einen Punkt!| |Punktestand:", -- Basketball, Knockball
+	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s ist draußen und Team %d|erhält eine Strafe!| |Punktestand:", -- Basketball, Knockball
 	["Hedgewars-Basketball"] = "Hedgewars-Basketball",
-	["Not So Friendly Match"] = "Kein-so-Freundschaftsspiel", -- Basketball, Knockball
 	["Bat your opponents through the|baskets and out of the map!"] = "Schlage deine Widersacher durch|die Körbe und aus der Karte hinaus!",
 	["Hedgewars-Knockball"] = "Hedgewars-Knockball",
 	["Bat balls at your enemies and|push them into the sea!"] = "Schlage Bälle auf deine Widersacher|und lass sie ins Meer fallen!",
-	["%s is out and Team %d|scored a point!| |Score:"] = "%s ist draußen und Team %d|erhält einen Punkt!| |Punktestand:", -- Basketball, Knockball
-	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s ist draußen und Team %d|erhält eine Strafe!| |Punktestand:", -- Basketball, Knockball
+--	["TrophyRace"] = 
+--	["Use your rope to get from start to finish as fast as you can!"] = 
+--	["You've reached the goal!| |Time: "] = 
+--	["NEW fastest lap: "] = 
+--	["Fastest lap: "] = 
+--	["Best laps per team: "] = 
+--	["Team %d: "] = 
     }

--- a/share/hedgewars/Data/Locale/es.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Locale/es.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -1,11 +1,22 @@
 locale = {
+	["Aiming Practice"] = "Practica tu puntería", --Bazooka, Shotgun, SniperRifle
+	["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Destruye todos los objetivos antes de que se agote el tiempo.|La munición en esta misión es ilimitada.", --Bazooka, Shotgun, SniperRifle
+	["Oh no! Time's up! Just try again."] = "¡Oh, no, se te acabó el tiempo! ¿Por qué no lo intentas de nuevo?", --Bazooka, Shotgun, SniperRifle
+	["Congratulations! You've eliminated all targets|within the allowed time frame."] = "¡Felicidades! Has destruido todos los objectivos|dentro del tiempo establecido.", --Bazooka, Shotgun, SniperRifle
+	["Hunter"] = "Artillero", --Bazooka, Shotgun, SniperRifle
+	["Bazooka Training"] = "Entrenamiento con bazuca",
+	["'Zooka Team"] = "Bazuqueros",
+	["Shotgun Training"] = "Entrenamiento con escopeta",
+	["Shotgun Team"] = "Escopeteros",
+	["Sniper Training"] = "Entrenamiento con rifle francotirador",
+	["Sniperz"] = "Fusileros",
+	["Not So Friendly Match"] = "Partido no-tan-amistoso", -- Basketball, Knockball
+	["%s is out and Team %d|scored a point!| |Score:"] = "¡%s cayó y Equipo %d|anotó un tanto!| |Puntuación:", -- Basketball, Knockball
+	["%s is out and Team %d|scored a penalty!| |Score:"] = "¡%s cayó y Equipo %d|anotó una falta!| |Puntuación:", -- Basketball, Knockball
 	["Hedgewars-Basketball"] = "Hedgewars-Baloncesto",
-	["Not So Friendly Match"] = "Partido no-tan-amistoso", -- Basketball, Knockball
 	["Bat your opponents through the|baskets and out of the map!"] = "¡Batea pelotas hacia tus enemigos|y hazlos caer al agua!",
 	["Hedgewars-Knockball"] = "Hedgewars-Knockball",
 	["Bat balls at your enemies and|push them into the sea!"] = "Schlage Bälle auf deine Widersacher|und lass sie ins Meer fallen!",
-	["%s is out and Team %d|scored a point!| |Score:"] = "¡%s cayó y Equipo %d|anotó un tanto!| |Puntuación:", -- Basketball, Knockball
-	["%s is out and Team %d|scored a penalty!| |Score:"] = "¡%s cayó y Equipo %d|anotó una falta!| |Puntuación:", -- Basketball, Knockball
 	["TrophyRace"] = "TrophyRace",
 	["Use your rope to get from start to finish as fast as you can!"] = "¡Usa tu cuerda para llegar a la salida lo más rápido que puedas!",
 	["You've reached the goal!| |Time: "] = "¡Has llegado a la meta!| |Tiempo: ",

--- a/share/hedgewars/Data/Locale/pl.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Locale/pl.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -1,11 +1,22 @@
 locale = {
+	["Aiming Practice"] = "Potrenuj celność", --Bazooka, Shotgun, SniperRifle
+	["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Zniszcz wszystkie cele zanim upłynie czas.|W tej misji masz nieskończoną ilość amunicji.", --Bazooka, Shotgun, SniperRifle
+	["Oh no! Time's up! Just try again."] = "Ajajaj! Koniec czasu! Spróbuj jeszcze raz.", --Bazooka, Shotgun, SniperRifle
+	["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Gratulacje! Zniszczyłeś wszystkie cele przed upłynięciem czasu.", --Bazooka, Shotgun, SniperRifle
+	["Hunter"] = "Strzelec", --Bazooka, Shotgun, SniperRifle
+	["Bazooka Training"] = "Trening bazooki",
+	["'Zooka Team"] = "Bazookinierzy",
+	["Shotgun Training"] = "Trening strzelecki",
+--	["Shotgun Team"] = 
+	["Sniper Training"] = "Trening Snajperski",
+	["Sniperz"] = "Snajperzy",
+	["Not So Friendly Match"] = "Mecz Nie-Do-Końca Towarzyski", -- Basketball, Knockball
+	["%s is out and Team %d|scored a point!| |Score:"] = "%s utonął i drużyna %d|zdobyła punkt!| |Punktacja:", -- Basketball, Knockball
+	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s utonął i drużyna %d|dostała punkt karny!| |Punktacja:", -- Basketball, Knockball
 	["Hedgewars-Basketball"] = "Hedgewars-Koszykówka",
-	["Not So Friendly Match"] = "Mecz Nie-Do-Końca Towarzyski", -- Basketball, Knockball
 	["Bat your opponents through the|baskets and out of the map!"] = "Uderzaj swoich przekiwników|wyrzucając przez kosz, poza mapę!",
 	["Hedgewars-Knockball"] = "Hedgewars-Knockball",
 	["Bat balls at your enemies and|push them into the sea!"] = "Uderzaj piłkami w swoich przeciwników|i strącaj ich do wody!",
-	["%s is out and Team %d|scored a point!| |Score:"] = "%s utonął i drużyna %d|zdobyła punkt!| |Punktacja:", -- Basketball, Knockball
-	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s utonął i drużyna %d|dostała punkt karny!| |Punktacja:", -- Basketball, Knockball
 	["TrophyRace"] = "TrophyRace",
 	["Use your rope to get from start to finish as fast as you can!"] = "Użyj liny by jak najszybciej dotrzec od startu do mety",
 	["You've reached the goal!| |Time: "] = "Dotarłeś do celu!| |Czas: ",

--- a/share/hedgewars/Data/Locale/pt_BR.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Locale/pt_BR.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -1,11 +1,22 @@
 locale = {
+	["Aiming Practice"] = "Pratique a sua pontaria", --Bazooka, Shotgun, SniperRifle
+	["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Destrua todos os alvos antes que o tempo acabe.|Você tem munição infinita para esta missão.", --Bazooka, Shotgun, SniperRifle
+	["Oh no! Time's up! Just try again."] = "Oh não! O tempo acabou! Tente novamente.", --Bazooka, Shotgun, SniperRifle
+	["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Parabéns! Você eliminou todos os alvos|dentro do tempo limite.", --Bazooka, Shotgun, SniperRifle
+	["Hunter"] = "Artilheiro", --Bazooka, Shotgun, SniperRifle
+	["Bazooka Training"] = "Treino com a Bazuca",
+	["'Zooka Team"] = "Bazuqueiros",
+	["Shotgun Training"] = "Treino com a Escopeta",
+	["Shotgun Team"] = "Carabineiros",
+	["Sniper Training"] = "Treino com o Rifle Sniper",
+	["Sniperz"] = "Franco-Atiradores",
+	["Not So Friendly Match"] = "Partida não muito amigável", -- Basketball, Knockball
+	["%s is out and Team %d|scored a point!| |Score:"] = "%s está fora e a Equipe %d|marcou um ponto!| |Pontuação:", -- Basketball, Knockball
+	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s está fora e a Equipe %d|sofreu uma penalidade!| |Pontuação:", -- Basketball, Knockball
 	["Hedgewars-Basketball"] = "Hedgewars-Basketball",
-	["Not So Friendly Match"] = "Partida não muito amigável", -- Basketball, Knockball
 	["Bat your opponents through the|baskets and out of the map!"] = "Rebata seus oponentes para|fora do mapa através dos cestos!",
 	["Hedgewars-Knockball"] = "Hedgewars-Knockball",
 	["Bat balls at your enemies and|push them into the sea!"] = "Rebata as bolas em direção ao seus|e derrube-os no mar!",
-	["%s is out and Team %d|scored a point!| |Score:"] = "%s está fora e a Equipe %d|marcou um ponto!| |Pontuação:", -- Basketball, Knockball
-	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s está fora e a Equipe %d|sofreu uma penalidade!| |Pontuação:", -- Basketball, Knockball
 	["TrophyRace"] = "TrophyRace",
 	["Use your rope to get from start to finish as fast as you can!"] = "Use sua corda para ir do início ao fim o mais rápido que você puder!",
 	["You've reached the goal!| |Time: "] = "Você alcançou o objetivo!| |Tempo: ",

--- a/share/hedgewars/Data/Locale/pt_PT.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Locale/pt_PT.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -1,11 +1,22 @@
 locale = {
+	["Aiming Practice"] = "Pratica a tua pontaria", --Bazooka, Shotgun, SniperRifle
+	["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Destrói todos os alvos antes do tempo terminar.|Tens munições infinitas para esta missão.", --Bazooka, Shotgun, SniperRifle
+	["Oh no! Time's up! Just try again."] = "Oh não! Acabou o tempo! Tenta novamente.", --Bazooka, Shotgun, SniperRifle
+	["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Parabéns! Eliminaste todos os alvos|dentro do tempo limite.", --Bazooka, Shotgun, SniperRifle
+	["Hunter"] = "Comando", --Bazooka, Shotgun, SniperRifle
+	["Bazooka Training"] = "Treino com Bazuca",
+	["'Zooka Team"] = "Bazuqueiros",
+	["Shotgun Training"] = "Treino com Caçadeira",
+	["Shotgun Team"] = "Caçadores",
+	["Sniper Training"] = "Treino com Sniper",
+--	["Sniperz"] = 
+	["Not So Friendly Match"] = "Partida não muito amigável", -- Basketball, Knockball
+	["%s is out and Team %d|scored a point!| |Score:"] = "%s está fora e a equipa %d|soma um ponto!| |Pontuação:", -- Basketball, Knockball
+	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s está fora e a equipa %d|perde um ponto!| |Pontuação:", -- Basketball, Knockball
 	["Hedgewars-Basketball"] = "Hedgewars-Basketball",
-	["Not So Friendly Match"] = "Partida não muito amigável", -- Basketball, Knockball
 	["Bat your opponents through the|baskets and out of the map!"] = "Bate os teus adversarios|fora do mapa acertando com eles no cesto!",
 	["Hedgewars-Knockball"] = "Hedgewars-Knockball",
 	["Bat balls at your enemies and|push them into the sea!"] = "Bate bolas contra os teus|enimigos e empurra-os ao mar!",
-	["%s is out and Team %d|scored a point!| |Score:"] = "%s está fora e a equipa %d|soma um ponto!| |Pontuação:", -- Basketball, Knockball
-	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s está fora e a equipa %d|perde um ponto!| |Pontuação:", -- Basketball, Knockball
 	["TrophyRace"] = "TrophyRace",
 	["Use your rope to get from start to finish as fast as you can!"] = "Utilizando a corda, percorre o percurso do inicio ao fim o mais rápido que conseguires!",
 	["You've reached the goal!| |Time: "] = "Chegaste ao fim!| |Tempo: ",

--- a/share/hedgewars/Data/Locale/sk.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Locale/sk.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -1,11 +1,22 @@
 locale = {
+	["Aiming Practice"] = "Tréning presnosti", --Bazooka, Shotgun, SniperRifle
+	["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Zneškodnite všetky ciele pred vypršaním času.|Na túto misiu máte neobmedzené množstvo streliva.", --Bazooka, Shotgun, SniperRifle
+	["Oh no! Time's up! Just try again."] = "Ale nie! Čas vypršal! Tak to skúste znovu.", --Bazooka, Shotgun, SniperRifle
+	["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Gratulujem! Zneškodnili ste všetky ciele|v stanovenom čase.", --Bazooka, Shotgun, SniperRifle
+	["Hunter"] = "Lovec", --Bazooka, Shotgun, SniperRifle
+	["Bazooka Training"] = "Tréning s bazukou",
+	["'Zooka Team"] = "Bazuka tím",
+	["Shotgun Training"] = "Tréning s brokovnicou",
+	["Shotgun Team"] = "Shotgun tím",
+	["Sniper Training"] = "Tréning pre ostreľovačov",
+	["Sniperz"] = "Ostreľovači",
+	["Not So Friendly Match"] = "Nie tak celkom priateľský zápas", -- Basketball, Knockball
+	["%s is out and Team %d|scored a point!| |Score:"] = "%s je mimo hru a tím %d|získal bod!| |Skóre:", -- Basketball, Knockball
+	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s je mimo hru a tím %d|dostal trestný bod!| |Skóre:", -- Basketball, Knockball
 	["Hedgewars-Basketball"] = "Hedgewars-Basketbal",
-	["Not So Friendly Match"] = "Nie tak celkom priateľský zápas", -- Basketball, Knockball
 	["Bat your opponents through the|baskets and out of the map!"] = "Odpálkujte vašich súperov do koša|a von z mapy!",
 	["Hedgewars-Knockball"] = "Hedgewars-Knockball",
 	["Bat balls at your enemies and|push them into the sea!"] = "Loptami triafajte vašich nepriateľov|a zhoďte ich tak do mora!",
-	["%s is out and Team %d|scored a point!| |Score:"] = "%s je mimo hru a tím %d|získal bod!| |Skóre:", -- Basketball, Knockball
-	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s je mimo hru a tím %d|dostal trestný bod!| |Skóre:", -- Basketball, Knockball
 	["TrophyRace"] = "Preteky o trofej",
 	["Use your rope to get from start to finish as fast as you can!"] = "Použite lano na presun zo štartovnej pozície do cieľa tak rýchlo, ako to len viete!",
 	["You've reached the goal!| |Time: "] = "Dosiahli ste cieľ!| |Čas: ",

--- a/share/hedgewars/Data/Locale/sv.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Locale/sv.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -1,11 +1,22 @@
 locale = {
+	["Aiming Practice"] = "Siktesövning", --Bazooka, Shotgun, SniperRifle
+	["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Förstör alla målen innan din tid tar slut.|Du har obegränsad ammunition för deta uppdrag", --Bazooka, Shotgun, SniperRifle
+	["Oh no! Time's up! Just try again."] = "Åh nej! Tiden är ute! Pröva igen.", --Bazooka, Shotgun, SniperRifle
+	["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Grattis! Du har förstört alla målen inom den|tillåtna tidsramen.", --Bazooka, Shotgun, SniperRifle
+	["Hunter"] = "Jägare", --Bazooka, Shotgun, SniperRifle
+	["Bazooka Training"] = "Bazookaträning",
+	["'Zooka Team"] = "Bazookalaget",
+	["Shotgun Training"] = "Hagelgevärsträning",
+	["Shotgun Team"] = "Hagelgevärslaget",
+	["Sniper Training"] = "Prickskyttesträning",
+	["Sniperz"] = "Prickskyttarna",
+	["Not So Friendly Match"] = "En inte så vänlig match", -- Basketball, Knockball
+	["%s is out and Team %d|scored a point!| |Score:"] = "%s är ute och lag %d|fick ett poäng!| |Poängställning:", -- Basketball, Knockball
+	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s är ute och lag %d|fick ett straff!| |Poängställning:", -- Basketball, Knockball
 	["Hedgewars-Basketball"] = "Hedgewars-Basket",
-	["Not So Friendly Match"] = "En inte så vänlig match", -- Basketball, Knockball
 	["Bat your opponents through the|baskets and out of the map!"] = "Slå ner dina motståndare i|korgarna och ut ur kartan!",
 	["Hedgewars-Knockball"] = "Hedgewars-Knockball",
 	["Bat balls at your enemies and|push them into the sea!"] = "Slå bollar mot dina fiender|och slå ner dem i havet",
-	["%s is out and Team %d|scored a point!| |Score:"] = "%s är ute och lag %d|fick ett poäng!| |Poängställning:", -- Basketball, Knockball
-	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s är ute och lag %d|fick ett straff!| |Poängställning:", -- Basketball, Knockball
 	["TrophyRace"] = "TrophyRace",
 	["Use your rope to get from start to finish as fast as you can!"] = "Använd ditt rep för att ta dig från start till mål så fort som möjligt!",
 	["You've reached the goal!| |Time: "] = "Du har nått målet!| |Tid: ",

--- a/share/hedgewars/Data/Maps/Basketball/map.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Maps/Basketball/map.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -1,6 +1,6 @@
-loadfile(GetDataPath() .. "Scripts/Locale.lua")()
+-- Hedgewars - Basketball for 2+ Players
 
--- Hedgewars - Basketball for 2+ Players
+loadfile(GetDataPath() .. "Scripts/Locale.lua")()
 
 local score = {[0] = 0, [1] = 0, [2] = 0, [3] = 0, [4] = 0, [5] = 0}
 

--- a/share/hedgewars/Data/Maps/Knockball/map.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Maps/Knockball/map.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -1,6 +1,6 @@
-loadfile(GetDataPath() .. "Scripts/Locale.lua")()
+-- Hedgewars - Knockball for 2+ Players
 
--- Hedgewars - Knockball for 2+ Players
+loadfile(GetDataPath() .. "Scripts/Locale.lua")()
 
 local score = {[0] = 0, [1] = 0, [2] = 0, [3] = 0, [4] = 0, [5] = 0}
 

--- a/share/hedgewars/Data/Maps/TrophyRace/map.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Maps/TrophyRace/map.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -1,6 +1,6 @@
-loadfile(GetDataPath() .. "Scripts/Locale.lua")()
+-- Hedgewars - Roperace for 2+ Players
 
--- Hedgewars - Roperace for 2+ Players
+loadfile(GetDataPath() .. "Scripts/Locale.lua")()
 
 -- store number of hedgehogs
 local numhhs = 0

--- a/share/hedgewars/Data/Missions/Campaign/01#Boot Camp.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/01#Boot Camp.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -1,5 +1,5 @@
 -- IMPORTANT -- THIS IS WORK IN PROGRESS AND VERY LIKELY TO BE CHANGED AGAIN
--- IMPORTANT -- SAVE YOURSELF THE WORK AND DON'T TRANSLATE THE TEXTS IF YOU FEAR STARTING OVER LATER!
+-- IMPORTANT -- DO NOT TRANSLATE THIS AS IT USES THE OLD SYSTEM AND WILL BE UPDATED LATER!
 
 local teamnames = {}
 local hognames = {}

--- a/share/hedgewars/Data/Missions/Training/Bazooka.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Missions/Training/Bazooka.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -8,102 +8,12 @@
 -- following "--" is ignored.
 
 ---------------------------------------------------------------
--- At first we put all text we'd like to use in some arrays.
--- This way we're able to localize the text to be shown without
--- modifying other files.
--- The language to be used is stored in the global variable
--- 'L' that is set by the game (string).
--- Text may then be accessed using "arrayname[L]".
-
-local caption = {
-	["en"] = "Bazooka Training",
-	["de"] = "Bazooka-Training",
-	["es"] = "Entrenamiento con bazuca",
-	["pl"] = "Trening bazooki",
-	["pt_PT"] = "Treino com Bazuca",
-	["pt_BR"] = "Treino com a Bazuca",
-	["sv"] = "Bazookaträning",
-	["sk"] = "Tréning s bazukou"
-	-- To add other languages, just add lines similar to the
-	-- existing ones - don't forget the trailing ","!
-	}
-
-local subcaption = {
-	["en"] = "Aiming Practice",
-	["de"] = "Zielübung",
-	["es"] = "Practica tu puntería",
-	["pl"] = "Potrenuj celność",
-	["pt_PT"] = "Pratica a tua pontaria",
-	["pt_BR"] = "Pratique a sua pontaria",
-	["sv"] = "Siktesövning",
-	["sk"] = "Tréning presnosti"
-	}
-
-local goal = {
-	["en"] = "Eliminate all targets before your time runs out.|You have unlimited ammo for this mission.",
-	["de"] = "Eliminiere alle Ziele bevor die Zeit ausläuft.|Du hast in dieser Mission unbegrenzte Munition.",
-	["es"] = "Destruye todos los objetivos antes de que se agote el tiempo.|La munición en esta misión es ilimitada.",
-	["pl"] = "Zniszcz wszystkie cele zanim upłynie czas.|W tej misji masz nieskończoną ilość amunicji.",
-	["pt_PT"] = "Destrói todos os alvos antes do tempo terminar.|Tens munições infinitas para esta missão.",
-	["pt_BR"] = "Destrua todos os alvos antes que o tempo acabe.|Você tem munição infinita para esta missão.",
-	["sv"] = "Förstör alla målen innan din tid tar slut.|Du har obegränsad ammunition för deta uppdrag",
-	["sk"] = "Zneškodnite všetky ciele pred vypršaním času.|Na túto misiu máte neobmedzené množstvo streliva."
-	}
+-- At first we implement the localization library using loadfile.
+-- This allows us to localize strings without needing to think
+-- about translations.
+-- We can use the function loc(text) to localize a string.
 
-local timeout = {
-	["en"] = "Oh no! Time's up! Just try again.",
-	["de"] = "Oh nein! Die Zeit ist um! Versuche es nochmal.",
-	["es"] = "¡Oh, no, se te acabó el tiempo! ¿Por qué no lo intentas de nuevo?",
-	["pl"] = "Ajajaj! Koniec czasu! Spróbuj jeszcze raz.",
-	["pt_PT"] = "Oh não! Acabou o tempo! Tenta novamente.",
-	["pt_BR"] = "Oh não! O tempo acabou! Tente novamente.",
-	["sv"] = "Åh nej! Tiden är ute! Pröva igen.",
-	["sk"] = "Ale nie! Čas vypršal! Tak to skúste znovu."
-	}
-
-local success = {
-	["en"] = "Congratulations! You've eliminated all targets|within the allowed time frame.",
-	["de"] = "Gratulation! Du hast alle Ziele innerhalb der|verfügbaren Zeit ausgeschaltet.",
-	["es"] = "¡Felicidades! Has destruido todos los objectivos|dentro del tiempo establecido.",
-	["pl"] = "Gratulacje! Zniszczyłeś wszystkie cele przed upłynięciem czasu.",
-	["pt_PT"] = "Parabéns! Eliminaste todos os alvos|dentro do tempo limite.",
-	["pt_BR"] = "Parabéns! Você eliminou todos os alvos|dentro do tempo limite.",
-	["sv"] = "Grattis! Du har förstört alla målen inom den|tillåtna tidsramen.",
-	["sk"] = "Gratulujem! Zneškodnili ste všetky ciele|v stanovenom čase."
-	}
-
-local teamname = {
-	["en"] = "'Zooka Team",
-	["de"] = "Die Knalltüten",
-	["es"] = "Bazuqueros",
-	["pl"] = "Bazookinierzy",
-	["pt_PT"] = "Bazuqueiros",
-	["pt_BR"] = "Bazuqueiros",
-	["sv"] = "Bazookalaget",
-	["sk"] = "Bazuka tím"
-	}
-
-local hogname = {
-	["en"] = "Hunter",
-	["de"] = "Jäger",
-	["es"] = "Artillero",
-	["pl"] = "Strzelec",
-	["pt_PT"] = "Comando",
-	["pt_BR"] = "Artilheiro",
-	["sv"] = "Jägare",
-	["sk"] = "Lovec"
-	}
-
--- To handle missing texts we define a small wrapper function that
--- we'll use to retrieve text.
-local function loc(text)
-	if text == nil then return "**missing**"
-	elseif text[L] == nil then return text["en"]
-	else return text[L]
-	end
-end
-
----------------------------------------------------------------
+loadfile(GetDataPath() .. "Scripts/Locale.lua")()
 
 -- This variable will hold the number of destroyed targets.
 local score = 0
@@ -171,9 +81,9 @@
 	Theme = "Bamboo"
 
 	-- Create the player team
-	AddTeam(loc(teamname), 14483456, "Simple", "Island", "Default")
+	AddTeam(loc("'Zooka Team"), 14483456, "Simple", "Island", "Default")
 	-- And add a hog to it
-	player = AddHog(loc(hogname), 0, 1, "NoHat")
+	player = AddHog(loc("Hunter"), 0, 1, "NoHat")
 	SetGearPosition(player, 1960, 1160)
 end
 
@@ -190,7 +100,7 @@
 	-- A negative icon parameter (-n) represents the n-th weapon icon
 	-- A positive icon paramter (n) represents the (n+1)-th mission icon
 	-- A timeframe of 0 is replaced with the default time to show.
-	ShowMission(loc(caption), loc(subcaption), loc(goal), -amBazooka, 0)
+	ShowMission(loc("Bazooka Training"), loc("Aiming Practice"), loc("Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."), -amBazooka, 0)
 end
 
 -- This function is called every game tick.
@@ -204,7 +114,7 @@
 	if TurnTimeLeft == 1 and score < score_goal then
 		game_lost = true
 		-- ... and show a short message.
-		ShowMission(loc(caption), loc(subcaption), loc(timeout), -amSkip, 0)
+		ShowMission(loc("Bazooka Training"), loc("Aiming Practice"), loc("Oh no! Time's up! Just try again."), -amSkip, 0)
 		-- How about killing our poor hog due to his poor performance?
 		SetHealth(player, 0)
 		-- Just to be sure set the goal time to 1 ms
@@ -253,7 +163,7 @@
 		else
 			if not game_lost then
 			-- Otherwise show that the goal was accomplished
-			ShowMission(loc(caption), loc(subcaption), loc(success), 0, 0)
+			ShowMission(loc("Bazooka Training"), loc("Aiming Practice"), loc("Congratulations! You've eliminated all targets|within the allowed time frame."), 0, 0)
 			-- Also let the hogs shout "victory!"
 			PlaySound(sndVictory)
 			-- Save the time left so we may keep it.

--- a/share/hedgewars/Data/Missions/Training/Shotgun.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Missions/Training/Shotgun.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -8,102 +8,12 @@
 -- following "--" is ignored.
 
 ---------------------------------------------------------------
--- At first we put all text we'd like to use in some arrays.
--- This way we're able to localize the text to be shown without
--- modifying other files.
--- The language to be used is stored in the global variable
--- 'L' that is set by the game (string).
--- Text may then be accessed using "arrayname[L]".
-
-local caption = {
-	["en"] = "Shotgun Training",
-	["de"] = "Schrotflinten-Training",
-	["es"] = "Entrenamiento con escopeta",
-	["pl"] = "Trening strzelecki",
-	["pt_PT"] = "Treino com Caçadeira",
-	["pt_BR"] = "Treino com a Escopeta",
-	["sv"] = "Hagelgevärsträning",
-	["sk"] = "Tréning s brokovnicou"
-	-- To add other languages, just add lines similar to the
-	-- existing ones - don't forget the trailing ","!
-	}
-
-local subcaption = {
-	["en"] = "Aiming Practice",
-	["de"] = "Zielübung",
-	["es"] = "Practica tu puntería",
-	["pl"] = "Potrenuj celność",
-	["pt_PT"] = "Pratica a tua pontaria",
-	["pt_BR"] = "Pratique a sua pontaria",
-	["sv"] = "Siktesövning",
-	["sk"] = "Tréning presnosti"
-	}
-
-local goal = {
-	["en"] = "Eliminate all targets before your time runs out.|You have unlimited ammo for this mission.",
-	["de"] = "Eliminiere alle Ziele bevor die Zeit ausläuft.|Du hast in dieser Mission unbegrenzte Munition.",
-	["es"] = "Destruye todos los objetivos antes de que se agote el tiempo.|La munición en esta misión es ilimitada.",
-	["pl"] = "Zniszcz wszystkie cele zanim upłynie czas.|W tej misji masz nieskończoną ilość amunicji.",
-	["pt_PT"] = "Destrói todos os alvos antes do tempo terminar.|Tens munições infinitas para esta missão.",
-	["pt_BR"] = "Destrua todos os alvos antes que o tempo acabe.|Você tem munição infinita para esta missão.",
-	["sv"] = "Förstör alla målen innan din tid tar slut.|Du har obegränsad ammunition för deta uppdrag",
-	["sk"] = "Zneškodnite všetky ciele pred vypršaním času.|Na túto misiu máte neobmedzené množstvo streliva."
-	}
+-- At first we implement the localization library using loadfile.
+-- This allows us to localize strings without needing to think
+-- about translations.
+-- We can use the function loc(text) to localize a string.
 
-local timeout = {
-	["en"] = "Oh no! Time's up! Just try again.",
-	["de"] = "Oh nein! Die Zeit ist um! Versuche es nochmal.",
-	["es"] = "¡Oh, no, se te acabó el tiempo! ¿Por qué no lo intentas de nuevo?",
-	["pl"] = "Ajajaj! Koniec czasu! Spróbuj jeszcze raz.",
-	["pt_PT"] = "Oh não! Acabou o tempo! Tenta novamente.",
-	["pt_BR"] = "Oh não! O tempo acabou! Tente novamente.",
-	["sv"] = "Åh nej! Tiden är ute! Pröva igen.",
-	["sk"] = "Ale nie! Čas vypršal! Tak to skúste znovu."
-	}
-
-local success = {
-	["en"] = "Congratulations! You've eliminated all targets|within the allowed time frame.",
-	["de"] = "Gratulation! Du hast alle Ziele innerhalb der|verfügbaren Zeit ausgeschaltet.",
-	["es"] = "¡Felicidades! Has destruido todos los objectivos|dentro del tiempo establecido.",
-	["pl"] = "Gratulacje! Zniszczyłeś wszystkie cele przed upłynięciem czasu.",
-	["pt_PT"] = "Parabéns! Eliminaste todos os alvos|dentro do tempo limite.",
-	["pt_BR"] = "Parabéns! Você eliminou todos os alvos|dentro do tempo limite.",
-	["sv"] = "Grattis! Du har förstört alla målen inom den|tillåtna tidsramen.",
-	["sk"] = "Gratulujem! Zneškodnili ste všetky ciele|v stanovenom čase."
-	}
-
-local teamname = {
-	["en"] = "Shotgun Team",
-	["de"] = "Die Knalltüten",
-	["es"] = "Escopeteros",
-	["pl"] = "Shotgun Team",
-	["pt_PT"] = "Caçadores",
-	["pt_PT"] = "Carabineiros",
-	["sv"] = "Hagelgevärslaget",
-	["sk"] = "Shotgun tím"
-	}
-
-local hogname = {
-	["en"] = "Hunter",
-	["de"] = "Jäger",
-	["es"] = "Cazador",
-	["pl"] = "Strzelec",
-	["pt_PT"] = "Comando",
-	["pt_BR"] = "Caçador",
-	["sv"] = "Jägare",
-	["sk"] = "Lovec"
-	}
-
--- To handle missing texts we define a small wrapper function that
--- we'll use to retrieve text.
-local function loc(text)
-	if text == nil then return "**missing**"
-	elseif text[L] == nil then return text["en"]
-	else return text[L]
-	end
-end
-
----------------------------------------------------------------
+loadfile(GetDataPath() .. "Scripts/Locale.lua")()
 
 -- This variable will hold the number of destroyed targets.
 local score = 0
@@ -171,9 +81,9 @@
 	Theme = "Nature"
 
 	-- Create the player team
-	AddTeam(loc(teamname), 14483456, "Simple", "Island", "Default")
+	AddTeam(loc("Shotgun Team"), 14483456, "Simple", "Island", "Default")
 	-- And add a hog to it
-	player = AddHog(loc(hogname), 0, 1, "NoHat")
+	player = AddHog(loc("Hunter"), 0, 1, "NoHat")
 	SetGearPosition(player, 2334, 1254)
 end
 
@@ -190,7 +100,7 @@
 	-- A negative icon parameter (-n) represents the n-th weapon icon
 	-- A positive icon paramter (n) represents the (n+1)-th mission icon
 	-- A timeframe of 0 is replaced with the default time to show.
-	ShowMission(loc(caption), loc(subcaption), loc(goal), -amShotgun, 0)
+	ShowMission(loc("Shotgun Training"), loc("Aiming Practice"), loc("Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."), -amShotgun, 0)
 end
 
 -- This function is called every game tick.
@@ -204,7 +114,7 @@
 	if TurnTimeLeft == 1 and score < score_goal then
 		game_lost = true
 		-- ... and show a short message.
-		ShowMission(loc(caption), loc(subcaption), loc(timeout), -amSkip, 0)
+		ShowMission(loc("Shotgun Training"), loc("Aiming Practice"), loc("Oh no! Time's up! Just try again."), -amSkip, 0)
 		-- How about killing our poor hog due to his poor performance?
 		SetHealth(player, 0)
 		-- Just to be sure set the goal time to 1 ms
@@ -253,7 +163,7 @@
 		else
 			if not game_lost then
 			-- Otherwise show that the goal was accomplished
-			ShowMission(loc(caption), loc(subcaption), loc(success), 0, 0)
+			ShowMission(loc("Shotgun Training"), loc("Aiming Practice"), loc("Congratulations! You've eliminated all targets|within the allowed time frame."), 0, 0)
 			-- Also let the hogs shout "victory!"
 			PlaySound(sndVictory)
 			-- Save the time left so we may keep it.

--- a/share/hedgewars/Data/Missions/Training/SniperRifle.lua	Sat Dec 11 02:30:03 2010 +0100
+++ b/share/hedgewars/Data/Missions/Training/SniperRifle.lua	Sat Dec 11 14:03:49 2010 +0100
@@ -8,101 +8,12 @@
 -- following "--" is ignored.
 
 ---------------------------------------------------------------
--- At first we put all text we'd like to use in some arrays.
--- This way we're able to localize the text to be shown without
--- modifying other files.
--- The language to be used is stored in the global variable
--- 'L' that is set by the game (string).
--- Text may then be accessed using "arrayname[L]".
-
-local caption = {
-	["en"] = "Sniper Training",
-	["de"] = "Scharfschützen-Training",
-	["es"] = "Entrenamiento con rifle francotirador",
-	["pl"] = "Trening Snajperski",
-	["pt_PT"] = "Treino com Sniper",
-	["pt_BR"] = "Treino com o Rifle Sniper",
-	["sv"] = "Prickskyttesträning",
-	["sk"] = "Tréning pre ostreľovačov"
-	-- To add other languages, just add lines similar to the
-	-- existing ones - don't forget the trailing ","!
-	}
-
-local subcaption = {
-	["en"] = "Aiming Practice",
-	["de"] = "Zielübung",
-	["es"] = "Practica tu puntería",
-	["pl"] = "Potrenuj celność",
-	["pt_PT"] = "Pratica a tua pontaria",
-	["pt_BR"] = "Pratique a sua pontaria",
-	["sv"] = "Siktesövning",
-	["sk"] = "Tréning presnosti"
-	}
-
-local goal = {
-	["en"] = "Eliminate all targets before your time runs out.|You have unlimited ammo for this mission.",
-	["de"] = "Eliminiere alle Ziele bevor die Zeit ausläuft.|Du hast in dieser Mission unbegrenzte Munition.",
-	["es"] = "Destruye todos los objetivos antes de que se agote el tiempo.|La munición en esta misión es ilimitada.",
-	["pl"] = "Zniszcz wszystkie cele zanim upłynie czas.|W tej misji masz nieskończoną ilość amunicji.",
-	["pt_PT"] = "Destrói todos os alvos antes do tempo terminar.|Tens munições infinitas para esta missão.",
-	["pt_BR"] = "Destrua todos os alvos antes que o tempo acabe.|Você tem munição infinita para esta missão.",
-	["sv"] = "Förstör alla målen innan din tid tar slut.|Du har obegränsad ammunition för deta uppdrag",
-	["sk"] = "Zneškodnite všetky ciele pred vypršaním času.|Na túto misiu máte neobmedzené množstvo streliva."
-	}
+-- At first we implement the localization library using loadfile.
+-- This allows us to localize strings without needing to think
+-- about translations.
+-- We can use the function loc(text) to localize a string.
 
-local timeout = {
-	["en"] = "Oh no! Time's up! Just try again.",
-	["de"] = "Oh nein! Die Zeit ist um! Versuche es nochmal.",
-	["es"] = "¡Oh, no, se te acabó el tiempo! ¿Por qué no lo intentas de nuevo?",
-	["pl"] = "Ajajaj! Koniec czasu! Spróbuj jeszcze raz.",
-	["pt_PT"] = "Oh não! Acabou o tempo! Tenta novamente.",
-	["pt_BR"] = "Oh não! O tempo acabou! Tente novamente.",
-	["sv"] = "Åh nej! Tiden är ute! Pröva igen.",
-	["sk"] = "Ale nie! Čas vypršal! Tak to skúste znovu."
-	}
-
-local success = {
-	["en"] = "Congratulations! You've eliminated all targets|within the allowed time frame.",
-	["de"] = "Gratulation! Du hast alle Ziele innerhalb der|verfügbaren Zeit ausgeschaltet.",
-	["es"] = "¡Felicidades! Has destruido todos los objectivos|dentro del tiempo establecido.",
-	["pl"] = "Gratulacje! Zniszczyłeś wszystkie cele przed upłynięciem czasu.",
-	["pt_PT"] = "Parabéns! Eliminaste todos os alvos|dentro do tempo limite.",
-	["pt_BR"] = "Parabéns! Você eliminou todos os alvos|dentro do tempo limite.",
-	["sv"] = "Grattis! Du har förstört alla målen inom den|tillåtna tidsramen.",
-	["sk"] = "Gratulujem! Zneškodnili ste všetky ciele|v stanovenom čase."
-	}
-
-local teamname = {
-	["en"] = "Sniperz",
-	["de"] = "Heckenschützen",
-	["es"] = "Fusileros",
-	["pl"] = "Snajperzy",
-	["pt_BR"] = "Franco-Atiradores",
-	["sv"] = "Prickskyttarna",
-	["sk"] = "Ostreľovači"
-	}
-
-local hogname = {
-	["en"] = "Hunter",
-	["de"] = "Jäger",
-	["es"] = "Francotirador",
-	["pl"] = "Strzelec",
-	["pt_PT"] = "Comando",
-	["pt_BR"] = "Caçador",
-	["sv"] = "Jägare",
-	["sk"] = "Lovec"
-	}
-
--- To handle missing texts we define a small wrapper function that
--- we'll use to retrieve text.
-local function loc(text)
-	if text == nil then return "**missing**"
-	elseif text[L] == nil then return text["en"]
-	else return text[L]
-	end
-end
-
----------------------------------------------------------------
+loadfile(GetDataPath() .. "Scripts/Locale.lua")()
 
 -- This variable will hold the number of destroyed targets.
 local score = 0
@@ -171,9 +82,9 @@
 	Theme = "City"
 
 	-- Create the player team
-	AddTeam(loc(teamname), 14483456, "Simple", "Island", "Default")
+	AddTeam(loc("Sniperz"), 14483456, "Simple", "Island", "Default")
 	-- And add a hog to it
-	player = AddHog(loc(hogname), 0, 1, "Sniper")
+	player = AddHog(loc("Hunter"), 0, 1, "Sniper")
 	SetGearPosition(player, 602, 1465)
 end
 
@@ -190,7 +101,7 @@
 	-- A negative icon parameter (-n) represents the n-th weapon icon
 	-- A positive icon paramter (n) represents the (n+1)-th mission icon
 	-- A timeframe of 0 is replaced with the default time to show.
-	ShowMission(loc(caption), loc(subcaption), loc(goal), -amSniperRifle, 0)
+	ShowMission(loc("Sniper Training"), loc("Aiming Practice"), loc("Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."), -amSniperRifle, 0)
 end
 
 -- This function is called every game tick.
@@ -215,7 +126,7 @@
 	if TurnTimeLeft == 1 and score < score_goal then
 		game_lost = true
 		-- ... and show a short message.
-		ShowMission(loc(caption), loc(subcaption), loc(timeout), -amSkip, 0)
+		ShowMission(loc("Sniper Training"), loc("Aiming Practice"), loc("Oh no! Time's up! Just try again."), -amSkip, 0)
 		-- How about killing our poor hog due to his poor performance?
 		SetHealth(player, 0)
 		-- Just to be sure set the goal time to 1 ms
@@ -381,7 +292,7 @@
 		else
 			if not game_lost then
 			-- Otherwise show that the goal was accomplished
-			ShowMission(loc(caption), loc(subcaption), loc(success), 0, 0)
+			ShowMission(loc("Sniper Training"), loc("Aiming Practice"), loc("Congratulations! You've eliminated all targets|within the allowed time frame."), 0, 0)
 			-- Also let the hogs shout "victory!"
 			PlaySound(sndVictory)
 			-- Save the time left so we may keep it.