Author: jtn
Date: Wed Jun 15 23:54:05 2016
New Revision: 32860
URL: http://svn.gna.org/viewcvs/freeciv?rev=32860&view=rev
Log:
A few string tweaks, TRANS comments, etc.
See gna patch #7259.
Modified:
branches/S2_6/common/requirements.c
branches/S2_6/data/civ1/units.ruleset
branches/S2_6/server/cityturn.c
branches/S2_6/server/civserver.c
branches/S2_6/server/diplomats.c
branches/S2_6/server/settings.c
branches/S2_6/server/srv_main.c
branches/S2_6/server/stdinhand.c
branches/S2_6/tools/civmanual.c
branches/S2_6/utility/registry_xml.c
Modified: branches/S2_6/common/requirements.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/requirements.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- branches/S2_6/common/requirements.c (original)
+++ branches/S2_6/common/requirements.c Wed Jun 15 23:54:05 2016
@@ -3296,7 +3296,7 @@
case USP_LIVABLE_TILE:
cat_snprintf(buf, bufsz,
/* TRANS: unit state. (appears in strings like
- * "Missile+Needs transport") */
+ * "Missile+On native tile") */
_("On native tile"));
break;
case USP_COUNT:
Modified: branches/S2_6/data/civ1/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/units.ruleset?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- branches/S2_6/data/civ1/units.ruleset (original)
+++ branches/S2_6/data/civ1/units.ruleset Wed Jun 15 23:54:05 2016
@@ -780,7 +780,7 @@
helptext = _("\
The artillery is an upgraded cannon with improved\
defensive as well as offensive capabilities.\
- They can shoot over city walls, ignoring their effect.\
+ It can shoot over city walls, ignoring their effect.\
")
[unit_fighter]
Modified: branches/S2_6/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityturn.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- branches/S2_6/server/cityturn.c (original)
+++ branches/S2_6/server/cityturn.c Wed Jun 15 23:54:05 2016
@@ -1764,6 +1764,7 @@
if (preq->present) {
notify_player(pplayer, city_tile(pcity),
E_CITY_CANTBUILD, ftc_server,
+ /* TRANS: last %s is a date */
_("%s can't build %s from the worklist; "
"only available from %s. Postponing..."),
city_link(pcity),
Modified: branches/S2_6/server/civserver.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/civserver.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- branches/S2_6/server/civserver.c (original)
+++ branches/S2_6/server/civserver.c Wed Jun 15 23:54:05 2016
@@ -395,8 +395,8 @@
_("Set ADDR as metaserver address"));
#ifdef FREECIV_WEB
cmdhelp_add(help, "t",
- /* TRANS: "Type" is exactly what user must type, do not
translate. */
- _("Type TYPE"),
+ /* TRANS: "type" is exactly what user must type, do not
translate. */
+ _("type TYPE"),
_("Set TYPE as server type in metaserver"));
#endif /* FREECIV_WEB */
cmdhelp_add(help, "p",
Modified: branches/S2_6/server/diplomats.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/diplomats.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- branches/S2_6/server/diplomats.c (original)
+++ branches/S2_6/server/diplomats.c Wed Jun 15 23:54:05 2016
@@ -1194,10 +1194,13 @@
/* Notify everyone involved. */
notify_player(act_player, tgt_tile, E_MY_SPY_STEAL_GOLD, ftc_server,
- _("Your %s stole %d gold from %s."),
+ PL_("Your %s stole %d gold from %s.",
+ "Your %s stole %d gold from %s.", gold_give),
unit_link(act_unit), gold_give, tgt_city_link);
notify_player(tgt_player, tgt_tile, E_ENEMY_SPY_STEAL_GOLD, ftc_server,
- _("The %s are suspected of stealing %d gold from %s."),
+ PL_("The %s are suspected of stealing %d gold from %s.",
+ "The %s are suspected of stealing %d gold from %s.",
+ gold_take),
nation_plural_for_player(act_player),
gold_take, tgt_city_link);
Modified: branches/S2_6/server/settings.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/settings.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- branches/S2_6/server/settings.c (original)
+++ branches/S2_6/server/settings.c Wed Jun 15 23:54:05 2016
@@ -942,7 +942,7 @@
settings_snprintf(reject_msg, reject_msg_len,
_("The first starting unit must be native to at "
"least one \"Starter\" terrain. "
- " Try \"help startunits\"."));
+ "Try \"help startunits\"."));
return FALSE;
}
Modified: branches/S2_6/server/srv_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- branches/S2_6/server/srv_main.c (original)
+++ branches/S2_6/server/srv_main.c Wed Jun 15 23:54:05 2016
@@ -955,6 +955,7 @@
if (unit_can_be_retired(punit)
&& fc_rand(100) < get_unit_bonus(punit, EFT_RETIRE_PCT)) {
notify_player(pplayer, ptile, E_UNIT_LOST_MISC, ftc_server,
+ /* TRANS: %s is a unit type */
_("%s retired!"), unit_tile_link(punit));
wipe_unit(punit, ULR_RETIRED, NULL);
continue;
Modified: branches/S2_6/server/stdinhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/stdinhand.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- branches/S2_6/server/stdinhand.c (original)
+++ branches/S2_6/server/stdinhand.c Wed Jun 15 23:54:05 2016
@@ -5692,7 +5692,7 @@
return FALSE;
} else if (strlen(game.server.start_units) == 0 &&
!game.server.start_city) {
start_cmd_reply(caller, notify,
- _("Neither 'startcity' nor 'startunits' setting give "
+ _("Neither 'startcity' nor 'startunits' setting gives "
"players anything to start game with; game will "
"not start."));
return FALSE;
Modified: branches/S2_6/tools/civmanual.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/civmanual.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- branches/S2_6/tools/civmanual.c (original)
+++ branches/S2_6/tools/civmanual.c Wed Jun 15 23:54:05 2016
@@ -565,7 +565,8 @@
while (inx < argc) {
if ((option = get_option_malloc("--ruleset", argv, &inx, argc))) {
if (ruleset != NULL) {
- fc_fprintf(stderr, _("Multiple rulesets requested. Only one ruleset at
time supported.\n"));
+ fc_fprintf(stderr, _("Multiple rulesets requested. Only one "
+ "ruleset at a time is supported.\n"));
free(option);
} else {
ruleset = option;
Modified: branches/S2_6/utility/registry_xml.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/registry_xml.c?rev=32860&r1=32859&r2=32860&view=diff
==============================================================================
--- branches/S2_6/utility/registry_xml.c (original)
+++ branches/S2_6/utility/registry_xml.c Wed Jun 15 23:54:05 2016
@@ -42,6 +42,7 @@
xmlroot = xmlDocGetRootElement(sec_doc);
if (xmlroot == NULL || strcmp((const char *)xmlroot->name, "Freeciv")) {
+ /* TRANS: do not translate <Freeciv> */
log_error(_("XML-file has no root node <Freeciv>"));
secfile_destroy(secfile);
return NULL;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
