Author: cazfi
Date: Fri Jun 17 17:43:24 2016
New Revision: 32887
URL: http://svn.gna.org/viewcvs/freeciv?rev=32887&view=rev
Log:
Improvements to translatable strings.
Patch by Konstantin Vedeneev <konved> and myself
See patch #6908
Modified:
branches/S2_5/client/helpdata.c
branches/S2_5/server/cityhand.c
branches/S2_5/server/cityturn.c
Modified: branches/S2_5/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/helpdata.c?rev=32887&r1=32886&r2=32887&view=diff
==============================================================================
--- branches/S2_5/client/helpdata.c (original)
+++ branches/S2_5/client/helpdata.c Fri Jun 17 17:43:24 2016
@@ -2787,9 +2787,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_5/server/cityhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/cityhand.c?rev=32887&r1=32886&r2=32887&view=diff
==============================================================================
--- branches/S2_5/server/cityhand.c (original)
+++ branches/S2_5/server/cityhand.c Fri Jun 17 17:43:24 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(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(pcity));
}
Modified: branches/S2_5/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/cityturn.c?rev=32887&r1=32886&r2=32887&view=diff
==============================================================================
--- branches/S2_5/server/cityturn.c (original)
+++ branches/S2_5/server/cityturn.c Fri Jun 17 17:43:24 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -223,12 +223,17 @@
city_built_iterate(pcity, pimprove) {
if (improvement_obsolete(pplayer, pimprove)
&& 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
