Author: cazfi
Date: Wed Nov 25 22:53:40 2015
New Revision: 30776
URL: http://svn.gna.org/viewcvs/freeciv?rev=30776&view=rev
Log:
Improve translatable tech acquirements strings.
See patch #6628
Modified:
branches/S2_6/server/cityturn.c
branches/S2_6/server/diplhand.c
branches/S2_6/server/techtools.c
Modified: branches/S2_6/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityturn.c?rev=30776&r1=30775&r2=30776&view=diff
==============================================================================
--- branches/S2_6/server/cityturn.c (original)
+++ branches/S2_6/server/cityturn.c Wed Nov 25 22:53:40 2015
@@ -2139,10 +2139,12 @@
const char *adv_name = research_advance_name_translation(presearch,
tech);
notify_research(presearch, NULL, E_TECH_GAIN, ftc_server,
- _("Acquired %s from %s."), adv_name, provider);
+ /* TRANS: Tech from building (Darwin's Voyage) */
+ _("?frombldg:Acquired %s from %s."), adv_name,
provider);
notify_research_embassies(presearch, NULL, E_TECH_EMBASSY, ftc_server,
- _("The %s have acquired %s from %s."),
+ /* TRANS: Tech from building (Darwin's
Voyage) */
+ _("?frombldg:The %s have acquired %s from
%s."),
research_name, adv_name, provider);
}
}
Modified: branches/S2_6/server/diplhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/diplhand.c?rev=30776&r1=30775&r2=30776&view=diff
==============================================================================
--- branches/S2_6/server/diplhand.c (original)
+++ branches/S2_6/server/diplhand.c Wed Nov 25 22:53:40 2015
@@ -466,7 +466,8 @@
nation_plural_for_player(pgiver));
notify_research_embassies
(presearch, pgiver, E_TECH_EMBASSY, ftc_server,
- _("The %s have acquired %s from the %s."),
+ /* TRANS: Tech from another player */
+ _("?fromplr:The %s have acquired %s from the %s."),
research_name,
advance_name,
nation_plural_for_player(pgiver));
Modified: branches/S2_6/server/techtools.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/techtools.c?rev=30776&r1=30775&r2=30776&view=diff
==============================================================================
--- branches/S2_6/server/techtools.c (original)
+++ branches/S2_6/server/techtools.c Wed Nov 25 22:53:40 2015
@@ -196,10 +196,11 @@
notify_research(presearch, pplayer, E_TECH_GAIN, ftc_server,
_("%s acquired from %s's %s!"),
advance_name,
- player_name(pplayer),
+ player_name(pplayer),
astr_str(&effects));
notify_research_embassies(presearch, NULL, E_TECH_EMBASSY, ftc_server,
- _("The %s have acquired %s from %s."),
+ /* TRANS: Tech from source of an effect (Great
Library) */
+ _("?fromeffect:The %s have acquired %s from %s."),
research_name,
advance_name,
astr_str(&effects));
@@ -531,7 +532,7 @@
if (additional_tech != A_UNSET) {
notify_research(presearch, NULL, E_TECH_GAIN, ftc_server,
/* TRANS: Got free tech. */
- _("Acquired %s"), radv_name);
+ _("Acquired %s."), radv_name);
}
} else if (additional_tech != A_UNSET) {
/* FIXME: "your" when it was just civilization of one of the players
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
