From 86215c1e210c6d805db0fc749419dc3bc33180e2 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 30 Sep 2022 03:52:39 +0300 Subject: [PATCH 30/30] Reword VUT_DIPLREL_UNITANY(_O) requirement texts See osdn #45516 Signed-off-by: Marko Lindqvist --- common/reqtext.c | 53 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/common/reqtext.c b/common/reqtext.c index 8eb72af1e7..a420ff80a8 100644 --- a/common/reqtext.c +++ b/common/reqtext.c @@ -1456,14 +1456,14 @@ bool req_text_insert(char *buf, size_t bufsz, struct player *pplayer, * of a wide range of relationships; e.g., 'Peace', * 'Never met', 'Foreign', 'Hosts embassy', * 'Provided Casus Belli' */ - _("Requires that there exists a unit at the tile with" - " an owner with the relationship" - " '%s' with at least one other living player."), + _("Requires that the tile has at least one unit whose " + "owner has the relationship " + "'%s' with at least one other living player."), diplrel_name_translation(preq->source.value.diplrel)); } else { cat_snprintf(buf, bufsz, - _("Requires that no unit at the tile has an owner with" - " the relationship '%s' with any living player."), + _("Requires that no unit at the tile is owned by a player " + "who has the relationship '%s' with any living player."), diplrel_name_translation(preq->source.value.diplrel)); } return TRUE; @@ -1471,17 +1471,17 @@ bool req_text_insert(char *buf, size_t bufsz, struct player *pplayer, fc_strlcat(buf, prefix, bufsz); if (preq->present) { cat_snprintf(buf, bufsz, - _("Requires that there exists a unit at the tile with" - " an owner on a team where a member" - " has the relationship '%s' with at least one other" - " living player."), + _("Requires that the tile has at least one unit whose " + "owner is on a team where a member " + "has the relationship '%s' with at least one other " + "living player."), diplrel_name_translation(preq->source.value.diplrel)); } else { cat_snprintf(buf, bufsz, - _("Requires that no unit at the tile has an owner" - " on a team where a member" - " has the relationship '%s' with at least one other" - " living player."), + _("Requires that no unit at the tile is owned by a player " + "who is on a team where a member " + "has the relationship '%s' with at least one other " + "living player."), diplrel_name_translation(preq->source.value.diplrel)); } return TRUE; @@ -1489,16 +1489,16 @@ bool req_text_insert(char *buf, size_t bufsz, struct player *pplayer, fc_strlcat(buf, prefix, bufsz); if (preq->present) { cat_snprintf(buf, bufsz, - _("Requires that there exists a unit at the tile with " - "an owner allied to someone that " + _("Requires that the tile has at least one unit whose " + "owner is allied to someone that " "has the relationship '%s' with at least one other " "living player."), diplrel_name_translation(preq->source.value.diplrel)); } else { cat_snprintf(buf, bufsz, - _("Requires that no unit at the tile has an owner" - " allied to someone that" - " has the relationship '%s' with any living player."), + _("Requires that no unit at the tile is owned by a player " + "allied to someone that " + "has the relationship '%s' with any living player."), diplrel_name_translation(preq->source.value.diplrel)); } return TRUE; @@ -1506,13 +1506,13 @@ bool req_text_insert(char *buf, size_t bufsz, struct player *pplayer, fc_strlcat(buf, prefix, bufsz); if (preq->present) { cat_snprintf(buf, bufsz, - _("Requires that you have the relationship '%s' with" - " the owner of at least one unit at the tile."), + _("Requires that you have the relationship '%s' with " + "the owner of at least one unit at the tile."), diplrel_name_translation(preq->source.value.diplrel)); } else { cat_snprintf(buf, bufsz, - _("Requires that you do not have the relationship '%s'" - " with the owner of any unit at the tile."), + _("Requires that you do not have the relationship '%s' " + "with the owner of any unit at the tile."), diplrel_name_translation(preq->source.value.diplrel)); } return TRUE; @@ -1535,14 +1535,13 @@ bool req_text_insert(char *buf, size_t bufsz, struct player *pplayer, fc_strlcat(buf, prefix, bufsz); if (preq->present) { cat_snprintf(buf, bufsz, - _("Requires that the tile has at least one unit that" - " has the relationship '%s' with the other player."), + _("Requires that the tile has at least one unit whose " + "owner has the relationship '%s' with the other player."), diplrel_name_translation(preq->source.value.diplrel)); } else { cat_snprintf(buf, bufsz, - _("Requires that no unit at the tile has " - "the relationship '%s' with " - "the other player."), + _("Requires that no unit at the tile is owned by a player " + "who has the relationship '%s' with the other player."), diplrel_name_translation(preq->source.value.diplrel)); } return TRUE; -- 2.35.1