? diff.diff
? no-c-format.diff
? po/messages
? server/stdinhand.c.new
Index: data/helpdata.txt
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/helpdata.txt,v
retrieving revision 1.105
diff -u -r1.105 helpdata.txt
--- data/helpdata.txt	2001/06/30 13:21:55	1.105
+++ data/helpdata.txt	2001/07/08 23:27:47
@@ -554,7 +554,8 @@
 ones to ensure your cities have maximum defense.  The units most \
 often used for defense are (in order of strength):  Warrior, \
 Phalanx, Pikemen, Musketeers, and Riflemen.\
-"), _("\
+"), ; /* xgettext:no-c-format */
+_("\
     Keep in mind that with some types of government, military units \
 inside or outside cities can reduce or create unhappiness. \
 Also remember that when a unit is inside a city, it gets a 50% \
@@ -741,7 +742,8 @@
 There are four general types of unit: Land, Sea, Air, and \
 Helicopter.  (Helicopters are sufficiently different from other air \
 units that it is easiest to think of them as a separate unit type.)\
-"), _("\
+"), ; /* xgettext:no-c-format */
+_("\
 Land units move on land, and suffer the movement effects of terrain, \
 but benefit from roads and railroads.  They cannot move on ocean \
 squares except when carried by an appropriate sea unit.  When at \
@@ -924,6 +926,7 @@
 ; The attacker should win about 8 of them, taking 8 HP off the
 ; defender's 20 HP total.  The defender should win the other 20,
 ; killing the attacker. */
+; /* xgettext:no-c-format */
 _("\
 Since both units have 20 hit points, the odds favor a victory for \
 the defender.  The defender will probably lose somewhere around 40% \
@@ -963,6 +966,7 @@
 ; them, and the Alpine Troops 12.  That's enough to kill the Alpine
 ; Troops (precisely to 0 hit points), and inflict 12 hit points on
 ; the Battleship's 40 HP total. */
+; /* xgettext:no-c-format */
 _("\
 In this case, the odds greatly favor the attacker winning.  The \
 Battleship is 25% less likely to score a hit in any given round, \
Index: data/civ1/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ1/buildings.ruleset,v
retrieving revision 1.18
diff -u -r1.18 buildings.ruleset
--- data/civ1/buildings.ruleset	2000/08/23 11:46:46	1.18
+++ data/civ1/buildings.ruleset	2001/07/08 23:27:50
@@ -990,6 +990,7 @@
 	"Trade_Per_Tile", "City", 50, "None", "Road"
 	"Trade_Route_Pct", "City", 10
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases trade resources by 50% on all squares with roads or\
  railroads.\
@@ -1013,6 +1014,7 @@
     { "type", "range", "amount", "aff_terr", "aff_spec"
 	"Food_Per_Tile", "City", 50, "None", "Farmland"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the food resources by 50% on each farmland square which\
  is being used around the city.  Farmland squares are those which\
@@ -1156,6 +1158,7 @@
     { "type", "range", "amount"
 	"Science_Bonus", "City", 50
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 50% in the city where it is built.\
 ")
@@ -1354,6 +1357,7 @@
     { "type", "range", "amount"
 	"Science_Bonus", "City", 100
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in the city where it is built.\
 ")
Index: data/civ2/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ2/buildings.ruleset,v
retrieving revision 1.21
diff -u -r1.21 buildings.ruleset
--- data/civ2/buildings.ruleset	2000/08/24 07:06:56	1.21
+++ data/civ2/buildings.ruleset	2001/07/08 23:27:52
@@ -981,6 +981,7 @@
 	"Trade_Per_Tile", "City", 50, "None", "Road"
 	"Trade_Route_Pct", "City", 10
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases trade resources by 50% on all squares with roads or\
  railroads.\
@@ -1004,6 +1005,7 @@
     { "type", "range", "amount", "aff_terr", "aff_spec"
 	"Food_Per_Tile", "City", 50, "None", "Farmland"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the food resources by 50% on each farmland square which\
  is being used around the city.  Farmland squares are those which\
@@ -1147,6 +1149,7 @@
     { "type", "range", "amount"
 	"Science_Bonus", "City", 50
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 50% in the city where it is built.\
 ")
@@ -1342,6 +1345,7 @@
     { "type", "range", "amount"
 	"Science_Bonus", "City", 100
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in the city where it is built.\
 ")
Index: data/default/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/buildings.ruleset,v
retrieving revision 1.26
diff -u -r1.26 buildings.ruleset
--- data/default/buildings.ruleset	2000/11/11 03:09:49	1.26
+++ data/default/buildings.ruleset	2001/07/08 23:27:56
@@ -1184,6 +1184,7 @@
     { "type", "range", "amount", "aff_terr", "aff_spec"
 	"Trade_Per_Tile", "City", 50, "None", "Road"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases trade resources by 50% on all squares with roads or\
  railroads.\
@@ -1209,6 +1210,7 @@
     { "type", "range", "amount", "aff_terr", "aff_spec"
 	"Food_Per_Tile", "City", 50, "None", "Farmland"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the food resources by 50% on each farmland square which\
  is being used around the city.  Farmland squares are those which\
@@ -1352,6 +1354,7 @@
     { "type", "range", "amount"
 	"Science_Bonus", "City", 50
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 50% in the city where it is built.\
 ")
@@ -1550,6 +1553,7 @@
     { "type", "range", "amount"
 	"Science_Bonus", "City", 100
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in the city where it is built.\
 ")