# HG changeset patch
# User unc0rr
# Date 1289147242 -10800
# Node ID 7bbd7ab8445414dd37552fd5ef277a23fbf92c5b
# Parent  49ad7bea4a336e1e61743fa1b5620782f2222413# Parent  7fb7386423d8b1acb4ba9e135cd86fbab1af66a2
merge

diff -r 49ad7bea4a33 -r 7bbd7ab84454 share/hedgewars/Data/Locale/hedgewars_zh_CN.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts	Sun Nov 07 19:24:37 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts	Sun Nov 07 19:27:22 2010 +0300
@@ -92,12 +92,12 @@
     <message>
         <source>Hedgewars Demo File</source>
         <comment>File Types</comment>
-        <translation type="unfinished"></translation>
+        <translation>刺猬杀演示文件</translation>
     </message>
     <message>
         <source>Hedgewars Save File</source>
         <comment>File Types</comment>
-        <translation type="unfinished"></translation>
+        <translation>刺猬杀存储文件</translation>
     </message>
 </context>
 <context>
@@ -615,7 +615,7 @@
     <message>
         <source>Like Hedgewars? Become a fan on %1 or follow us on %2!</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>喜欢刺猬杀？ 来做我们的粉丝吧可以到%1或者%2!</translation>
     </message>
     <message>
         <source>Feel free to draw your own graves, hats, flags or even maps and themes! But note that you&apos;ll have to share them somewhere to use them online.</source>
@@ -645,7 +645,7 @@
     <message>
         <source>You&apos;re able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</source>
         <comment>Tips</comment>
-        <translation type="unfinished"></translation>
+        <translation>你可以组织刺猬杀的相关文件（保存的游戏和演示还有录像），通过收藏夹或者浏览器.</translation>
     </message>
 </context>
 <context>
@@ -955,19 +955,19 @@
     </message>
     <message>
         <source>All (living) hedgehogs are fully restored at the end of turn</source>
-        <translation type="unfinished"></translation>
+        <translation>所有或者的刺猬结局的时候都会被保存</translation>
     </message>
     <message>
         <source>Attacking does not end your turn.</source>
-        <translation type="unfinished"></translation>
+        <translation>不会终结你的回合.</translation>
     </message>
     <message>
         <source>Weapons are reset to starting values each turn.</source>
-        <translation type="unfinished"></translation>
+        <translation>每轮武器的配置都会重置.</translation>
     </message>
     <message>
         <source>Each hedgehog has its own ammo. It does not share with the team.</source>
-        <translation type="unfinished"></translation>
+        <translation>每个刺猬都有其自己的武器. 并在奔队中不共享.</translation>
     </message>
 </context>
 <context>
@@ -1388,11 +1388,11 @@
     </message>
     <message>
         <source>% Health Crates</source>
-        <translation type="unfinished"></translation>
+        <translation>% 健康包裹</translation>
     </message>
     <message>
         <source>Health in Crates</source>
-        <translation type="unfinished"></translation>
+        <translation>包裹里有血</translation>
     </message>
     <message>
         <source>Sudden Death Water Rise</source>
@@ -1461,11 +1461,11 @@
     </message>
     <message>
         <source>All file associations have been set.</source>
-        <translation type="unfinished"></translation>
+        <translation>文件联合已经存储完毕. </translation>
     </message>
     <message>
         <source>File association failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>文件联合失败.</translation>
     </message>
 </context>
 <context>
@@ -1559,7 +1559,7 @@
     </message>
     <message>
         <source>Associate file extensions</source>
-        <translation type="unfinished"></translation>
+        <translation>连接文件扩展</translation>
     </message>
 </context>
 <context>
@@ -1703,19 +1703,19 @@
     </message>
     <message>
         <source>Reset Health</source>
-        <translation type="unfinished"></translation>
+        <translation>重置健康值</translation>
     </message>
     <message>
         <source>Unlimited Attacks</source>
-        <translation type="unfinished"></translation>
+        <translation>无限攻击</translation>
     </message>
     <message>
         <source>Reset Weapons</source>
-        <translation type="unfinished"></translation>
+        <translation>重置所有武器</translation>
     </message>
     <message>
         <source>Per Hedgehog Ammo</source>
-        <translation type="unfinished"></translation>
+        <translation>每个刺猬的武器</translation>
     </message>
 </context>
 <context>
diff -r 49ad7bea4a33 -r 7bbd7ab84454 share/hedgewars/Data/Maps/TrophyRace/map.lua
--- a/share/hedgewars/Data/Maps/TrophyRace/map.lua	Sun Nov 07 19:24:37 2010 +0300
+++ b/share/hedgewars/Data/Maps/TrophyRace/map.lua	Sun Nov 07 19:27:22 2010 +0300
@@ -3,39 +3,47 @@
 local caption = {
 	["en"] = "TrophyRace",
 	["sv"] = "TrophyRace",
+	["pt_PT"] = "TrophyRace"
 	}
 
 local goal = {
 	["en"] = "Use your rope to get from start to finish as fast as you can!",
 	["sv"] = "Använd ditt rep för att ta dig från start till mål så fort som möjligt!",
+	["pt_PT"] = "Utilizando a corda, percorre o percurso do inicio ao fim o mais rápido que conseguires!"
 	}
 
 local done = {
 	["en"] = "You've reached the goal!| |Time: ",
 	["sv"] = "Du har nått målet!| |Tid: ",
+	["pt_PT"] = "Chegaste ao fim!| |Tempo: "
 	}
 
 local eliminated = {
 	["en"] = "Eliminating worst hedgehog this round...| |%s is OUT!",
 	["sv"] = "Eliminerar sämsta igelkott den här rundan...| |%s är UTE!",
+	["pt_PT"] = "A eliminar o pior ouriço da ronda...| |% está FORA!"
 	}
 
 local newbesttime = {
 	["en"] = "NEW fastest lap: ",
 	["sv"] = "NYTT snabbast varv: ",
+	["pt_PT"] = "NOVA volta recorde: "
 	}
 
 local oldbesttime = {
 	["en"] = "Fastest lap: ",
 	["sv"] = "Snabbast varv: ",
+	["pt_PT"] = "Volta mais rápida: "
 	}
 local bestclantimes = {
 	["en"] = "Best laps per team: ",
 	["sv"] = "Bästa varv per lag: ",
+	["pt_PT"] = "Melhores voltas por equipa: "
 	}
 local clantime = {
 	["en"] = "Team %d: ",
 	["sv"] = "Lag %d: ",
+	["pt_PT"] = "Equipa %d: "
 	}
 
 	local function loc(text)
diff -r 49ad7bea4a33 -r 7bbd7ab84454 share/hedgewars/Data/Missions/Campaign/01#Boot Camp.lua
--- a/share/hedgewars/Data/Missions/Campaign/01#Boot Camp.lua	Sun Nov 07 19:24:37 2010 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/01#Boot Camp.lua	Sun Nov 07 19:27:22 2010 +0300
@@ -8,7 +8,8 @@
 	["de"] = "Blutige Anfänger",
 	["pl"] = "Żótodzioby",
 	["sv"] = "Blodiga nybörjare",
-	["es"] = "Reclutas"
+	["es"] = "Reclutas",
+	["pt_PT"] = "Recrutas"
 }
 
 teamnames[1] = {
@@ -16,7 +17,8 @@
 	["de"] = "Ausbilder",
 	["pl"] = "Instruktor",
 	["sv"] = "Instruktör",
-	["es"] = "Instructores"
+	["es"] = "Instructores",
+	["pt_PT"] = "Instrutores"
 }
 
 hognames[0] = {
@@ -24,7 +26,8 @@
 	["de"] = "Joker",
 	["pl"] = "Joker",
 	["sv"] = "Joker",
-	["es"] = "Joker"
+	["es"] = "Joker",
+	["pt_PT"] = "Joker"
 }
 
 hognames[1] = {
@@ -32,7 +35,8 @@
 	["de"] = "Harthog",
 	["pl"] = "Harthog",
 	["sv"] = "Harthog",
-	["es"] = "Harthog"
+	["es"] = "Harthog",
+	["pt_PT"] = "Harthog"
 }
 
 local caption = {
@@ -40,7 +44,8 @@
 	["de"] = "Grundausbildung",
 	["pl"] = "Poligon",
 	["sv"] = "Grundutbildning",
-	["es"] = "Campamento militar"
+	["es"] = "Campamento militar",
+	["pt_PT"] = "Acampamento militar"
 }
 
 local subcaption = {
@@ -48,7 +53,8 @@
 	["de"] = "Befolge die Anweisungen!",
 	["pl"] = "Wykonuj polecenia!",
 	["sv"] = "Följ instruktioner!",
-	["es"] = "¡Sigue las órdenes!"
+	["es"] = "¡Sigue las órdenes!",
+	["pt_PT"] = "Segue as instruções!"
 }
 
 local goals = {}
@@ -58,7 +64,8 @@
 	["de"] = "Höre deinem Ausbilder zu und befolge seine Anweisungen!",
 	["pl"] = "Słuchaj instruktora i wykonuj jego rozkazy!",
 	["sv"] = "Lyssna på din instruktör och gör som han säger!",
-	["es"] = "¡Escucha atentamente a tu instructor de maniobras y sigue sus órdenes!"
+	["es"] = "¡Escucha atentamente a tu instructor de maniobras y sigue sus órdenes!",
+	["pt_PT"] = "Ouve atentamente o teu Instrutor e segue as suas ordens!"
 }
 
 goals[1] = {
@@ -66,7 +73,8 @@
 	["de"] = "Zerstöre das Ziel, um diese Mission abzuschließen!",
 	["pl"] = "Zniszcz cel by ukończyć misję!",
 	["sv"] = "Förstör målet för att avklara uppdraget!",
-	["es"] = "¡Destruye el objetivo para completar esta misión!"
+	["es"] = "¡Destruye el objetivo para completar esta misión!",
+	["pt_PT"] = "Destrói o alvo para completar esta missão!"
 }
 
 goals[2] = {
@@ -74,7 +82,8 @@
 	["de"] = "Ausgezeichnet! Du hast das Ausbildungslager bestanden!",
 	["pl"] = "Doskonale! Wyszedłeś cało z poligonu!",
 	["sv"] = "Brilliant! Du har klarat av grundutbildningen!",
-	["es"] = "¡Excelente! ¡Has completado la maniobra de hoy!"
+	["es"] = "¡Excelente! ¡Has completado la maniobra de hoy!",
+	["pt_PT"] = "Excelente! Completaste o treino para recrutas!"
 }
 
 local failed = {
@@ -82,7 +91,8 @@
 	["de"] = "Du hast versagt! Befolge die Anweisungen und schieß nur auf das Ziel!",
 	["pl"] = "Przegrałeś! Wykonuj instrukcje poprawnie i strzelaj tylko w podane cele!",
 	["sv"] = "Du har misslyckats! Följ instruktionerna och sjut endast på målen!",
-	["es"] = "¡Has fallado! ¡Sigue las instrucciones y destruye únicamente el objetivo!"
+	["es"] = "¡Has fallado! ¡Sigue las instrucciones y destruye únicamente el objetivo!",
+	["pt_PT"] = "Falhaste! Segue as instruções e destrói apenas o alvo!"
 }
 
 local drill = {}
@@ -92,7 +102,8 @@
 	["de"] = "Also gut, du Made!",
 	["pl"] = "Słuchaj mnie gnido!",
 	["sv"] = "Dåså, din mask!",
-	["es"] = "¡Muy bien, escoria!"
+	["es"] = "¡Muy bien, escoria!",
+	["pt_PT"] = "Bom trabalho verme!"
 }
 
 drill[1] = {
@@ -100,7 +111,8 @@
 	["de"] = "Zeig, dass du nicht so nutzlos bist.",
 	["pl"] = "Udowodnij, że nie jesteś bezwartościowy.",
 	["sv"] = "Visa att du inte är så värdelös!",
-	["es"] = "Demuéstrame que no eres tan inútil como pareces."
+	["es"] = "Demuéstrame que no eres tan inútil como pareces.",
+	["pt_PT"] = "Prova-me que não és tão inútil como pareces."
 }
 
 drill[2] = {
@@ -108,7 +120,8 @@
 	["de"] = "Benutze [Links], um nach links zu gehen!",
 	["pl"] = "Użyj [lewo] by poruszyć się w lewą stronę!",
 	["sv"] = "Använd [vänster] för att gå åt vänster!",
-	["es"] = "¡Aprieta [izquierda] para desplazarte a la izquierda!"
+	["es"] = "¡Aprieta [izquierda] para desplazarte a la izquierda!",
+	["pt_PT"] = "Carrega [esquerda] para te moveres para a esquerda!"
 }
 
 drill[3] = {
@@ -116,7 +129,8 @@
 	["de"] = "Gut! Nun komm mit [Rechts] zurück!",
 	["pl"] = "Dobzre, Teraz użyj [prawo] by wrócić!",
 	["sv"] = "Bra! Använd nu [höger] för att gå tillbaka!",
-	["es"] = "¡Muy bien! ¡Ahora presiona [derecha] para volver!"
+	["es"] = "¡Muy bien! ¡Ahora presiona [derecha] para volver!",
+	["pt_PT"] = "Muito bem! Agora pressiona [direita] para voltar!"
 }
 
 drill[4] = {
@@ -124,7 +138,8 @@
 	["de"] = "Ausgezeichnet!",
 	["pl"] = "Wspaniale!",
 	["sv"] = "Utmärkt!",
-	["es"] = "¡Excelente!"
+	["es"] = "¡Excelente!",
+	["pt_PT"] = "Excelente!"
 }
 
 drill[5] = {
@@ -132,7 +147,8 @@
 	["de"] = "Jetzt springe mit [Eingabetaste] nach links!",
 	["pl"] = "Teraz skocz w lewo używając [Enter]",
 	["sv"] = "Hoppa nu åt vänster med hjälp av [enter]!",
-	["es"] = "¡Ahora salta hacia la izquierda usando [intro]!"
+	["es"] = "¡Ahora salta hacia la izquierda usando [intro]!",
+	["pt_PT"] = "Agora salta para a esquerda pressionando [retrocesso]!"
 }
 
 drill[6] = {
@@ -140,7 +156,8 @@
 	["de"] = "Benutze [Hoch] und [Runter], um zu zielen.",
 	["pl"] = "Użyj klawiszy [góra] i [dół] by celować.",
 	["sv"] = "Använd [upp] och [ner] för att sikta!",
-	["es"] = "Presiora [arriba] y [abajo] para apuntar."
+	["es"] = "Presiora [arriba] y [abajo] para apuntar.",
+	["pt_PT"] = "Pressiona [cima] e [baixo] para apontar."
 }
 
 drill[7] = {
@@ -148,7 +165,8 @@
 	["de"] = "Halte [Leertaste], um deinen Schuss aufzuladen, und lasse dann rechtzeitig los.",
 	["pl"] = "Przytrzymaj spację by zwiększyć siłę strzału.",
 	["sv"] = "Håll ner [mellanslag] för att få kraft och släpp för att skjuta!",
-	["es"] = "Mantén presionada la [barra espaciadora] para controlar la fuerza del disparo y suéltala para disparar."
+	["es"] = "Mantén presionada la [barra espaciadora] para controlar la fuerza del disparo y suéltala para disparar.",
+	["pt_PT"] = "Mantem a [barra de espaços] pressionada para controlar a força do tiro e larga-a para disparar."
 }
 
 drill[8] = {
@@ -156,7 +174,8 @@
 	["de"] = "Zerstöre das Ziel, um deine Grundausbildung abzuschließen!",
 	["pl"] = "Zniszcz cel by by ukończyć trening podstawowy!",
 	["sv"] = "Förstör målet för att avsluta din grundutbildning!",
-	["es"] = "¡Destruye el objetivo para completar el entrenamiento básico!"
+	["es"] = "¡Destruye el objetivo para completar el entrenamiento básico!",
+	["pt_PT"] = "Destrói o alvo para completar o treino básico!"
 }
 
 local function loc(text)