Author: jtn Date: Mon Feb 16 09:32:21 2015 New Revision: 28169 URL: http://svn.gna.org/viewcvs/freeciv?rev=28169&view=rev Log: Some minor textual rewording.
See gna bug #22294. Modified: branches/S2_6/client/helpdata.c branches/S2_6/data/classic/terrain.ruleset branches/S2_6/data/experimental/terrain.ruleset branches/S2_6/data/experimental/units.ruleset branches/S2_6/data/helpdata.txt branches/S2_6/data/multiplayer/terrain.ruleset Modified: branches/S2_6/client/helpdata.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/helpdata.c?rev=28169&r1=28168&r2=28169&view=diff ============================================================================== --- branches/S2_6/client/helpdata.c (original) +++ branches/S2_6/client/helpdata.c Mon Feb 16 09:32:21 2015 @@ -3716,7 +3716,8 @@ } } if (effect_cumulative_max(EFT_MINING_TF_POSSIBLE, &for_utype) > 0) { - CATLSTR(buf, bufsz, _("* Can mine terrain to another.\n")); + CATLSTR(buf, bufsz, _("* Can convert terrain to another type by " + "mining.\n")); } if (effect_cumulative_max(EFT_IRRIG_POSSIBLE, &for_utype) > 0) { @@ -3734,7 +3735,8 @@ } } if (effect_cumulative_max(EFT_IRRIG_TF_POSSIBLE, &for_utype) > 0) { - CATLSTR(buf, bufsz, _("* Can irrigate terrain to another.\n")); + CATLSTR(buf, bufsz, _("* Can convert terrain to another type by " + "irrigation.\n")); } extra_type_by_cause_iterate(EC_BASE, pextra) { Modified: branches/S2_6/data/classic/terrain.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/terrain.ruleset?rev=28169&r1=28168&r2=28169&view=diff ============================================================================== --- branches/S2_6/data/classic/terrain.ruleset (original) +++ branches/S2_6/data/classic/terrain.ruleset Mon Feb 16 09:32:21 2015 @@ -1242,7 +1242,7 @@ Fortresses improve defense for land units. Among other effects, a land \ unit remaining in a fortress for a whole turn without moving recovers \ a quarter of its hit points. With Invention, fortresses gain watchtowers \ -from which units can see further afield.\ +from which land units can see further afield.\ ") [extra_airbase] Modified: branches/S2_6/data/experimental/terrain.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/terrain.ruleset?rev=28169&r1=28168&r2=28169&view=diff ============================================================================== --- branches/S2_6/data/experimental/terrain.ruleset (original) +++ branches/S2_6/data/experimental/terrain.ruleset Mon Feb 16 09:32:21 2015 @@ -1218,7 +1218,7 @@ Fortresses improve defense for land units. Among other effects, a land \ unit remaining in a fortress for a whole turn without moving recovers \ a quarter of its hit points. With Invention, fortresses gain watchtowers \ -from which units can see further afield.\ +from which land units can see further afield.\ ") [extra_airbase] Modified: branches/S2_6/data/experimental/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/units.ruleset?rev=28169&r1=28168&r2=28169&view=diff ============================================================================== --- branches/S2_6/data/experimental/units.ruleset (original) +++ branches/S2_6/data/experimental/units.ruleset Mon Feb 16 09:32:21 2015 @@ -1496,7 +1496,8 @@ helptext = _("\ The Trireme is your first boat unit. It can act\ as a transport ship and has rudimentary offensive\ - capabilities, but may not enter deep ocean tiles.\ + capabilities, and unlike later boats can travel on\ + rivers, but it may not enter deep ocean tiles.\ ") [unit_caravel] Modified: branches/S2_6/data/helpdata.txt URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/helpdata.txt?rev=28169&r1=28168&r2=28169&view=diff ============================================================================== --- branches/S2_6/data/helpdata.txt (original) +++ branches/S2_6/data/helpdata.txt Mon Feb 16 09:32:21 2015 @@ -610,10 +610,11 @@ more, the trade route with the smallest ongoing revenue is canceled if \ it would be less than the new route. (Otherwise, the origin civilization \ can still gain initial revenue by entering the marketplace and selling \ -trade goods, but it is reduced to a third.) \ -The maximum number of trade routes is forced only when attempting to \ -establish a new ones. If you temporarily lose the ability to establish \ -as many trade routes as city already has, existing ones are not affected.\ +trade goods, but it is reduced to a third.)\ +"), _("\ +This limit is enforced only when attempting to establish a new route. If \ +you temporarily lose the ability to establish as many trade routes as a \ +city already has, existing ones are not affected.\ "), _("\ Beware: in rulesets where plague is enabled, it can travel \ along trade routes. See the section on Plague for more details.\ Modified: branches/S2_6/data/multiplayer/terrain.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/terrain.ruleset?rev=28169&r1=28168&r2=28169&view=diff ============================================================================== --- branches/S2_6/data/multiplayer/terrain.ruleset (original) +++ branches/S2_6/data/multiplayer/terrain.ruleset Mon Feb 16 09:32:21 2015 @@ -1216,7 +1216,7 @@ Fortresses improve defense for land units. Among other effects, a land \ unit remaining in a fortress for a whole turn without moving recovers \ a quarter of its hit points. With Invention, fortresses gain watchtowers \ -from which units can see further afield.\ +from which land units can see further afield.\ ") [extra_airbase] _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits