Complete.Org: Mailing Lists: Archives: freeciv-dev: February 2003:
[Freeciv-Dev] (PR#3359) unterminated literal string warning
Home

[Freeciv-Dev] (PR#3359) unterminated literal string warning

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients:;
Subject: [Freeciv-Dev] (PR#3359) unterminated literal string warning
From: "Davide Pagnin via RT" <rt@xxxxxxxxxxxxxx>
Date: Sun, 9 Feb 2003 01:08:44 -0800
Reply-to: rt.freeciv.org@xxxxxxxxxxxxxx

        Hi all!

After the inclusion of Legend and some work on data/, it appears that
actual CVS is not working perfectly.

What I mean is that by issuing 
make freeciv.pot
With at least gettext 0.11.0, you'll get many warnings regarding not
properly terminated literal strings.

The problem mainly came from white spaces after / character at the end
of lines, or from / character missing at the end of a line.

The attached patch should resolve all the warnings.

NOTE: I have made also a little correction to helpdata.txt.
AFAIK, all the help data is appropriate for the default ruleset, and not
for civ2 ruleset, then it is inappropriate to say:
"Horsemen, Chariots, Elephants, Crusaders and Cavalry" as HORSE flag
categories of units, because nor Elephants neither Crusaders are present
in the default ruleset.
It is instead appropriate to include Knights, that line should then be:
"Horsemen, Chariots, Knights and Cavalry"

diff -urN -Xfreeciv/diff_ignore freeciv/data/civ2/governments.ruleset 
freeciv-work/data/civ2/governments.ruleset
--- freeciv/data/civ2/governments.ruleset       Thu Feb  6 23:59:55 2003
+++ freeciv-work/data/civ2/governments.ruleset  Sat Feb  8 15:50:42 2003
@@ -163,7 +163,7 @@
  income as quickly as possible, rather than paying taxes or\
  conducting research.\
 \n\n\
-Anarchy offers slightly less corruption  and waste than Despotism, but\ 
+Anarchy offers slightly less corruption  and waste than Despotism, but\
  slightly more unhappiness.\
 \n\n\
 Settlers consume 1 food per turn under Anarchy.  Squares which would\
@@ -237,7 +237,7 @@
 Under Despotism, you are the absolute ruler of your people.  Your\
  control over your citizens is maintained largely by martial law.\
 \n\n\
-Despotism suffers the highest level of corruption and waste of all\ 
+Despotism suffers the highest level of corruption and waste of all\
  forms of government.\
 \n\n\
 Settlers consume 1 food per turn under Despotism.  Squares which\
@@ -314,7 +314,7 @@
 Under Monarchy, a king or queen serves as a hereditary figurehead\
  for your government.\
 \n\n\
-Monarchy suffers the same small amount of corruption and waste that\ 
+Monarchy suffers the same small amount of corruption and waste that\
  the Republic does.\
 \n\n\
 Settlers consume 1 food per turn under Monarchy.\
@@ -392,7 +392,7 @@
  citizens.  Communism gives a balance between military and commercial\
  styles of government.\
 \n\n\
-Under Communism, corruption and waste does not vary by distance from\ 
+Under Communism, corruption and waste does not vary by distance from\
  the capital; all cities (including the capital) have a modest amount\
  of corruption.  In addition, Communist cities more than 10 squares\
  away from the capital are considered to be only 10 squares away when\
@@ -648,7 +648,7 @@
 Under Democracy, citizens govern directly by voting on issues.\
  Democracy offers the highest possible level of trade, but also\
  offers the most potential for unhappiness.  There is no corruption\
- or waste during Democracy, but citizens become very upset during\ 
+ or waste during Democracy, but citizens become very upset during\
  wars.\
 \n\n\
 Settlers consume 2 food per turn under Democracy.  Squares with\
diff -urN -Xfreeciv/diff_ignore freeciv/data/default/governments.ruleset 
freeciv-work/data/default/governments.ruleset
--- freeciv/data/default/governments.ruleset    Thu Feb  6 23:59:55 2003
+++ freeciv-work/data/default/governments.ruleset       Sat Feb  8 15:53:20 2003
@@ -164,7 +164,7 @@
  income as quickly as possible, rather than paying taxes or\
  conducting research.\
 \n\n\
-Anarchy offers slightly less corruption than Despotism,\ 
+Anarchy offers slightly less corruption than Despotism,\
  but slightly more unhappiness.\
 \n\n\
 Settlers consume 1 food per turn under Anarchy.  Squares which would\
@@ -238,7 +238,7 @@
 Under Despotism, you are the absolute ruler of your people.  Your\
  control over your citizens is maintained largely by martial law.\
 \n\n\
-Despotism suffers the highest level of corruption of all\ 
+Despotism suffers the highest level of corruption of all\
  forms of government.\
 \n\n\
 Settlers consume 1 food per turn under Despotism.  Squares which\
@@ -315,7 +315,7 @@
 Under Monarchy, a king or queen serves as a hereditary figurehead\
  for your government.\
 \n\n\
-Monarchy suffers the same small amount of corruption that\ 
+Monarchy suffers the same small amount of corruption that\
  the Republic does.\
 \n\n\
 Settlers consume 1 food per turn under Monarchy.\
@@ -393,10 +393,10 @@
  citizens.  Communism gives a balance between military and commercial\
  styles of government.\
 \n\n\
-Under Communism, corruption does not vary by distance from\ 
+Under Communism, corruption does not vary by distance from\
  the capital; all cities (including the capital) have a modest amount\
- of corruption.  In addition, Communist cities more than 10\ 
- squares away from the capital are considered to be only 10 squares\ 
+ of corruption.  In addition, Communist cities more than 10\
+ squares away from the capital are considered to be only 10 squares\
  away when computing the cost of inciting a revolt. \
  See Units, Diplomat.\
 \n\n\
@@ -562,7 +562,7 @@
 Under Democracy, citizens govern directly by voting on issues.\
  Democracy offers the highest possible level of trade, but also\
  offers the most potential for unhappiness.  There is no corruption\
- during Democracy, but citizens become very upset during\ 
+ during Democracy, but citizens become very upset during\
  wars.\
 \n\n\
 Settlers consume 2 food per turn under Democracy.  Squares with\
diff -urN -Xfreeciv/diff_ignore freeciv/data/helpdata.txt 
freeciv-work/data/helpdata.txt
--- freeciv/data/helpdata.txt   Thu Feb  6 23:59:55 2003
+++ freeciv-work/data/helpdata.txt      Sat Feb  8 15:53:00 2003
@@ -912,7 +912,7 @@
 "), _("\
  - Next, the defender's strength is doubled if it is a Pikeman unit \
 defending against a mounted unit.  Mounted units normally include \
-Horsemen, Chariots, Elephants, Crusaders and Cavalry, 
+Horsemen, Chariots, Knights and Cavalry.\
 "), _("\
  - If the defender is an AEGIS Cruiser defending against airborne \
 units (including missiles and Helicopters), the defense is \
diff -urN -Xfreeciv/diff_ignore freeciv/data/history/governments.ruleset 
freeciv-work/data/history/governments.ruleset
--- freeciv/data/history/governments.ruleset    Fri Feb  7 00:00:02 2003
+++ freeciv-work/data/history/governments.ruleset       Sat Feb  8 15:52:01 2003
@@ -164,7 +164,7 @@
  income as quickly as possible, rather than paying taxes or\
  conducting research.\
 \n\n\
-Anarchy offers slightly less corruption and waste than Despotism,\ 
+Anarchy offers slightly less corruption and waste than Despotism,\
  but slightly more unhappiness.\
 \n\n\
 Settlers consume 1 food per turn under Anarchy.  Squares which would\
@@ -238,7 +238,7 @@
 Under Despotism, you are the absolute ruler of your people.  Your\
  control over your citizens is maintained largely by martial law.\
 \n\n\
-Despotism suffers the highest level of corruption and waste of all \ 
+Despotism suffers the highest level of corruption and waste of all \
 forms of government.\
 \n\n\
 Settlers consume 1 food per turn under Despotism.  Squares which\
@@ -315,7 +315,7 @@
 Under Monarchy, a king or queen serves as a hereditary figurehead\
  for your government.\
 \n\n\
-Monarchy suffers the same small amount of corruption and waste that\ 
+Monarchy suffers the same small amount of corruption and waste that\
 the Republic does.\
 \n\n\
 Settlers consume 1 food per turn under Monarchy.\
@@ -393,10 +393,10 @@
  citizens.  Communism gives a balance between military and commercial\
  styles of government.\
 \n\n\
-Under Communism, corruption and waste does not vary by distance from\ 
+Under Communism, corruption and waste does not vary by distance from\
  the capital; all cities (including the capital) have a modest amount\
  of corruption and waste.  In addition, Communist cities more than 10 \
- squares away from the capital are considered to be only 10 squares away\ 
+ squares away from the capital are considered to be only 10 squares away\
  when computing the cost of inciting a revolt (see Units, Diplomat).\
 \n\n\
 Settlers consume 2 food per turn under Communism.\

[Prev in Thread] Current Thread [Next in Thread]