Author: jtn
Date: Wed Jun 15 23:49:36 2016
New Revision: 32859

URL: http://svn.gna.org/viewcvs/freeciv?rev=32859&view=rev
Log:
Clean up strings mentioning DiplRel requirements.

See gna patch #7258.

Modified:
    trunk/client/helpdata.c
    trunk/server/cityturn.c

Modified: trunk/client/helpdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=32859&r1=32858&r2=32859&view=diff
==============================================================================
--- trunk/client/helpdata.c     (original)
+++ trunk/client/helpdata.c     Wed Jun 15 23:49:36 2016
@@ -1468,65 +1468,71 @@
     case REQ_RANGE_PLAYER:
       if (preq->present) {
         cat_snprintf(buf, bufsz,
-                     _("Requires that your diplomatic relationship to at "
-                       "least one other living player is %s.\n"),
+                     /* TRANS: in this and following strings, '%s' can be one
+                      * of a wide range of relationships; e.g., 'Peace',
+                      * 'Never met', 'Is foreign', 'Hosts embassy',
+                      * 'Provided Casus Belli' */
+                     _("Requires that you have the relationship '%s' with at "
+                       "least one other living player.\n"),
                      diplrel_name_translation(preq->source.value.diplrel));
       } else {
         cat_snprintf(buf, bufsz,
-                     _("Requires that no diplomatic relationship you have "
-                       "to any living player is %s.\n"),
+                     _("Requires that you do not have the relationship '%s' "
+                       "with any living player.\n"),
                      diplrel_name_translation(preq->source.value.diplrel));
       }
       return TRUE;
     case REQ_RANGE_TEAM:
       if (preq->present) {
         cat_snprintf(buf, bufsz,
-                     _("Requires that somebody on your team has %s "
-                       "diplomatic relationship to another living player.\n"),
+                     _("Requires that somebody on your team has the "
+                       "relationship '%s' with at least one other living "
+                       "player.\n"),
                      diplrel_name_translation(preq->source.value.diplrel));
       } else {
         cat_snprintf(buf, bufsz,
-                     _("Requires that nobody on your team has %s "
-                       "diplomatic relationship to another living player.\n"),
+                     _("Requires that nobody on your team has the "
+                       "relationship '%s' with any living player.\n"),
                      diplrel_name_translation(preq->source.value.diplrel));
       }
       return TRUE;
     case REQ_RANGE_ALLIANCE:
       if (preq->present) {
         cat_snprintf(buf, bufsz,
-                     _("Requires that somebody in your alliance has %s "
-                       "diplomatic relationship to another living player.\n"),
+                     _("Requires that somebody in your alliance has the "
+                       "relationship '%s' with at least one other living "
+                       "player.\n"),
                      diplrel_name_translation(preq->source.value.diplrel));
       } else {
         cat_snprintf(buf, bufsz,
-                     _("Requires that nobody in your alliance has %s "
-                       "diplomatic relationship to another living player.\n"),
+                     _("Requires that nobody in your alliance has the "
+                       "relationship '%s' with any living player.\n"),
                      diplrel_name_translation(preq->source.value.diplrel));
       }
       return TRUE;
     case REQ_RANGE_WORLD:
       if (preq->present) {
         cat_snprintf(buf, bufsz,
-                     _("Requires the diplomatic relationship %s between two "
-                       "living players.\n"),
+                     _("Requires the relationship '%s' between two living "
+                       "players.\n"),
                      diplrel_name_translation(preq->source.value.diplrel));
       } else {
         cat_snprintf(buf, bufsz,
-                     _("Requires the absence of the diplomatic "
-                       "relationship %s between any living players.\n"),
+                     _("Requires that no two living players have the "
+                       "relationship '%s'.\n"),
                      diplrel_name_translation(preq->source.value.diplrel));
       }
       return TRUE;
     case REQ_RANGE_LOCAL:
       if (preq->present) {
         cat_snprintf(buf, bufsz,
-                     _("Requires that your diplomatic relationship to the "
-                       "other player is %s.\n"),
+                     _("Requires that you have the relationship '%s' with the "
+                       "other player.\n"),
                      diplrel_name_translation(preq->source.value.diplrel));
       } else {
         cat_snprintf(buf, bufsz,
-                     _("Requires that your diplomatic relationship to the "
-                       "other player isn't %s.\n"),
+                     _("Requires that you do not have the relationship '%s' "
+                       "with the other player.\n"),
                      diplrel_name_translation(preq->source.value.diplrel));
       }
       return TRUE;

Modified: trunk/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/cityturn.c?rev=32859&r1=32858&r2=32859&view=diff
==============================================================================
--- trunk/server/cityturn.c     (original)
+++ trunk/server/cityturn.c     Wed Jun 15 23:49:36 2016
@@ -1555,8 +1555,11 @@
               if (preq->present) {
                 notify_player(pplayer, city_tile(pcity),
                               E_CITY_CANTBUILD, ftc_server,
+                              /* TRANS: '%s' is a wide range of relationships;
+                               * e.g., 'Peace', 'Never met', 'Is foreign',
+                               * 'Hosts embassy', 'Provided Casus Belli' */
                               _("%s can't build %s from the worklist; "
-                                "the diplomatic relationship %s is required."
+                                "the relationship '%s' is required."
                                 "  Postponing..."),
                               city_link(pcity),
                               city_improvement_name_translation(pcity,
@@ -1571,7 +1574,7 @@
                 notify_player(pplayer, city_tile(pcity),
                               E_CITY_CANTBUILD, ftc_server,
                               _("%s can't build %s from the worklist; "
-                                "the diplomatic relationship %s is prohibited."
+                                "the relationship '%s' is prohibited."
                                 "  Postponing..."),
                               city_link(pcity),
                               city_improvement_name_translation(pcity,


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to