Author: jtn
Date: Sat Mar 14 17:57:38 2015
New Revision: 28546
URL: http://svn.gna.org/viewcvs/freeciv?rev=28546&view=rev
Log:
Typos and i18n fixes.
i18n issues reported by Konstantin Vedeneev (konved@gna).
See gna bug #23333.
Modified:
branches/S2_5/client/helpdata.c
branches/S2_5/data/civ2civ3/buildings.ruleset
branches/S2_5/data/civ2civ3/units.ruleset
Modified: branches/S2_5/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/helpdata.c?rev=28546&r1=28545&r2=28546&view=diff
==============================================================================
--- branches/S2_5/client/helpdata.c (original)
+++ branches/S2_5/client/helpdata.c Sat Mar 14 17:57:38 2015
@@ -2925,22 +2925,34 @@
if (player_invention_state(pplayer, i) != TECH_KNOWN) {
if (player_invention_state(pplayer, i) == TECH_PREREQS_KNOWN) {
+ int bulbs = base_total_bulbs_required(pplayer, i, FALSE);
+
cat_snprintf(buf, bufsz,
- _("Starting now, researching %s would need %d bulbs."),
- advance_name_for_player(pplayer, i),
- base_total_bulbs_required(pplayer, i, FALSE));
+ PL_("Starting now, researching %s would need %d bulb.",
+ "Starting now, researching %s would need %d bulbs.",
+ bulbs),
+ advance_name_for_player(pplayer, i), bulbs);
} else if (player_invention_reachable(pplayer, i, TRUE)) {
+ /* Split string into two to allow localization of two pluralizations. */
+ char buf2[MAX_LEN_MSG];
+ int bulbs = total_bulbs_required_for_goal(pplayer, i);
+
+ fc_snprintf(buf2, ARRAY_SIZE(buf2),
+ /* TRANS: appended to another sentence. Preserve the
+ * leading space. */
+ PL_(" The whole project will require %d bulb to complete.",
+ " The whole project will require %d bulbs to complete.",
+ bulbs),
+ bulbs);
cat_snprintf(buf, bufsz,
+ /* TRANS: last %s is a sentence pluralized separately. */
PL_("To reach %s you need to obtain %d other"
- " technology first. The whole project"
- " will require %d bulbs to complete.",
+ " technology first.%s",
"To reach %s you need to obtain %d other"
- " technologies first. The whole project"
- " will require %d bulbs to complete.",
+ " technologies first.%s",
num_unknown_techs_for_goal(pplayer, i) - 1),
advance_name_for_player(pplayer, i),
- num_unknown_techs_for_goal(pplayer, i) - 1,
- total_bulbs_required_for_goal(pplayer, i));
+ num_unknown_techs_for_goal(pplayer, i) - 1, buf2);
} else {
CATLSTR(buf, bufsz,
_("You cannot research this technology."));
@@ -2948,6 +2960,8 @@
if (!techs_have_fixed_costs()
&& player_invention_reachable(pplayer, i, FALSE)) {
CATLSTR(buf, bufsz,
+ /* TRANS: Appended to another sentence. Preserve the
+ * leading space. */
_(" This number may vary depending on what "
"other players research.\n"));
} else {
Modified: branches/S2_5/data/civ2civ3/buildings.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/buildings.ruleset?rev=28546&r1=28545&r2=28546&view=diff
==============================================================================
--- branches/S2_5/data/civ2civ3/buildings.ruleset (original)
+++ branches/S2_5/data/civ2civ3/buildings.ruleset Sat Mar 14 17:57:38 2015
@@ -1618,7 +1618,7 @@
sound_alt = "w_generic"
helptext = _("\
With this wonder, City Walls and Courthouses each make one unhappy \
-citizen content in their city, unless that citizens is unhappy about \
+citizen content in their city, unless that citizen is unhappy about \
aggression. Also, none of the owner's cities can be incited to revolt.\
")
Modified: branches/S2_5/data/civ2civ3/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=28546&r1=28545&r2=28546&view=diff
==============================================================================
--- branches/S2_5/data/civ2civ3/units.ruleset (original)
+++ branches/S2_5/data/civ2civ3/units.ruleset Sat Mar 14 17:57:38 2015
@@ -1542,7 +1542,7 @@
units on water it has a regular attack.\
"), _("\
Helicopters can also transport one unit of infantry; while most troops \
-must load or unload in a city or airbase units specialising in mobility \
+must load or unload in a city or airbase units specializing in mobility \
(Paratroopers, Alpine Troops, Marines, Partisans, and Fanatics) can \
embark or disembark at any time.\
"), _("\
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
