Author: cazfi
Date: Fri Jun 17 17:43:19 2016
New Revision: 32886

URL: http://svn.gna.org/viewcvs/freeciv?rev=32886&view=rev
Log:
Improvements to translatable strings.

Patch by Konstantin Vedeneev <konved> and myself

See patch #6908

Modified:
    branches/S2_6/client/helpdata.c
    branches/S2_6/server/cityhand.c
    branches/S2_6/server/cityturn.c

Modified: branches/S2_6/client/helpdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/helpdata.c?rev=32886&r1=32885&r2=32886&view=diff
==============================================================================
--- branches/S2_6/client/helpdata.c     (original)
+++ branches/S2_6/client/helpdata.c     Fri Jun 17 17:43:19 2016
@@ -4193,9 +4193,12 @@
   }
   if (utype_has_flag(utype, UTYF_PARATROOPERS)) {
     cat_snprintf(buf, bufsz,
-                _("* Can be paradropped from a friendly city or suitable base"
-                  " (range: %d tiles).\n"),
-                utype->paratroopers_range);
+                 PL_("* Can be paradropped from a friendly city or suitable "
+                      "base (range: %d tile).\n",
+                     "* Can be paradropped from a friendly city or suitable "
+                      "base (range: %d tiles).\n",
+                     utype->paratroopers_range),
+                 utype->paratroopers_range);
   }
   if (!uclass_has_flag(utype_class(utype), UCF_MISSILE)
       && utype_has_flag(utype, UTYF_ONEATTACK)) {

Modified: branches/S2_6/server/cityhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityhand.c?rev=32886&r1=32885&r2=32886&view=diff
==============================================================================
--- branches/S2_6/server/cityhand.c     (original)
+++ branches/S2_6/server/cityhand.c     Fri Jun 17 17:43:19 2016
@@ -374,13 +374,13 @@
   if (VUT_UTYPE == pcity->production.kind) {
     notify_player(pplayer, pcity->tile, E_UNIT_BUY, ftc_server,
                   /* TRANS: bought an unit. */
-                  _("You bought %s in %s."),
+                  Q_("?unit:You bought %s in %s."),
                   utype_name_translation(pcity->production.value.utype),
                   city_name_get(pcity));
   } else if (VUT_IMPROVEMENT == pcity->production.kind) {
     notify_player(pplayer, pcity->tile, E_IMP_BUY, ftc_server,
                   /* TRANS: bought an improvement .*/
-                  _("You bought %s in %s."),
+                  Q_("?improvement:You bought %s in %s."),
                   
improvement_name_translation(pcity->production.value.building),
                   city_name_get(pcity));
   }

Modified: branches/S2_6/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityturn.c?rev=32886&r1=32885&r2=32886&view=diff
==============================================================================
--- branches/S2_6/server/cityturn.c     (original)
+++ branches/S2_6/server/cityturn.c     Fri Jun 17 17:43:19 2016
@@ -228,12 +228,17 @@
   city_built_iterate(pcity, pimprove) {
     if (improvement_obsolete(pplayer, pimprove, pcity)
      && can_city_sell_building(pcity, pimprove)) {
+      int sgold;
+
       do_sell_building(pplayer, pcity, pimprove);
+      sgold = impr_sell_gold(pimprove);
       notify_player(pplayer, city_tile(pcity), E_IMP_SOLD, ftc_server,
-                    _("%s is selling %s (obsolete) for %d."),
+                    PL_("%s is selling %s (obsolete) for %d.",
+                        "%s is selling %s (obsolete) for %d.",
+                        sgold),
                     city_link(pcity),
-                    improvement_name_translation(pimprove), 
-                    impr_sell_gold(pimprove));
+                    improvement_name_translation(pimprove),
+                    sgold);
       sold = TRUE;
     }
   } city_built_iterate_end;


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

Reply via email to