Author: jtn Date: Thu Jan 29 01:31:30 2015 New Revision: 27880 URL: http://svn.gna.org/viewcvs/freeciv?rev=27880&view=rev Log: Add TRANS comments for translateable ruleset flags.
See gna patch #5758. Modified: branches/S2_6/client/helpdata.c branches/S2_6/common/base.h branches/S2_6/common/road.h branches/S2_6/common/tech.h branches/S2_6/common/terrain.h branches/S2_6/common/unittype.h Modified: branches/S2_6/client/helpdata.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/helpdata.c?rev=27880&r1=27879&r2=27880&view=diff ============================================================================== --- branches/S2_6/client/helpdata.c (original) +++ branches/S2_6/client/helpdata.c Thu Jan 29 01:31:30 2015 @@ -462,11 +462,13 @@ case REQ_RANGE_PLAYER: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) tech flag. */ _("Requires knowledge of a technology with the " "\"%s\" flag.\n"), tech_flag_id_translated_name(preq->source.value.techflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) tech flag. */ _("Prevented by knowledge of any technology with the " "\"%s\" flag.\n"), tech_flag_id_translated_name(preq->source.value.techflag)); @@ -475,11 +477,13 @@ case REQ_RANGE_TEAM: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) tech flag. */ _("Requires that a player on your team knows " "a technology with the \"%s\" flag.\n"), tech_flag_id_translated_name(preq->source.value.techflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) tech flag. */ _("Prevented if any player on your team knows " "any technology with the \"%s\" flag.\n"), tech_flag_id_translated_name(preq->source.value.techflag)); @@ -488,11 +492,13 @@ case REQ_RANGE_ALLIANCE: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) tech flag. */ _("Requires that a player allied to you knows " "a technology with the \"%s\" flag.\n"), tech_flag_id_translated_name(preq->source.value.techflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) tech flag. */ _("Prevented if any player allied to you knows " "any technology with the \"%s\" flag.\n"), tech_flag_id_translated_name(preq->source.value.techflag)); @@ -501,11 +507,13 @@ case REQ_RANGE_WORLD: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) tech flag. */ _("Requires that some player knows a technology " "with the \"%s\" flag.\n"), tech_flag_id_translated_name(preq->source.value.techflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) tech flag. */ _("Requires that no player knows any technology with " "the \"%s\" flag.\n"), tech_flag_id_translated_name(preq->source.value.techflag)); @@ -2195,10 +2203,12 @@ case REQ_RANGE_LOCAL: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) terrain flag. */ _("Requires terrain with the \"%s\" flag on the tile.\n"), terrain_flag_id_translated_name(preq->source.value.terrainflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) terrain flag. */ _("Prevented by terrain with the \"%s\" flag on the " "tile.\n"), terrain_flag_id_translated_name(preq->source.value.terrainflag)); @@ -2207,11 +2217,13 @@ case REQ_RANGE_CADJACENT: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) terrain flag. */ _("Requires terrain with the \"%s\" flag on the " "tile or a cardinally adjacent tile.\n"), terrain_flag_id_translated_name(preq->source.value.terrainflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) terrain flag. */ _("Prevented by terrain with the \"%s\" flag on " "the tile or any cardinally adjacent tile.\n"), terrain_flag_id_translated_name(preq->source.value.terrainflag)); @@ -2220,11 +2232,13 @@ case REQ_RANGE_ADJACENT: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) terrain flag. */ _("Requires terrain with the \"%s\" flag on the " "tile or an adjacent tile.\n"), terrain_flag_id_translated_name(preq->source.value.terrainflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) terrain flag. */ _("Prevented by terrain with the \"%s\" flag on " "the tile or any adjacent tile.\n"), terrain_flag_id_translated_name(preq->source.value.terrainflag)); @@ -2233,11 +2247,13 @@ case REQ_RANGE_CITY: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) terrain flag. */ _("Requires terrain with the \"%s\" flag on a tile " "within the city radius.\n"), terrain_flag_id_translated_name(preq->source.value.terrainflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) terrain flag. */ _("Prevented by terrain with the \"%s\" flag on any tile " "within the city radius.\n"), terrain_flag_id_translated_name(preq->source.value.terrainflag)); @@ -2246,12 +2262,14 @@ case REQ_RANGE_TRADEROUTE: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) terrain flag. */ _("Requires terrain with the \"%s\" flag on a tile " "within the city radius or the city radius of " "a trade partner.\n"), terrain_flag_id_translated_name(preq->source.value.terrainflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) terrain flag. */ _("Prevented by terrain with the \"%s\" flag on any tile " "within the city radius or the city radius of " "a trade partner.\n"), @@ -2274,10 +2292,12 @@ case REQ_RANGE_LOCAL: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) base flag. */ _("Requires a base with the \"%s\" flag on the tile.\n"), base_flag_id_translated_name(preq->source.value.baseflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) base flag. */ _("Prevented by a base with the \"%s\" flag on the " "tile.\n"), base_flag_id_translated_name(preq->source.value.baseflag)); @@ -2286,11 +2306,13 @@ case REQ_RANGE_CADJACENT: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) base flag. */ _("Requires a base with the \"%s\" flag on the " "tile or a cardinally adjacent tile.\n"), base_flag_id_translated_name(preq->source.value.baseflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) base flag. */ _("Prevented by a base with the \"%s\" flag on " "the tile or any cardinally adjacent tile.\n"), base_flag_id_translated_name(preq->source.value.baseflag)); @@ -2299,11 +2321,13 @@ case REQ_RANGE_ADJACENT: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) base flag. */ _("Requires a base with the \"%s\" flag on the " "tile or an adjacent tile.\n"), base_flag_id_translated_name(preq->source.value.baseflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) base flag. */ _("Prevented by a base with the \"%s\" flag on " "the tile or any adjacent tile.\n"), base_flag_id_translated_name(preq->source.value.baseflag)); @@ -2312,11 +2336,13 @@ case REQ_RANGE_CITY: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) base flag. */ _("Requires a base with the \"%s\" flag on a tile " "within the city radius.\n"), base_flag_id_translated_name(preq->source.value.baseflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) base flag. */ _("Prevented by a base with the \"%s\" flag on any tile " "within the city radius.\n"), base_flag_id_translated_name(preq->source.value.baseflag)); @@ -2325,12 +2351,14 @@ case REQ_RANGE_TRADEROUTE: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) base flag. */ _("Requires a base with the \"%s\" flag on a tile " "within the city radius or the city radius of a " "trade partner.\n"), base_flag_id_translated_name(preq->source.value.baseflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) base flag. */ _("Prevented by a base with the \"%s\" flag on any tile " "within the city radius or the city radius of a " "trade partner.\n"), @@ -2353,10 +2381,12 @@ case REQ_RANGE_LOCAL: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) road flag. */ _("Requires a road with the \"%s\" flag on the tile.\n"), road_flag_id_translated_name(preq->source.value.roadflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) road flag. */ _("Prevented by a road with the \"%s\" flag on the " "tile.\n"), road_flag_id_translated_name(preq->source.value.roadflag)); @@ -2365,11 +2395,13 @@ case REQ_RANGE_CADJACENT: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) road flag. */ _("Requires a road with the \"%s\" flag on the " "tile or a cardinally adjacent tile.\n"), road_flag_id_translated_name(preq->source.value.roadflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) road flag. */ _("Prevented by a road with the \"%s\" flag on " "the tile or any cardinally adjacent tile.\n"), road_flag_id_translated_name(preq->source.value.roadflag)); @@ -2378,11 +2410,13 @@ case REQ_RANGE_ADJACENT: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) road flag. */ _("Requires a road with the \"%s\" flag on the " "tile or an adjacent tile.\n"), road_flag_id_translated_name(preq->source.value.roadflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) road flag. */ _("Prevented by a road with the \"%s\" flag on " "the tile or any adjacent tile.\n"), road_flag_id_translated_name(preq->source.value.roadflag)); @@ -2391,11 +2425,13 @@ case REQ_RANGE_CITY: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) road flag. */ _("Requires a road with the \"%s\" flag on a tile " "within the city radius.\n"), road_flag_id_translated_name(preq->source.value.roadflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) road flag. */ _("Prevented by a road with the \"%s\" flag on any tile " "within the city radius.\n"), road_flag_id_translated_name(preq->source.value.roadflag)); @@ -2404,12 +2440,14 @@ case REQ_RANGE_TRADEROUTE: if (preq->present) { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) road flag. */ _("Requires a road with the \"%s\" flag on a tile " "within the city radius or the city radius of a " "trade partner.\n"), road_flag_id_translated_name(preq->source.value.roadflag)); } else { cat_snprintf(buf, bufsz, + /* TRANS: %s is a (translateable) road flag. */ _("Prevented by a road with the \"%s\" flag on any tile " "within the city radius or the city radius of a " "trade partner.\n"), @@ -4956,7 +4994,7 @@ } else if (unit_type_flag_id_is_valid(unitflag)) { /* FIXME: same problems as unitclass */ cat_snprintf(buf, bufsz, - /* TRANS: %s is a unit type flag */ + /* TRANS: %s is a (translateable) unit type flag */ Q_("?unitflag:* New %s units will be veteran.\n"), unit_type_flag_id_translated_name(unitflag)); } else if (unittype != NULL) { Modified: branches/S2_6/common/base.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/base.h?rev=27880&r1=27879&r2=27880&view=diff ============================================================================== --- branches/S2_6/common/base.h (original) +++ branches/S2_6/common/base.h Thu Jan 29 01:31:30 2015 @@ -40,6 +40,8 @@ #define SPECENUM_NAME base_flag_id /* Unit inside are not considered aggressive if base is close to city */ #define SPECENUM_VALUE0 BF_NOT_AGGRESSIVE +/* TRANS: this and following strings are 'base flags', which may rarely + * be presented to the player in ruleset help text */ #define SPECENUM_VALUE0NAME N_("NoAggressive") /* Units inside will not die all at once */ #define SPECENUM_VALUE1 BF_NO_STACK_DEATH Modified: branches/S2_6/common/road.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/road.h?rev=27880&r1=27879&r2=27880&view=diff ============================================================================== --- branches/S2_6/common/road.h (original) +++ branches/S2_6/common/road.h Thu Jan 29 01:31:30 2015 @@ -20,6 +20,8 @@ /* Used in the network protocol. */ #define SPECENUM_NAME road_flag_id #define SPECENUM_VALUE0 RF_REQUIRES_BRIDGE +/* TRANS: this and following strings are 'road flags', which may rarely + * be presented to the player in ruleset help text */ #define SPECENUM_VALUE0NAME N_("RequiresBridge") #define SPECENUM_VALUE1 RF_PREVENTS_OTHER_ROADS #define SPECENUM_VALUE1NAME N_("PreventsOtherRoads") Modified: branches/S2_6/common/tech.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/tech.h?rev=27880&r1=27879&r2=27880&view=diff ============================================================================== --- branches/S2_6/common/tech.h (original) +++ branches/S2_6/common/tech.h Thu Jan 29 01:31:30 2015 @@ -73,6 +73,8 @@ #define SPECENUM_NAME tech_flag_id /* player gets extra tech if rearched first */ #define SPECENUM_VALUE0 TF_BONUS_TECH +/* TRANS: this and following strings are 'tech flags', which may rarely + * be presented to the player in ruleset help text */ #define SPECENUM_VALUE0NAME N_("Bonus_Tech") /* "Settler" unit types can build bridges over rivers */ #define SPECENUM_VALUE1 TF_BRIDGE Modified: branches/S2_6/common/terrain.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/terrain.h?rev=27880&r1=27879&r2=27880&view=diff ============================================================================== --- branches/S2_6/common/terrain.h (original) +++ branches/S2_6/common/terrain.h Thu Jan 29 01:31:30 2015 @@ -86,6 +86,9 @@ #define SPECENUM_NAME terrain_alteration /* Can build irrigation without changing terrain */ #define SPECENUM_VALUE0 TA_CAN_IRRIGATE +/* TRANS: this and following strings may rarely be presented to the player + * in ruleset help text, to denote the set of terrains which can be altered + * in a particular way */ #define SPECENUM_VALUE0NAME N_("CanIrrigate") /* Can build mine without changing terrain */ #define SPECENUM_VALUE1 TA_CAN_MINE @@ -99,6 +102,8 @@ #define SPECENUM_NAME terrain_flag_id /* No barbarians summoned on this terrain. */ #define SPECENUM_VALUE0 TER_NO_BARBS +/* TRANS: this and following strings are 'terrain flags', which may rarely + * be presented to the player in ruleset help text */ #define SPECENUM_VALUE0NAME N_("NoBarbs") /* No cities on this terrain. */ #define SPECENUM_VALUE1 TER_NO_CITIES Modified: branches/S2_6/common/unittype.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/unittype.h?rev=27880&r1=27879&r2=27880&view=diff ============================================================================== --- branches/S2_6/common/unittype.h (original) +++ branches/S2_6/common/unittype.h Thu Jan 29 01:31:30 2015 @@ -139,6 +139,8 @@ #define SPECENUM_NAME unit_type_flag_id /* Cannot fortify even if class can */ #define SPECENUM_VALUE0 UTYF_CANT_FORTIFY +/* TRANS: this and following strings are 'unit type flags', which may rarely + * be presented to the player in ruleset help text */ #define SPECENUM_VALUE0NAME N_("Cant_Fortify") /* Unit has no ZOC */ #define SPECENUM_VALUE1 UTYF_NOZOC _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits