# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1520517205 -3600
# Node ID c3fc9157f740dc9ababa5e9ef5fe9c2b90f8b29c
# Parent  75afd374b764af676010261b24872c00203b06c3
CTF: Say "clan" instead of "team" in mission panel

diff -r 75afd374b764 -r c3fc9157f740 ChangeLog.txt
--- a/ChangeLog.txt	Thu Mar 08 14:47:47 2018 +0100
+++ b/ChangeLog.txt	Thu Mar 08 14:53:25 2018 +0100
@@ -49,7 +49,7 @@
  + Battalion (King Mode): If the king dies, the hogs die normally instead of disappearing
  + Space Invasion: Add a default Space Invasion game scheme
  + Capture the Flag: Can now be played with more than 2 clans
- + Capture the Flag: Show team scores and score graphi in stats screen
+ + Capture the Flag: Show team scores and score graph in stats screen
  + HedgeEditor: Show cursor coordinates in top left corner
  + Control: Always remove TimeBox and Resurrector
  * Battalion: Some texts in the mission panel were wrong and misleading
diff -r 75afd374b764 -r c3fc9157f740 share/hedgewars/Data/Locale/de.lua
--- a/share/hedgewars/Data/Locale/de.lua	Thu Mar 08 14:47:47 2018 +0100
+++ b/share/hedgewars/Data/Locale/de.lua	Thu Mar 08 14:53:25 2018 +0100
@@ -669,8 +669,8 @@
 ["First Blood"]="Der erste Zusammenstoß",
 ["First killer will mutate"] = "Erster Mörder wird mutieren", -- Mutant
 ["First Steps"]="Erste Schritte",
-["- First team to capture the flag wins"] = "- Das erste Team, dass die Flagge erobert, gewinnt", -- Capture_the_Flag
-["- First team to score %d captures wins"] = "- Das erste Team mit %d Eroberungen gewinnt", -- Capture_the_Flag
+["- First clan to capture the flag wins"] = "- Der erste Klan, der die Flagge erobert, gewinnt", -- Capture_the_Flag
+["- First clan to score %d captures wins"] = "- Der erste Klan mit %d Eroberungen gewinnt", -- Capture_the_Flag
 ["Fishy"] = "Fischi", -- 
 ["Flag captured!"]="Flagge genommen!",
 ["Flag respawned!"]="Flagge wieder erschienen!",
@@ -1635,7 +1635,7 @@
 ["Place Waypoint"] = "Wegpunkt platzieren", -- HedgeEditor
 ["Place waypoint"] = "Wegpunkt platzieren", -- Racer
 ["Place weapon crates"] = "Platziere Waffenkisten", -- HedgeEditor
-["- Place your team flag at the end of your first turn"] = "- Platziere deine Teamflagge am Ende deines ersten Zuges", -- Capture_the_Flag
+["- Place your clan flag at the end of your first turn"] = "- Platziere deine Klanflagge am Ende deines ersten Zuges", -- Capture_the_Flag
 ["Planes used: %d"]="Verwendete Flugzeuge: %d",
 ["Planets with all missions completed will be marked with two flowers."] = "Planeten, bei denen alle Missionen erledigt wurden, werden mit zwei Blumen markiert.", -- A_Space_Adventure:cosmos
 ["Planets with completed main missions will be marked with a flower."]="Planeten, bei denen die Hauptmissionen erledigt wurden, werden mit einer Blume markiert.", -- A_Space_Adventure:cosmos
diff -r 75afd374b764 -r c3fc9157f740 share/hedgewars/Data/Locale/stub.lua
--- a/share/hedgewars/Data/Locale/stub.lua	Thu Mar 08 14:47:47 2018 +0100
+++ b/share/hedgewars/Data/Locale/stub.lua	Thu Mar 08 14:53:25 2018 +0100
@@ -612,8 +612,8 @@
 --      ["First Blood"] = "", -- A_Classic_Fairytale:first_blood
 --      ["First killer will mutate"] = "", -- Mutant
 --      ["First Steps"] = "", -- A_Classic_Fairytale:first_blood
---      ["- First team to capture the flag wins"] = "", -- Capture_the_Flag
---      ["- First team to score %d captures wins"] = "", -- Capture_the_Flag
+--      ["- First clan to capture the flag wins"] = "", -- Capture_the_Flag
+--      ["- First clan to score %d captures wins"] = "", -- Capture_the_Flag
 --      ["Fishy"] = "", -- 
 --      ["Flag captured!"] = "",
 --      ["Flag respawned!"] = "",
@@ -1530,7 +1530,7 @@
 --      ["Place Waypoint"] = "", -- HedgeEditor
 --      ["Place waypoint"] = "", -- Racer
 --      ["Place weapon crates"] = "", -- HedgeEditor
---      ["- Place your team flag at the end of your first turn"] = "", -- Capture_the_Flag
+--      ["- Place your clan flag at the end of your first turn"] = "", -- Capture_the_Flag
 --      ["Planes used: %d"] = "", -- User_Mission_-_RCPlane_Challenge
 --      ["Planets with all missions completed will be marked with two flowers."] = "", -- A_Space_Adventure:cosmos
 --      ["Planets with completed main missions will be marked with a flower."] = "", -- A_Space_Adventure:cosmos
diff -r 75afd374b764 -r c3fc9157f740 share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua	Thu Mar 08 14:47:47 2018 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua	Thu Mar 08 14:53:25 2018 +0100
@@ -444,13 +444,13 @@
 function showCTFMission()
 	local captures
 	if captureLimit == 1 then
-		captures = string.format(loc("- First team to capture the flag wins"), captureLimit)
+		captures = string.format(loc("- First clan to capture the flag wins"), captureLimit)
 	else
-		captures = string.format(loc("- First team to score %d captures wins"), captureLimit)
+		captures = string.format(loc("- First clan to score %d captures wins"), captureLimit)
 	end
 
-	local rules = loc("Rules:") .. " |" ..
-		loc("- Place your team flag at the end of your first turn") .. "|" ..
+	local rules = loc("Rules:") .. "|" ..
+		loc("- Place your clan flag at the end of your first turn") .. "|" ..
 		loc("- Return the enemy flag to your base to score") .."|"..
 		captures .. "|" ..
 		loc("- You may only score when your flag is in your base") .."|"..