? typescript
? no-c-format.diff
? diff.diff
? c-format2.diff
? po/messages
? po/no.diff
? server/stdinhand.c.new
Index: data/helpdata.txt
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/helpdata.txt,v
retrieving revision 1.106
diff -u -r1.106 helpdata.txt
--- data/helpdata.txt	2001/07/09 23:12:36	1.106
+++ data/helpdata.txt	2001/07/10 22:29:52
@@ -883,6 +883,7 @@
 ; from 0 to (A+D-1), and the comparison is ">=D", not ">D".  The
 ; odds are the same both ways, but I think my explanation may be a
 ; little simpler for non-programmers who may be reading this. */
+; /* xgettext:no-c-format */
 _("\
 Whichever unit survives the fight has a chance of becoming a \
 veteran, if it was not a veteran already.  If the winner's \
@@ -916,7 +917,8 @@
 Strength values inside the game are actually multiplied by 10, with \
 fractions dropped, so the attacker's strength is 80, and the \
 defender's strength is 202.\
-"), _("\
+"), ; /* xgettext:no-c-format */
+_("\
 Each round of combat, a random number between 1 and 282 is \
 generated.  If the number is greater than 202 (about a 28% chance), \
 the defender loses 1 hit point.  Otherwise (about a 72% chance), the \
@@ -955,7 +957,8 @@
 "), _("\
 Internally, the values used for attacker and defender strength are \
 180 and 225, respectively.\
-"), _("\
+"), ; /* xgettext:no-c-format */
+_("\
 Each round, a random number from 1 to 405 is generated.  If it is \
 greater than 225 (about a 44% chance) the defender loses 2 hit \
 points (the attacker's firepower is 2).  Otherwise, the attacker \
Index: data/civ1/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ1/buildings.ruleset,v
retrieving revision 1.19
diff -u -r1.19 buildings.ruleset
--- data/civ1/buildings.ruleset	2001/07/09 23:12:37	1.19
+++ data/civ1/buildings.ruleset	2001/07/10 22:29:55
@@ -459,6 +459,7 @@
     { "type", "range", "amount"
 	"Science_Bonus", "City", 50
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by 50%.\
 ")
@@ -482,6 +483,7 @@
 	"Tax_Bonus", "City", 50
 	"Luxury_Bonus", "City", 50
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by 50%.\
 ")
@@ -528,6 +530,7 @@
     { "type", "range", "amount", "cond_bldg"
 	"Prod_Bonus", "City", 50, "Factory"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Factory, a Manufacturing Plant increases the shield\
  production in a city by 100%.\
@@ -690,6 +693,7 @@
     { "type", "range", "amount", "cond_bldg"
 	"Prod_Bonus", "City", 50, "Factory"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production of a Factory or Mfg. Plant in a\
  city: a Factory and a Power Plant together give a 100% production\
@@ -719,6 +723,7 @@
     { "type", "range", "amount"
 	"Pollu_Adj_Prod", "City", 34
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Building a recycling center reduces the amount of pollution\
  generated by production in a city by 66%.\
@@ -843,6 +848,7 @@
 	"Pollu_Set_Prod", "City", 0
 	"Slow_Global_Warm", "World", 10
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Eliminates all pollution generated by production in a city. \
  It also\
@@ -1064,6 +1070,7 @@
     { "type", "range", "amount", "cond_bldg"
 	"Science_Bonus", "City", 50, "Library"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a University increases the science\
  production of a city by 100%.\
@@ -1228,6 +1235,7 @@
     { "type", "range", "amount"
 	"Improve_Rep", "None", 25
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 When built, every civilization's attitude toward you is improved\
  by 25%.\
@@ -1616,6 +1624,7 @@
     { "type", "range", "amount", "cond_bldg"
 	"Science_Bonus", "Player", 50, "Library"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production in each city by 50%.\
 ")
Index: data/civ2/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ2/buildings.ruleset,v
retrieving revision 1.22
diff -u -r1.22 buildings.ruleset
--- data/civ2/buildings.ruleset	2001/07/09 23:12:38	1.22
+++ data/civ2/buildings.ruleset	2001/07/10 22:29:58
@@ -444,6 +444,7 @@
     { "type", "range", "amount"
 	"Science_Bonus", "City", 50
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by 50%.\
 ")
@@ -467,6 +468,7 @@
 	"Tax_Bonus", "City", 50
 	"Luxury_Bonus", "City", 50
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by 50%.\
 ")
@@ -513,6 +515,7 @@
     { "type", "range", "amount", "cond_bldg"
 	"Prod_Bonus", "City", 50, "Factory"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Factory, a Manufacturing Plant increases the shield\
  production in a city by 100%.\
@@ -678,6 +681,7 @@
     { "type", "range", "amount", "cond_bldg"
 	"Prod_Bonus", "City", 50, "Factory"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production of a Factory or Mfg. Plant in a\
  city: a Factory and a Power Plant together give a 100% production\
@@ -707,6 +711,7 @@
     { "type", "range", "amount"
 	"Pollu_Adj_Prod", "City", 34
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Building a recycling center reduces the amount of pollution\
  generated by production in a city by 66%.\
@@ -834,6 +839,7 @@
 	"Pollu_Set_Prod", "City", 0
 	"Slow_Global_Warm", "World", 10
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Eliminates all pollution generated by production in a city. \
  It also\
@@ -1055,6 +1061,7 @@
     { "type", "range", "amount", "cond_bldg"
 	"Science_Bonus", "City", 50, "Library"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a University increases the science\
  production of a city by 100%.\
@@ -1219,6 +1226,7 @@
     { "type", "range", "amount"
 	"Improve_Rep", "None", 25
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 When built, every civilization's attitude toward you is improved\
  by 25%.\
Index: data/default/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/buildings.ruleset,v
retrieving revision 1.27
diff -u -r1.27 buildings.ruleset
--- data/default/buildings.ruleset	2001/07/09 23:12:38	1.27
+++ data/default/buildings.ruleset	2001/07/10 22:30:01
@@ -284,6 +284,7 @@
 	"Tax_Bonus", "City", 50, "Marketplace"
 	"Luxury_Bonus", "City", 50, "Marketplace"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Together with the Marketplace improvement, a Bank increases the\
  luxury and tax production within a city by 100%.\
@@ -634,6 +635,7 @@
     { "type", "range", "amount"
 	"Science_Bonus", "City", 50
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by 50%.\
 ")
@@ -657,6 +659,7 @@
 	"Tax_Bonus", "City", 50
 	"Luxury_Bonus", "City", 50
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by 50%.\
 ")
@@ -703,6 +706,7 @@
     { "type", "range", "amount", "cond_bldg"
 	"Prod_Bonus", "City", 50, "Factory"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Factory, a Manufacturing Plant increases the shield\
  production in a city by 100%.\
@@ -875,6 +879,7 @@
 	"Prod_Bonus", "City", 25, "Factory"
 	"Prod_Bonus", "City", 25, "Mfg. Plant"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production of a Factory or Mfg. Plant in a\
  city: a Factory and a Power Plant together give a 75% production\
@@ -907,6 +912,7 @@
     { "type", "range", "amount"
 	"Pollu_Adj_Prod", "City", 34
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Building a recycling center reduces the amount of pollution\
  generated by production in a city by 66%.\
@@ -1035,6 +1041,7 @@
 	"Pollu_Set_Prod", "City", 0
 	"Slow_Global_Warm", "World", 10
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Eliminates all pollution generated by production in a city. \
  It also\
@@ -1161,6 +1168,7 @@
 	"Tax_Bonus", "City", 50, "Bank"
 	"Luxury_Bonus", "City", 50, "Bank"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Marketplace and a Bank, a Stock Exchange boosts\
  tax and luxury production in a city by 150%.\
@@ -1260,6 +1268,7 @@
     { "type", "range", "amount", "cond_bldg"
 	"Science_Bonus", "City", 50, "Library"
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a University increases the science\
  production of a city by 100%.\
@@ -1426,6 +1435,7 @@
     { "type", "range", "amount"
 	"Improve_Rep", "None", 25
     }
+; /* xgettext:no-c-format */
 helptext	= _("\
 When built, every civilization's attitude toward you is improved\
  by 25%.\