merge .18 lua
authornemo
Sun, 04 Nov 2012 17:05:15 -0500
changeset 7948 ccaa746bd567
parent 7945 4006d77e1a28 (current diff)
parent 7938 80e2e50471d9 (diff)
child 7952 e3ffeb3d9389
merge .18 lua
--- a/share/hedgewars/Data/Locale/cs.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/cs.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
       ["Fastest lap: "] = "Nejrychlejší kolo: ",
       ["Feeble Resistance"] = "Slabý odpor",
--- a/share/hedgewars/Data/Locale/da.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/da.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
         ["Fastest lap: "] = "Hurtigste omgang: ",
         ["Feeble Resistance"] = "Sølle Modstand",
--- a/share/hedgewars/Data/Locale/de.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/de.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
 	["Fastest lap: "] = "Schnellste Runde: ",
 	["Feeble Resistance"] = "Kraftloser Widerstand",
--- a/share/hedgewars/Data/Locale/es.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/es.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
 	["Fastest lap: "] = "Vuelta rápida: ",
 	["Feeble Resistance"] = "Resistencia Fútil",
--- a/share/hedgewars/Data/Locale/fr.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/fr.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -208,7 +208,7 @@
       ["Everything looks OK..."] = "Tout à l'air d'être OK ...",
       ["Exactly, man! That was my dream."] = "Exactement, mec ! C'était mon rêve.",
       ["Eye Chewer"] = "Eye Chewer",
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 	 ["Get your teammates out of their natural prison and save the princess!|Hint: Drilling holes should solve everything.|Hint: It might be a good idea to place a girder before starting to drill. Just saying.|Hint: All your hedgehogs need to be above the marked height!|Hint: Leaks A Lot needs to get really close to the princess!"] = "Fais sortir tes coéquipiers de leur prison naturelle et sauve la princesse ! |Percer des trous résoudrait tout. |ca serait une bonne idée de placer quelque poutres avant de commencer à percer. je dis ça, je dis rien. |Tous vos hérissons doivent être au dessus de la hauteur marquée ! | Leaks A Lot doit être très proche de la princesse !  ",
       ["Family Reunion"] = "Réunion de famille ",
       ["Fastest lap: "] = "Meilleur tour : ",
--- a/share/hedgewars/Data/Locale/it.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/it.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
 	["Fastest lap: "] = "Giro migliore: ",
 	["Feeble Resistance"] = "Resistenza Finale",
--- a/share/hedgewars/Data/Locale/ko.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/ko.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
 --      ["Fastest lap: "] = "",
 --      ["Feeble Resistance"] = "",
--- a/share/hedgewars/Data/Locale/lt.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/lt.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
    ["Fastest lap: "] = "Greièiausias Ratas: ",
    ["Feeble Resistance"] = "Silpnaus Atsparumo Tvirtovë",
--- a/share/hedgewars/Data/Locale/pl.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/pl.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
     ["Fastest lap: "] = "Najszybsze okrążenie: ",
     ["Feeble Resistance"] = "Ruch Oporu",
--- a/share/hedgewars/Data/Locale/pt_BR.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/pt_BR.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
 	["Fastest lap: "] = "Volta mais rápida: ",
 --      ["Feeble Resistance"] = "",
--- a/share/hedgewars/Data/Locale/pt_PT.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/pt_PT.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
 	["Fastest lap: "] = "Volta mais rápida: ",
 --      ["Feeble Resistance"] = "",
--- a/share/hedgewars/Data/Locale/ru.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/ru.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
 --      ["Fastest lap: "] = "",
 --      ["Feeble Resistance"] = "",
--- a/share/hedgewars/Data/Locale/sk.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/sk.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
 	["Fastest lap: "] = "Najrýchlejšie kolo: ",
         ["Feeble Resistance"] = "Slabý odpor",
--- a/share/hedgewars/Data/Locale/stub.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/stub.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
 --      ["Fastest lap: "] = "",
 --      ["Feeble Resistance"] = "",
--- a/share/hedgewars/Data/Locale/sv.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/sv.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -209,7 +209,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
 	["Fastest lap: "] = "Snabbast varv: ",
 	["Feeble Resistance"] = "Klent motstånd",
--- a/share/hedgewars/Data/Locale/uk.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/uk.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -208,7 +208,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
         ["Fastest lap: "] = "Найшвидша партія: ",
         ["Feeble Resistance"] = "Жалюгідні Повстанці",
--- a/share/hedgewars/Data/Locale/zh_CN.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Locale/zh_CN.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -208,7 +208,7 @@
 --      ["Everything looks OK..."] = "", -- A_Classic_Fairytale:enemy
 --      ["Exactly, man! That was my dream."] = "", -- A_Classic_Fairytale:backstab
 --      ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey
---      ["FAG"] = "", -- Mutant
+--      ["INSANITY"] = "", -- Mutant
 --      ["Family Reunion"] = "", -- A_Classic_Fairytale:family
       ["Fastest lap: "] = "最快记录:",
       ["Feeble Resistance"] = "反抗者",
--- a/share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua	Sat Nov 03 23:28:42 2012 +0400
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua	Sun Nov 04 17:05:15 2012 -0500
@@ -240,7 +240,7 @@
             AddCaption(loc("HOLY SHIT!"))
             PlaySound(sndLaugh)
         elseif killsCounter > 8 then
-            AddCaption(loc("FAG"))
+            AddCaption(loc("INSANITY"))
         end
 
 end