From 27f6be9a370d994dbfaaa4b90598fef131bbc1c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20Gl=C3=B6ckner?= Date: Sat, 11 Aug 2018 01:41:23 +0200 Subject: [PATCH] use & to denote team setup in MP code it as & to avoid a pango warning in stderr 3ec26df changed it previously to '+' to work around that warning also change it for the untranslatable strings in the credits [ci skip] (cherry-picked from commit cd5b3f785e137f66f9d282c8348a6ad877e48d2f) --- data/multiplayer/scenarios/4p_Isars_Cross.cfg | 2 +- data/multiplayer/scenarios/4p_Loris_River.cfg | 2 +- data/multiplayer/scenarios/4p_Paths_of_Daggers.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/multiplayer/scenarios/4p_Isars_Cross.cfg b/data/multiplayer/scenarios/4p_Isars_Cross.cfg index 38ba5bf01fc..bc4fee7b8ba 100644 --- a/data/multiplayer/scenarios/4p_Isars_Cross.cfg +++ b/data/multiplayer/scenarios/4p_Isars_Cross.cfg @@ -6,7 +6,7 @@ id=multiplayer_Isars_Cross name= _ "4p — Isar’s Cross" map_data="{multiplayer/maps/4p_Isars_Cross.map}" - description= _ "A very small 2 vs. 2 map. Close quarters fighting means the successful rotation of units and planning of moves is important. Teams set for players 1+4 vs. 2+3 (northeast vs. southwest). Designed for 75 starting gold, 20 villages." + description= _ "A very small 2 vs. 2 map. Close quarters fighting means the successful rotation of units and planning of moves is important. Teams set for players 1 & 4 vs. 2 & 3 (northeast vs. southwest). Designed for 75 starting gold, 20 villages." {DEFAULT_SCHEDULE} {DEFAULT_MUSIC_PLAYLIST} diff --git a/data/multiplayer/scenarios/4p_Loris_River.cfg b/data/multiplayer/scenarios/4p_Loris_River.cfg index dbe82bb74cd..2d87870e3b3 100644 --- a/data/multiplayer/scenarios/4p_Loris_River.cfg +++ b/data/multiplayer/scenarios/4p_Loris_River.cfg @@ -6,7 +6,7 @@ id=multiplayer_Loris_River name= _ "4p — Loris River" map_data="{multiplayer/maps/4p_Loris_River.map}" - description= _ "2 vs. 2 map centered around a river with keeps in opposite corners. Designed for players 1+4 vs. 2+3. There are 28 villages." + _ " Recommended setting of 2 gold per village." + description= _ "2 vs. 2 map centered around a river with keeps in opposite corners. Designed for players 1 & 4 vs. 2 & 3. There are 28 villages." + _ " Recommended setting of 2 gold per village." {DEFAULT_SCHEDULE_SECOND_WATCH} diff --git a/data/multiplayer/scenarios/4p_Paths_of_Daggers.cfg b/data/multiplayer/scenarios/4p_Paths_of_Daggers.cfg index 252232c837a..fc86ad467d0 100644 --- a/data/multiplayer/scenarios/4p_Paths_of_Daggers.cfg +++ b/data/multiplayer/scenarios/4p_Paths_of_Daggers.cfg @@ -6,7 +6,7 @@ id=multiplayer_Paths_of_Daggers name= _ "4p — Paths of Daggers" map_data="{multiplayer/maps/4p_Paths_of_Daggers.map}" - description= _ "A 2 vs. 2 map with 5 separate paths of engagement. Balanced to be played east vs. west (1+4 vs. 2+3), but works well with any teams or FFA." + _ " Recommended setting of 2 gold per village, 28 villages." + description= _ "A 2 vs. 2 map with 5 separate paths of engagement. Balanced to be played east vs. west (1 & 4 vs. 2 & 3), but works well with any teams or FFA." + _ " Recommended setting of 2 gold per village, 28 villages." {DEFAULT_SCHEDULE} {DEFAULT_MUSIC_PLAYLIST}