[Freeciv-Dev] (PR#14061) small bugs in ruleset syntax

["Christian Knoke" <chrisk@xxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14061 >


S2.0.99 20 SEPT 2005 CVS

make freeciv.pot

gives the following errors:

data/default/units.ruleset:151: warning: unterminated character constant
data/nation/japanese.ruleset:15: warning: unterminated character constant
data/nation/maori.ruleset:32: warning: unterminated character constant
data/scenario/tutorial.sav:2: warning: unterminated string literal
data/scenario/tutorial.sav:369: warning: unterminated string literal

The attached diff fixes the first three. The 2 bugs in tutorial.sav are
single >"< double quotes and seem to be required. I cannot fix these.

Christian

-- 
Christian Knoke            * * *            http://cknoke.de
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.

diff -Nur freeciv/data/default/units.ruleset 
freeciv-fix/data/default/units.ruleset
--- freeciv/data/default/units.ruleset  2005-08-08 08:49:43.000000000 +0200
+++ freeciv-fix/data/default/units.ruleset      2005-09-20 19:56:43.308241576 
+0200
@@ -148,7 +148,7 @@
 ;                 attacking a city
 ;                defended by a city wall (or other city building defense)
 ; "BadCityDefender"    = if attacked while in a city, firepower is set to 1 and
-;                attacker's firepower is doubled (the Pearl Harbour rule)
+;                attackers firepower is doubled (the Pearl Harbour rule)
 ;
 ; Following flag strings require extra fields:
 ;  "Paratroopers"
diff -Nur freeciv/data/nation/japanese.ruleset 
freeciv-fix/data/nation/japanese.ruleset
--- freeciv/data/nation/japanese.ruleset        2005-09-13 13:13:09.000000000 
+0200
+++ freeciv-fix/data/nation/japanese.ruleset    2005-09-20 19:57:22.238323304 
+0200
@@ -12,7 +12,7 @@
 ; solve this would be to allow translation of city names (forcing translators
 ; to translate or at least wade through all of the thousands of available
 ; names) or to distribute a separate Japanese ruleset for Japanese
-; players to use (which wouldn't be that hard; just substitute in the
+; players to use (which would not be that hard; just substitute in the
 ; correct native characters, in UTF-8, into this file).
 ;
 ; This is also a problem for many other nations that use non-latin alphabets.
diff -Nur freeciv/data/nation/maori.ruleset 
freeciv-fix/data/nation/maori.ruleset
--- freeciv/data/nation/maori.ruleset   2005-09-13 02:59:25.000000000 +0200
+++ freeciv-fix/data/nation/maori.ruleset       2005-09-20 19:57:43.358112608 
+0200
@@ -29,7 +29,7 @@
 init_government="Despotism"
 init_units=""
 
-; Note that putting "(ocean)" as a qualifier for every city probably won't
+; Note that putting "(ocean)" as a qualifier for every city probably will not
 ; give very useful results.
 cities =
  "Poneke (ocean)",     ; Maori name for Wellington