[Freeciv-Dev] (PR#39407) Bug in autogen.sh

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39407 >

I think I have found a bug in the autogen.sh shell script. I am working on a
translation, and I downloaded the 2.0.9 branch and tried to run autogen.sh,
but it failed. It complained that ALL_LINGUAS contained nb, but it couldn't
find nb.po in the po directory.

I edited configure.ac, and removed nb from the variable ALL_LINGUAS, and
then autogen.sh ran smoothly.

Later, I have found out that you can do "make nb.po" in the "po" directory
and nb.po gets created (as a copy of no.po). But it's kind of a chicken and
egg problem. You can't make nb.po because the Makefile hasn't been
generated, and you can't generate the Makefile because autogen checks for
nb.po.

Cheers,

 Joan

I think I have found a bug in the autogen.sh shell script. I am working on a translation, and I downloaded the 2.0.9 branch and tried to run autogen.sh, but it failed. It complained that ALL_LINGUAS contained nb, but it couldn't find 
nb.po in the po directory.I edited configure.ac, and removed nb from the variable ALL_LINGUAS, and then autogen.sh ran smoothly.Later, I have found out that you can do "make 
nb.po" in the "po" directory and nb.po gets created (as a copy of no.po). But it's kind of a chicken and egg problem. You can't make nb.po because the Makefile hasn't been generated, and you can't generate the Makefile because autogen checks for 
nb.po.Cheers, Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39612) Problem building gui-gtk-2.0

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39612 >

Hi,

I have had a problem building Freeciv on the S2_1 branch. I got a linking
error: it couldn't find popup_theme_suggestion_dialog or
popup_tileset_suggestion_dialog.

I am building Freeciv on a Kubuntu system, using GTK. I have found that the
Makefile on directory client/gui- gtk-2.0 wasn't compiling theme_dlg.c or
tileset_dlg.c, which is where those two functions are defined. I have added
them manually to the Makefile, and now I can build the whole enchilada. But
it would be nice to fix how the Makefile gets generated, to help package
builders.

Is it only happening to me?. I got the sources and generated the Makefiles
in mid-June.

Joan

Hi,I have had a problem building Freeciv on the S2_1 branch. I
got a linking error: it couldn't find popup_theme_suggestion_dialog or
popup_tileset_suggestion_dialog.I am building Freeciv on a Kubuntu system, using GTK. I have found that the Makefile on directory
client/gui-
gtk-2.0 wasn't compiling theme_dlg.c or tileset_dlg.c, which is where
those two functions are defined. I have added them manually to the
Makefile, and now I can build the whole enchilada. But it would be nice
to fix how the Makefile gets generated, to help package builders.
Is it only happening to me?. I got the sources and generated the Makefiles in mid-June.Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39612) Problem building gui-gtk-2.0

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39612 >

Yep, it works fine now. Thanks a lot.

Joan

2007/8/25, Marko Lindqvist <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39612 >
>
> On 25/08/07, Joan Creus <[EMAIL PROTECTED]> wrote:
> > >
> >
> > Hi,
> >
> > I have had a problem building Freeciv on the S2_1 branch. I got a
> linking
> > error: it couldn't find popup_theme_suggestion_dialog or
> > popup_tileset_suggestion_dialog.
> >
> > I am building Freeciv on a Kubuntu system, using GTK. I have found that
> the
> > Makefile on directory client/gui- gtk-2.0 wasn't compiling theme_dlg.c
> or
> > tileset_dlg.c, which is where those two functions are defined. I have
> added
> > them manually to the Makefile, and now I can build the whole enchilada.
> But
> > it would be nice to fix how the Makefile gets generated, to help package
> > builders.
> >
> > Is it only happening to me?. I got the sources and generated the
> Makefiles
> > in mid-June.
>
> theme_dlg.c and tileset_dlg.c were added recently. It seems that your
> Makefile is not regenerated after that.
> Makefiles are automatically regenerated in situations like this only
> if you have used configure option '--enable-maintainer-mode'.
> Otherwise you need to rerun autogen.sh after new source files are
> added (or actually configure, but it's part of autogen.sh)
>
> Let us know if you are having this problem with newly generated Makefiles.
>
>
> - ML
>
>
>

Yep, it works fine now. Thanks a lot.Joan2007/8/25, Marko Lindqvist <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=39612 >On 25/08/07, Joan Creus <[EMAIL PROTECTED]
> wrote:> >>> Hi,>> I have had a problem building Freeciv on the S2_1 branch. I got a linking> error: it couldn't find popup_theme_suggestion_dialog or> popup_tileset_suggestion_dialog.
>> I am building Freeciv on a Kubuntu system, using GTK. I have found that the> Makefile on directory client/gui- gtk-2.0 wasn't compiling theme_dlg.c or> tileset_dlg.c, which is where those two functions are defined. I have added
> them manually to the Makefile, and now I can build the whole enchilada. But> it would be nice to fix how the Makefile gets generated, to help package> builders.>> Is it only happening to me?. I got the sources and generated the Makefiles
> in mid-June. theme_dlg.c and tileset_dlg.c were added recently. It seems that yourMakefile is not regenerated after that. Makefiles are automatically regenerated in situations like this onlyif you have used configure option '--enable-maintainer-mode'.
Otherwise you need to rerun autogen.sh after new source files areadded (or actually configure, but it's part of autogen.sh) Let us know if you are having this problem with newly generated Makefiles.
 - ML
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39631) Typos in tutorial

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39631 >

This transaction appears to have no content
I have found a few typos in the tutorial.sav file. They are corrected in the
diff file.

And one question: in line 180, talking about big cities, where it says:

Make sure you have enough taxes and cultural buildings to keep your\n\
citizens content.

Shouldn't that be "luxuries" instead of "taxes"? I haven't changed that in
the diff, though.

Joan
I have found a few typos in the tutorial.sav file. They are corrected in the diff file.And one question: in line 180, talking about big cities, where it says:Make sure you have enough taxes and cultural buildings to keep your\n\
citizens content.Shouldn't that be "luxuries" instead of "taxes"? I haven't changed that in the diff, though.Joan
Index: tutorial.sav
===
--- tutorial.sav	(revision 13418)
+++ tutorial.sav	(working copy)
@@ -87,7 +87,7 @@
 The flag and background color indicate what civilization the city\n\
 belongs to (this will be useful when you meet other civilizations).\n\
 The top row of the bar also shows the name and size of the city, and\n\
-will show one or more starts to indicate if there are units in the\n\
+will show one or more stars to indicate if there are units in the\n\
 city.  The bottom row shows what the city is building, and how long it\n\
 will take; it also shows how long the city will take to grow to the\n\
 next largest size."))
@@ -227,7 +227,7 @@
 existing cities.  Generally when building new cities you want to make\n\
 sure that all tiles are covered by at least one city, but after that\n\
 it is best that your cities overlap as little as possible.  Spreading\n\
-out cities properly gives each city access to more resrouces, allowing\n\
+out cities properly gives each city access to more resources, allowing\n\
 them to grow to larger sizes."))
 end
 settlersbuilt = settlersbuilt + 1
@@ -344,7 +344,7 @@
 civilization is to be a peaceful trading nation or a conquering\n\
 juggernaut.  Each has advantages.\n\
 \n\
-For now, you probably want to switch staight into Republic.  In the\n\
+For now, you probably want to switch straight into Republic.  In the\n\
 Government menu, go to the Change Government submenu and choose\n\
 Republic.  Yes you want a revolution!  Changing governments means\n\
 going through a few turns of anarchy, so it is not without cost.\n\
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39630) Typos in several nation rulesets

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39630 >

This transaction appears to have no content
Several typos I have found in the ottoman, colombian, westphalian, malian,
byzantium, and romanian rulesets while translating. See file for the
details.

Cheers,

Joan
Several typos I have found in the ottoman, colombian, westphalian, malian, byzantium, and romanian rulesets while translating. See file for the details.Cheers,Joan
Index: ottoman.ruleset
===
--- ottoman.ruleset	(revision 13418)
+++ ottoman.ruleset	(working copy)
@@ -4,7 +4,7 @@
 plural=_("?plural:Ottomans")
 groups="Medieval", "Asian", "European"
 legend=_("In the beginning of the 14th century Osman, a leader of a\
- minor Turkic tribe in western Anatolia, conquered all his neigboring\
+ minor Turkic tribe in western Anatolia, conquered all his neighboring\
  tribes. A century later the Byzantine capital fell to\
  Turkic rule which gave the Ottoman empire access to Europe. The\
  Ottomans subsequently conquered large parts of south-eastern\
Index: colombian.ruleset
===
--- colombian.ruleset	(revision 13418)
+++ colombian.ruleset	(working copy)
@@ -5,7 +5,7 @@
 groups="Modern", "American"
 legend=_("Colombia is a country in northern South America. The region was\
  an Amerindian cultural center in pre-European time. The Spanish began\
- settling Colombia's north coast around 1500. In 1819 the The Republic of\
+ settling Colombia's north coast around 1500. In 1819 the Republic of\
  Colombia gained independence.")
 leader=
  "Simón Bolívar",
Index: westphalian.ruleset
===
--- westphalian.ruleset	(revision 13418)
+++ westphalian.ruleset	(working copy)
@@ -4,7 +4,7 @@
 plural=_("?plural:Westphalians")
 groups="Medieval", "European"
 legend=_("Westphalia, before becoming a Prussian province, was the western\
- region the duchy of Saxony. Present-day it consists of the Northern part of\
+ region of the duchy of Saxony. Present-day it consists of the Northern part of\
  the largest German federal state, North Rhine-Westphalia.")
 leader =
  "Widukind",
Index: malian.ruleset
===
--- malian.ruleset	(revision 13418)
+++ malian.ruleset	(working copy)
@@ -7,7 +7,7 @@
  for millennia. In medieval times, the region was home to a succession of\
  empires called the Sahelian kingdoms. Of these, the Islamic Mali empire\
  with it's capital in Timbuktu was the most influential. This empire\
- reigned from the 14th to the 17th century and was famed for it's wealth and\
+ reigned from the 14th to the 17th century and was famed for its wealth and\
  benevolent kings. The modern Republic of Mali derives its name from this\
  empire.")
 leader=
Index: byzantium.ruleset
===
--- byzantium.ruleset	(revision 13418)
+++ byzantium.ruleset	(working copy)
@@ -7,7 +7,7 @@
  Constantine moved the empire's capital to Byzantium and formed a new empire\
  mostly known as the Eastern Roman empire or the Byzantine empire. This\
  empire lasted until 1453 when its capital fell to the Ottomans. At the time\
- of Justinian I, the Byzanines controlled nearly all of Middle East, nothern\
+ of Justinian I, the Byzanines controlled nearly all of Middle East, northern\
  Africa, Italy and parts of Spain.")
 leader=
  "Justinianus I",
Index: romanian.ruleset
===
--- romanian.ruleset	(revision 13418)
+++ romanian.ruleset	(working copy)
@@ -6,7 +6,7 @@
 legend=_("Romania as a nation was formed at the beginning of the 20th\
  century, when the states of Transylvania, Wallachia, and Moldavia merged.\
  It is a country inhabited by people speaking a language reminiscent from\
- the time of ancient Rome. It's history is convoluted as it was always at\
+ the time of ancient Rome. Its history is convoluted as it was always at\
  the borders of great empires: Roman, Ottoman, Austro-Hungarian, and\
  Russian.")
 
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39638) Non i18n'd string in client/helpdata.c

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39638 >

In client/helpdata.c, line 1253 (revision 13433) (within
helptext_government()) the output variable is assigned "All", without the _(

   const char *output = "All";

As far as I've seen, in the default ruleset, this string only appears on the
help text for both Anarchy and Despotism, where it says that "each worked
tile that gives more than %d %s will suffer a -1 penalty when not
celebrating."

It's most obvious in my language, because "All" means "garlic", so the
message becomes something like "if a worked tile gives more than 2 garlic
you will get a penalty". Kinda misleading.

I'm not sure if it's just a matter of sticking the _( in front, or there are
more implications in the logic of the program.

Cheers,

Joan

In client/helpdata.c, line 1253 (revision 13433) (within helptext_government()) the output variable is assigned "All", without the _(   const char *output = "All";As far as I've seen, in the default ruleset, this string only appears on the help text for both Anarchy and Despotism, where it says that "each worked tile that gives more than %d %s will suffer a -1 penalty when not celebrating."
It's most obvious in my language, because "All" means "garlic", so the message becomes something like "if a worked tile gives more than 2 garlic you will get a penalty". Kinda misleading.
I'm not sure if it's just a matter of sticking the _( in front, or there are more implications in the logic of the program.Cheers,Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39637) Typo in server/cityturn.c

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39637 >

This transaction appears to have no content
The variable name has sneaked into the string, I think. It says "pimprove
sold!" when it should be "improvement sold". See diff.

Cheers,

Joan
The variable name has sneaked into the string, I think. It says "pimprove sold!" when it should be "improvement sold". See diff.Cheers,Joan
Index: cityturn.c
===
--- cityturn.c	(revision 13420)
+++ cityturn.c	(working copy)
@@ -1373,7 +1373,7 @@
   if (pplayer->economic.gold - upkeep < 0) {
 	notify_player(pplayer, pcity->tile, E_IMP_AUCTIONED,
 			 _("Can't afford to maintain %s in %s, "
-			   "pimprove sold!"),
+			   "improvement sold!"),
 			 improvement_name_translation(pimprove),
 			 pcity->name);
 	do_sell_building(pplayer, pcity, pimprove);
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39637) Typo in server/cityturn.c

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39637 >

2007/8/31, Marko Lindqvist <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39637 >
>
> On 31/08/2007, Egor Vyscrebentsov <[EMAIL PROTECTED]> wrote:
> >
> > On Thu, 30 Aug 2007 Joan Creus wrote:
> >
> > > The variable name has sneaked into the string, I think. It says
> "pimprove
> > > sold!" when it should be "improvement sold". See diff.
> >
> > Didn't it was decided that we need to use word 'building' instead of
> > 'improvement'? Good catch, anyway. Thank you!
>
> I'd prefer 'building' instead of 'improvement'. However, this seems
> not to be consensus, as this string has been changed recently the
> other way around. S2_1 has 'building'.
>
> > (It was said some time ago that word 'improvement' should be used for
> > tile's improvement rather than city's, that should use word 'building'.)
>
> I didn't know that; I'm rather new in the project. I only suggested
"improvement" because it's similar to the variable name, but personally, I
like "building" better. Improvement is too vague.

Joan

2007/8/31, Marko Lindqvist <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=39637
 >On 31/08/2007, Egor Vyscrebentsov <[EMAIL PROTECTED]> wrote:>> On Thu, 30 Aug 2007 Joan Creus wrote:>> > The variable name has sneaked into the string, I think. It says "pimprove
> > sold!" when it should be "improvement sold". See diff.>> Didn't it was decided that we need to use word 'building' instead of> 'improvement'? Good catch, anyway. Thank you!
I'd prefer 'building' instead of 'improvement'. However, this seemsnot to be consensus, as this string has been changed recently theother way around. S2_1 has 'building'.
> (It was said some time ago that word 'improvement' should be used for> tile's improvement rather than city's, that should use word 'building'.)
I didn't know that; I'm rather new in the project. I only suggested "improvement" because it's similar to the variable name, but personally, I like "building" better. Improvement is too vague.

 
Joan 
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39638) Non i18n'd string in client/helpdata.c

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39638 >

The way I have translated these strings might help. I have adapted the
sentence to read:

"Each worked tile with at least 1 point of  %s will yield ..."

Then "All" might become "all kinds of output", or "any output", or something
similar, and it would fit in all the sentences Marko has dug up. Of course,
some translator comments would be essential for us translators to make it
fit in the sentences.

Some sentences should be modified, too; anyway, "All production will suffer
massive waste" is misleading, if it refers to both trade and shields
(perhaps also food?). Maybe just removing "production" will do the trick:

"each worked tile with at least 1 point of  'any output' will yield..."
"any output" "will suffer massive waste"
"any output" "waste will increase ..."

What do you think?

Joan

2007/8/31, Marko Lindqvist <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39638 >
>
> On 31/08/2007, Daniel Markstedt <[EMAIL PROTECTED]> wrote:
> >
> >
> > The sentence produced by this string is awful even in its raw English
> form:
> >
> >  * Each worked tile that gives more than 2 All will suffer a -1
> > penalty when not celebrating.
> >
> > Wouldn't it make more sense to replace 'All' with something like 'of
> > any output'?
>
> ...with some code changes and additional strings. It is currently
> used in sentences:
>
> "Each worked tile that gives more than %d  will suffer a -1
> penalty when not celebrating."
> "Each worked tile with at least 1  will yield %d additional 
> when celebrating."
> "Each worked tile with at least 1  will yield %d additional ."
> " production will suffer massive waste."
> " production will suffer some waste."
> " production will suffer a small amount of waste."
> " waste will increase quickly with distance from capital."
> " waste will increase with distance from capital."
> " waste will increase slowly with distance from capital."
>
> Following sentences also use 'output', but they should only appear if
> there
> is some real output type (and not with "All"):
> "You pay %d times normal  upkeep for your units."
> "Each of your cities will avoid paying %d  towards unit upkeep."
>
>
> This help generation function is very broken considering alternative
> rulesets (not only that it lacks information, but it also produces
> misinformation in some cases)
>
>
> - ML
>
>
>

The way I have translated these strings might help. I have adapted the sentence to read:
 
"Each worked tile with at least 1 point of  %s will yield ..." 
Then "All" might become "all kinds of output", or "any output", or something similar, and it would fit in all the sentences Marko has dug up. Of course, some translator comments would be essential for us translators to make it fit in the sentences.

 
Some sentences should be modified, too; anyway, "All production will suffer massive waste" is misleading, if it refers to both trade and shields (perhaps also food?). Maybe just removing "production" will do the trick:

 
"each worked tile with at least 1 point of  'any output' will yield..."
"any output" "will suffer massive waste"
"any output" "waste will increase ..."
 
What do you think?
Joan
 
2007/8/31, Marko Lindqvist <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=39638
 >On 31/08/2007, Daniel Markstedt <[EMAIL PROTECTED]> wrote:>>> The sentence produced by this string is awful even in its raw English form:
>>  * Each worked tile that gives more than 2 All will suffer a -1> penalty when not celebrating.>> Wouldn't it make more sense to replace 'All' with something like 'of
> any output'?...with some code changes and additional strings. It is currentlyused in sentences:"Each worked tile that gives more than %d  will suffer a -1penalty when not celebrating."
"Each worked tile with at least 1  will yield %d additional when celebrating.""Each worked tile with at least 1  will yield %d additional ."" production will suffer massive waste."
" production will suffer some waste."" production will suffer a small amount of waste."" waste will increase quickly with distance from capital."
" waste will increase with distance from capital."" waste will increase slowly with distance from capital."Following sentences also use 'output', but they should only appear if there
is some real output type (and not with "All"):"You pay %d times normal  upkeep for your units.""Each of your cities will avoid paying %d  towards unit upkeep."
This help generation function is very broken considering alternativerulesets (not only that it lacks information, but it also producesmisinformation in some cases)- ML

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39638) Non i18n'd string in client/helpdata.c

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39638 >

2007/8/31, Marko Lindqvist <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39638 >
>
> On 31/08/2007, Joan Creus <[EMAIL PROTECTED]> wrote:
> > The way I have translated these strings might help. I have adapted the
> > sentence to read:
> >
> > "Each worked tile with at least 1 point of  %s will yield ..."
> >
> > Then "All" might become "all kinds of output", or "any output", or
> something
> > similar, and it would fit in all the sentences Marko has dug up. Of
> course,
> > some translator comments would be essential for us translators to make
> it
> > fit in the sentences.
>
> Those sentences where it appears twice, are problematic:
> "... at least 1 point of any output, will yield 2 additional points of
> any output"
> should be
> "... at least 1 point of any output, will yield 2 additional points of
> that output"
>
> And it would be good if we could avoid using such internal concepts
> as 'output' in end-user help.
>
How about generating list of output types currently in use? That
> would turn out something like "food, trade or shields".
> and some example sentences (some using that list, some with specific
> output):


You have a point here. After all, this is the help system. The more info we
give, and the less ambiguous, the better. I don't like "production" (I tend
to think of production as synonymous with shields), and "output" is only
slightly better. Definitely, listing the three items is best.

"... at least 1 point of 'food, trade or shields', will yield 2
> additional points of it."
> "... at least 1 point of 'food', will yield 2 additional points of it."
>
> Or do we need two lists? 'or' -list and 'and' -list.
>
> "You pay 2 times normal 'food, trade and shields' upkeep for your units."
> "You pay 2 times normal 'food' upkeep for your units."


But I thought upkeep was only paid  with  shields, isn't it? Apart for the
food for Settlers, of course. Perhaps your are thinking of alternate
rulesets where upkeep may be paid with everything? Anyway, implementing an
and-list and an or-list shouldn't be too hard, and it pays off with more
natural sentences.


> Some sentences should be modified, too; anyway, "All production will
> suffer
> > massive waste" is misleading, if it refers to both trade and shields
> > (perhaps also food?). Maybe just removing "production" will do the
> trick:
>
> "'food, trade and shields' production will suffer massive waste"
> "'food' production will suffer massive waste"


Yes, this way it gets clear, and the word "production" fits just fine.

Joan

2007/8/31, Marko Lindqvist <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=39638 >On 31/08/2007, Joan Creus <[EMAIL PROTECTED]
> wrote:> The way I have translated these strings might help. I have adapted the> sentence to read:>> "Each worked tile with at least 1 point of  %s will yield ...">
> Then "All" might become "all kinds of output", or "any output", or something> similar, and it would fit in all the sentences Marko has dug up. Of course,> some translator comments would be essential for us translators to make it
> fit in the sentences. Those sentences where it appears twice, are problematic:"... at least 1 point of any output, will yield 2 additional points ofany output"should be"... at least 1 point of any output, will yield 2 additional points of
that output" And it would be good if we could avoid using such internal conceptsas 'output' in end-user help. 
 How about generating list of output types currently in use? Thatwould turn out something like "food, trade or shields". and some example sentences (some using that list, some with specific output):
You have a point here. After all, this is the help system. The more info we give, and the less ambiguous, the better. I don't like "production" (I tend to think of production as synonymous with shields), and "output" is only slightly better. Definitely, listing the three items is best.
"... at least 1 point of 'food, trade or shields', will yield 2
additional points of it.""... at least 1 point of 'food', will yield 2 additional points of it." Or do we need two lists? 'or' -list and 'and' -list."You pay 2 times normal 'food, trade and shields' upkeep for your units."
"You 

Re: [Freeciv-Dev] (PR#39638) Non i18n'd string in client/helpdata.c

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39638 >

I'm impressed. I said it didn't look hard, but, seeing the result, I've
changed my mind.

The help information is much better now. Just to nitpick, I think the
sentences like:

Each worked tile with at least 1 Trade will yield 1 more it.

should be

Each worked tile with at least 1 Trade will yield 1 more of it.

Thanks a lot,

Joan

2007/9/1, Marko Lindqvist <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39638 >
>
> On 01/09/2007, Marko Lindqvist  wrote>
> >
> > On 31/08/2007, Joan Creus  wrote:
> > >
> > > Anyway, implementing an
> > > and-list and an or-list shouldn't be too hard, and it pays off with
> more
> > > natural sentences.
> >
> >  Attached patch does that. It also makes help a bit more complete and
> > fixes some logical errors.
>
> TRUNK version.
>
>
> - ML
>
>
>

I'm impressed. I said it didn't look hard, but, seeing the result, I've changed my mind.The help information is much better now. Just to nitpick, I think the sentences like:Each worked tile with at least 1 Trade will yield 1 more it.
should beEach worked tile with at least 1 Trade will yield 1 more of it.Thanks a lot,Joan2007/9/1, Marko Lindqvist <
[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=39638 >On 01/09/2007, Marko Lindqvist  wrote>>> On 31/08/2007, Joan Creus  wrote:> >> > Anyway, implementing an> > and-list and an or-list shouldn't be too hard, and it pays off with more
> > natural sentences.>>  Attached patch does that. It also makes help a bit more complete and> fixes some logical errors. TRUNK version. - ML

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39651) More typos in nation rulesets

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39651 >

This transaction appears to have no content
I have found several nation rulesets where the "groups" directive has its
strings marked for translation (like _("Asian")). I don't think they should
be.

Plus, in australian.ruleset, there is Victora instead of Victoria.

Joan
I have found several nation rulesets where the "groups" directive has its strings marked for translation (like _("Asian")). I don't think they should be.Plus, in australian.ruleset, there is Victora instead of Victoria.
Joan
Index: azeri.ruleset
===
--- azeri.ruleset	(revision 13450)
+++ azeri.ruleset	(working copy)
@@ -2,7 +2,7 @@
 
 name=_("Azeri")
 plural=_("?plural:Azeris")
-groups=_("Modern"), _("Asian")
+groups="Modern", "Asian"
 legend=_("The Azeris are the people of Azerbaijan. The territory\
  of modern Azerbaijan was the scene of rises and falls of different\
  ancient states of the Caucasus region. In 1813 Azerbaijan became\
Index: syrian.ruleset
===
--- syrian.ruleset	(revision 13450)
+++ syrian.ruleset	(working copy)
@@ -2,7 +2,7 @@
 
 name=_("Syrian")
 plural=_("?plural:Syrians")
-groups=_("Modern"), _("Asian")
+groups="Modern", "Asian"
 legend=_("The modern Syrian Arab Republic was formed from a French mandate\
  and gradually gained independence during the 1940s.")
 leader=
Index: dominican.ruleset
===
--- dominican.ruleset	(revision 13450)
+++ dominican.ruleset	(working copy)
@@ -2,7 +2,7 @@
 
 name=_("Dominican")
 plural=_("?plural:Dominican")
-groups=_("Modern"), _("American")
+groups="Modern", "American"
 legend=_("The island of Dominica was first sighted by Europeans, including\
  Christopher Columbus, in 1493. Legend has it that the island was named so\
  since the day of its first sighting was a Sunday. Officially the\
Index: un.ruleset
===
--- un.ruleset	(revision 13450)
+++ un.ruleset	(working copy)
@@ -2,7 +2,7 @@
 
 name=_("UN")
 plural=_("?plural:UN")
-groups=_("Fictional")
+groups="Fictional"
 legend=_("The United Nations believe in human rights and the protection of\
  the weak.")
 leader=
Index: pakistani.ruleset
===
--- pakistani.ruleset	(revision 13450)
+++ pakistani.ruleset	(working copy)
@@ -2,7 +2,7 @@
 
 name=_("Pakistani")
 plural=_("?plural:Pakistanis")
-groups=_("Modern"), _("Asian")
+groups="Modern", "Asian"
 legend=_("The Federation of Pakistan was formed from the\
  predominantly Muslim regions of British India in 1947.")
 
Index: peruvian.ruleset
===
--- peruvian.ruleset	(revision 13450)
+++ peruvian.ruleset	(working copy)
@@ -2,7 +2,7 @@
 
 name=_("Peruvian")
 plural=_("?plural:Peruvians")
-groups=_("Modern"), _("American")
+groups="Modern", "American"
 legend=_("Peru was the cradle of the Inca Empire and civilization. It is\
  still today a major center of indigenous South American culture.")
 leader=
Index: australian.ruleset
===
--- australian.ruleset	(revision 13450)
+++ australian.ruleset	(working copy)
@@ -4,7 +4,7 @@
 plural=_("?plural:Australians")
 groups="Modern", "Oceanian"
 legend=_("Australia was founded as a British penal colony in 1788AD.\
- Originally comprising of several colonies (New South Wales, Victora,\
+ Originally comprising of several colonies (New South Wales, Victoria,\
  Queensland, South Australia, Western Australia and Tasmania) it\
  became a single country in 1902.\
  It is the only country on earth to occupy an entire continent.")
Index: rwandan.ruleset
===
--- rwandan.ruleset	(revision 13450)
+++ rwandan.ruleset	(working copy)
@@ -2,7 +2,7 @@
 
 name=_("Rwandan")
 plural=_("?plural:Rwandans")
-groups=_("Modern"), _("African")
+groups="Modern", "African"
 legend=_("Rwanda is a hilly and very fertile country in the Great Lakes\
  region of eastern Africa. It supports the densest population of\
  the continent.")
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39684) Update to catalan.ruleset

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39684 >

This transaction appears to have no content
I have updated the catalan.ruleset, since the current legend is way too
uninformative. I have also added a couple (dead) leaders, added a few
cities, corrected some typos in city names, and added several terrain tags
to cities.

In order to write the legend, I have refreshed my history lessons with the
following articles from Wikipedia:

http://en.wikipedia.org/wiki/Crown_of_Aragon
http://en.wikipedia.org/wiki/War_of_the_Spanish_Succession

Joan
I have updated the catalan.ruleset, since the current legend is way too uninformative. I have also added a couple (dead) leaders, added a few cities, corrected some typos in city names, and added several terrain tags to cities.
In order to write the legend, I have refreshed my history lessons with the following articles from Wikipedia:http://en.wikipedia.org/wiki/Crown_of_Aragon
http://en.wikipedia.org/wiki/War_of_the_Spanish_SuccessionJoan
Index: catalan.ruleset
===
--- catalan.ruleset	(revision 13524)
+++ catalan.ruleset	(working copy)
@@ -3,17 +3,25 @@
 name=_("Catalan")
 plural=_("?plural:Catalans")
 groups="Medieval", "European"
-legend=_("Catalunya (aka Catalonia in English) is the north-eastern-most\
- coastal region of Spain near the southern foot of the Pyrenees.")
+legend=_("During the Middle Ages, Catalan kings conquered and presided over several \
+kingdoms on the shores of the Mediterranean Sea, from the Iberian peninsula to \
+parts of Italy and Greece. This confederation/empire became a major \
+naval and trading power in the Mediterranean area. Catalans kept their self-rule \
+after a dynastic union with the neighboring kingdom of Castile, and sided with \
+England and Austria against France and Castile in the Spanish Succession War. \
+In 1713, England signed the Treaty of Utrecht and dropped out of the alliance, and \
+Catalans were finally defeated in 1714, losing their national rights as a result.")
 leader=
  "Guifré el Pilós",
  "Ramon Berenguer IV",
  "Jaume I",
  "Pere II",
+ "Pau Claris",
+ "Francesc Macià",
  "Lluis Companys",
  "Josep Tarradellas"
 leader_sex="Male", "Male", "Male", "Male",
-   "Male", "Male"
+   "Male", "Male", "Male", "Male"
 flag="catalan"
 flag_alt = "-"
 city_style = "Classical"
@@ -28,6 +36,7 @@
  "Fundamentalism",  _("Arquebisbe"),   _("Gran Bruixa")
}
 
+
 init_techs=""
 init_buildings=""
 
@@ -39,22 +48,22 @@
 ; but rather to the "Països Catalans" of modern ethnolinguistic
 ; nationalists.
 cities =
-  "Barcelona", "Tarragona", "Lleida", "Girona", "Perpinyà", "Valencia",
+  "Barcelona", "Tarragona", "Lleida (!ocean)", "Girona", "Perpinyà", "València",
   "Tolosa", "Ripoll", "Vic", "La Seu d'Urgell", "Cardona", "Tortosa",
   "Montserrat (hills)", "Poblet", "Santes Creus",
   "Vallbona de les Monges", "Balaguer", "Manresa", "Terrassa",
-  "Sabadell", "Palma de Mallorca", "Eivissa", "Alacant", "Elx",
+  "Sabadell", "Palma de Mallorca (ocean)", "Eivissa", "Alacant", "Elx",
   "Castelló de la Plana", "Montblanc (hills)", "Igualada", "Cervera",
   "Berga", "Dénia", "Reus", "Granollers", "Mataró", "Figueres", "Olot",
-  "Badalona", "Tàrrega", "Amposta", "El Bruc", "Valls",
-  "Vilafranca del Penedés", "Manacor", "Alcúdia", "Sóller", "Artà",
-  "Llucmajor", "Felanitx", "Andratx", "Ciutadella", "Penyiscola",
-  "Sitges", "Vilanova i la Geltrú", "Viella", "L'Alguer", "Perelló",
+  "Badalona", "Tàrrega", "Amposta", "El Bruc", "Valls", "Sant Fruitós",
+  "Vilafranca del Penedès", "Manacor", "Alcúdia", "Sóller", "Artà",
+  "Llucmajor", "Felanitx", "Andratx", "Ciutadella", "Penyíscola", "Guardiola",
+  "Sitges", "Vilanova i la Geltrú", "Viella (hills)", "L'Alguer", "Perelló",
   "Torelló", "Sant Cugat", "Portbou (ocean)", "Palafrugell", "Manlleu",
   "Sallent", "Puigcerdà", "Bellver", "Sant Boi de Llobregat",
   "Vandellós", "Cornellà", "Tremp", "Palamós", "El Vendrell",
   "Sant Feliu de Guíxols", "Sant Celoni", "Martorell", "L'Hospitalet",
-  "Mollet del Vallès", "Banyoles", "Blanes", "Lloret de mar (ocean)",
+  "Mollet del Vallès", "Banyoles", "Blanes (ocean)", "Lloret de mar (ocean)",
   "Malgrat de mar (ocean)", "Canet de mar (ocean)", "Molins de Rei",
-  "Pons", "Súria", "Llívia", "La Bisbal d'Empurdà", "Prada", "Elna",
+  "Pons", "Súria", "Llívia", "La Bisbal d'Empordà", "Prada", "Elna",
   "Ceret", "Cadaqués", "Begur", "Olesa de Montserrat (hills)"
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39687) Typos in nation rulesets

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39687 >

This transaction appears to have no content
I think I have found a few typos in several nations; check them out,
particularly two that are in proper nouns, one in khwarezmian and the other
in breton.ruleset

Joan
I think I have found a few typos in several nations; check them out, particularly two that are in proper nouns, one in khwarezmian and the other in breton.rulesetJoan
Index: phoenician.ruleset
===
--- phoenician.ruleset	(revision 13524)
+++ phoenician.ruleset	(working copy)
@@ -7,9 +7,9 @@
  coastal regions of Lebanon and Syria.  They spoke a Canaanite language\
  related to Hebrew and were famed mariners.  Their alphabet served as the\
  source of the Greek alphabet, and from there evolved into the Etruscan\
- and Latin alphabets as well.  The Greeks and Romans new them for their\
+ and Latin alphabets as well.  The Greeks and Romans knew them for their\
  manufacture of purple dye from the myrex shell, which gave them their\
- Greek and Latin names.  They refered to themselves a Kan'ani and thier\
+ Greek and Latin names.  They refered to themselves a Kan'ani and their\
  Punic (Carthaginian) descendents in St. Augustine's day called themselves\
  Chanani.")
 leader=
Index: chola.ruleset
===
--- chola.ruleset	(revision 13524)
+++ chola.ruleset	(working copy)
@@ -4,7 +4,7 @@
 plural=_("?plural:Cholas")
 groups="Asian", "Ancient"
 
-legend=_("The Cholas were a Tamil dynasty in centered in southern India and\
+legend=_("The Cholas were a Tamil dynasty centered in southern India and\
  were rare in their level of influence in northern India. They began as a\
  tributary state to the Pallavas, but in the 9th century their power began\
  to grow. During the 11th century, they lead expeditions against other\
Index: laotian.ruleset
===
--- laotian.ruleset	(revision 13524)
+++ laotian.ruleset	(working copy)
@@ -9,7 +9,7 @@
  century, Laos became part of French Indochina.\
  French rule ended with independence in 1946 followed\
  by 30 years of civil war. In 1975 the communist Pathet\
- Lao established strict solicalist regime. However,\
+ Lao established a strict socialist regime. However,\
  in 1986 the liberalization and a gradual return to\
  private enterpise started.")
 
Index: khwarezmian.ruleset
===
--- khwarezmian.ruleset	(revision 13524)
+++ khwarezmian.ruleset	(working copy)
@@ -9,8 +9,8 @@
  controlling portions of the Silk Road. It was loosely controlled as a\
  satrapy under the Achaemenid and Sassanid Persian dynasties and was mythic\
  homeland of Zarathustra, the founder of Zoroastrianism. Following the\
- introduction of Islam, Khwarezm tended to be devided into two seperate\
- kingdoms, but was united under the Turkic Anushtegihidy dynasty, which\
+ introduction of Islam, Khwarezm tended to be divided into two separate\
+ kingdoms, but was united under the Turkic Anushtiginid dynasty, which\
  lasted from 1097 until Chinggis Khan conquered it in 1231.")
 
 leader=
Index: kurd.ruleset
===
--- kurd.ruleset	(revision 13524)
+++ kurd.ruleset	(working copy)
@@ -2,7 +2,7 @@
 
 name=_("Kurdish")
 plural=_("?plural:Kurds")
-groups=_("Asian"), _("Medieval")
+groups="Asian", "Medieval"
 legend=_("The Kurds are a distinct ethno-linguistic group speaking an\
  Indo-Aryan language. Their traditional homeland Kurdistan is situated in\
  northern Middle East and partitioned between Iraq, Turkey, Syria, and\
Index: breton.ruleset
===
--- breton.ruleset	(revision 13524)
+++ breton.ruleset	(working copy)
@@ -3,8 +3,8 @@
 name=_("Breton")
 plural=_("?plural:Bretons")
 groups="Medieval", "European"
-legend=_("Known to the Romans as Amorica, Brittany has been Celtic speaking\
- for many centuries before Britons arrive in the peninsula a mercenaries,\
+legend=_("Known to the Romans as Armorica, Brittany had been Celtic speaking\
+ for many centuries before Britons arrived in the peninsula as mercenaries,\
  colonists and refugees in response to the chaos in Gaul and the invasion\
  of Britain by Germanic tribes in the fifth century CE. Over the centuries,\
  use of the Breton language has been pushed towards the west of the\
Index: kongo.ruleset
===
--- kongo.ruleset	(revision 13524)
+++ kongo.ruleset	(working copy)
@@ -6,7 +6,7 @@
 
 legend=_("This Kingdom, lasting from roughly 1400 CE until the late 19th\
  century, existed in the present-day countries of Angola and the Democratic\
- Republic of the Congo. Soon after its formation, Portuguese exlporers,\
+ Republic of the Congo. Soon after its formation, Portug

[Freeciv-Dev] (PR#39688) Typo in galleon description

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39688 >

This transaction appears to have no content
The description of the galleon unit in data/default/units.ruleset has a
typo, I believe:

Joan
The description of the galleon unit in data/default/units.ruleset has a typo, I believe:Joan
Index: units.ruleset
===
--- units.ruleset	(revision 13524)
+++ units.ruleset	(working copy)
@@ -1372,7 +1372,7 @@
 roles = "Ferryboat", "BarbarianBoat"
 helptext  = _("\
 The Galleon is a pure transport ship and cannot\
- attack other ships, though is may still defend\
+ attack other ships, though it may still defend\
  itself when attacked.\
 ")
 
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39689) Correction in civ2 governments

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39689 >

This transaction appears to have no content
I'm not sure it is necessary at all, but the Fundamentalism description in
data/civ2/governments.ruleset has a grammar problem. Since it is there, we
might as well fix it.
I'm not sure it is necessary at all, but the Fundamentalism description in data/civ2/governments.ruleset has a grammar problem. Since it is there, we might as well fix it.
Index: governments.ruleset
===
--- governments.ruleset	(revision 13532)
+++ governments.ruleset	(working copy)
@@ -153,8 +153,8 @@
  devoted to their beliefs, and are usually willing to die to\
  preserve them.\
 \n\n\
-Improvement that normally convert unhappy citizens to content\
- citizens, produces `tithes' (gold) equivalent to the number\
+Improvements that normally convert unhappy citizens to content\
+ citizens, produce `tithes' (gold) equivalent to the number\
  of people they would convert, and require no maintenance.\
 ")
 
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39687) Typos in nation rulesets

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39687 >

You are right. It sounded strange to me, and I looked it up, but I didn't
find the third meaning that says: grow worse; "Her condition
deteriorated".Yep, devolve is fine.

Joan


2007/9/8, Daniel Markstedt <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39687 >
>
> On 9/8/07, Joan Creus <[EMAIL PROTECTED]> wrote:
> >
> > http://bugs.freeciv.org/Ticket/Display.html?id=39687
> > >
> >
> > This transaction appears to have no content
> >
> > I think I have found a few typos in several nations; check them out,
> > particularly two that are in proper nouns, one in khwarezmian and the
> other
> > in breton.ruleset
> >
> > Joan
> >
>
> They look like good fixes. Except one in purhepecha.ruleset - I do
> think "devolved into violence" is proper English.
>
> ~Daniel
>
>
>

You are right. It sounded strange to me, and I looked it up, but I didn't find the third meaning that says: grow worse; "Her condition deteriorated".
 Yep, devolve is fine.Joan2007/9/8, Daniel Markstedt <
[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=39687 >On 9/8/07, Joan Creus <[EMAIL PROTECTED]> wrote:>> 
http://bugs.freeciv.org/Ticket/Display.html?id=39687> >>> This transaction appears to have no content>> I think I have found a few typos in several nations; check them out,> particularly two that are in proper nouns, one in khwarezmian and the other
> in breton.ruleset>> Joan>They look like good fixes. Except one in purhepecha.ruleset - I dothink "devolved into violence" is proper English. ~Daniel

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39723) Typo in server/settings.c

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39723 >

This transaction appears to have no content
I have found a small typo in server/settings.c. It says investiged instead
of investigated.

Patch attached.

Joan
I have found a small typo in server/settings.c. It says investiged instead of investigated.Patch attached.Joan
Index: settings.c
===
--- settings.c	(revision 13643)
+++ settings.c	(working copy)
@@ -403,7 +403,7 @@
 	  N_("Amount of huts (minor tribe villages)"),
 	  N_("This setting gives the exact number of huts that will be "
 	 "placed on the entire map. Huts are small tribal villages "
-	 "that may be investiged by units."), NULL,
+	 "that may be investigated by units."), NULL,
 	  MAP_MIN_HUTS, MAP_MAX_HUTS, MAP_DEFAULT_HUTS)
 
   /* Options affecting numbers of players and AI players.  These only
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39724) Typos in server/settings.c

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39724 >

This transaction appears to have no content
Excuse me; there were two more typos in server/settings.c. Please ignore my
former report. This is the good one.

-- Forwarded message --
From: Joan Creus <[EMAIL PROTECTED]>
Date: 25/09/2007 22:17
Subject: Typo in server/settings.c
To: [EMAIL PROTECTED]

I have found a small typo in server/settings.c. It says investiged instead
of investigated.

Patch attached.

Joan
Excuse me; there were two more typos in server/settings.c. Please ignore my former report. This is the good one.-- Forwarded message --From: 
Joan Creus <[EMAIL PROTECTED]>Date: 25/09/2007 22:17Subject: Typo in server/settings.cTo: [EMAIL PROTECTED]
I have found a small typo in server/settings.c. It says investiged instead of investigated.Patch attached.Joan
Index: settings.c
===
--- settings.c	(revision 13643)
+++ settings.c	(working copy)
@@ -403,7 +403,7 @@
 	  N_("Amount of huts (minor tribe villages)"),
 	  N_("This setting gives the exact number of huts that will be "
 	 "placed on the entire map. Huts are small tribal villages "
-	 "that may be investiged by units."), NULL,
+	 "that may be investigated by units."), NULL,
 	  MAP_MIN_HUTS, MAP_MAX_HUTS, MAP_DEFAULT_HUTS)
 
   /* Options affecting numbers of players and AI players.  These only
@@ -508,7 +508,7 @@
 	  SSET_RULES, SSET_SCIENCE, SSET_RARE, SSET_TO_CLIENT,
 	  N_("Penalty when getting tech or gold from treaty"),
 	  N_("For each technology you gain from a diplomatic treaty, you "
-	 "lost research points equal to this percentage of the cost to "
+	 "lose research points equal to this percentage of the cost to "
 	 "research a new technology. You can end up with negative "
 	 "research points if this is non-zero. Also applies to gold "
  "transfers in diplomatic treaties."), NULL,
@@ -547,7 +547,7 @@
 
   GEN_INT("aqueductloss", game.info.aqueductloss,
 	  SSET_RULES, SSET_ECONOMICS, SSET_RARE, SSET_TO_CLIENT,
-	  N_("Percentage food lost when need aqueduct"),
+	  N_("Percentage food lost when aqueduct needed"),
 	  N_("If a city would expand, but it can't because it needs "
 	 "an Aqueduct (or Sewer System), it loses this percentage "
 	 "of its foodbox (or half that amount if it has a "
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39725) Two small typos in client

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39725 >

This transaction appears to have no content
Two more small typos in debug messages for the client

Joan
Two more small typos in debug messages for the clientJoan
Index: gui-sdl/gui_string.c
===
--- gui-sdl/gui_string.c	(revision 13643)
+++ gui-sdl/gui_string.c	(working copy)
@@ -279,7 +279,7 @@
 freelog(LOG_DEBUG,
 _("SDL_create_str16_surf: Font is generally %d big, and "
   "string is %hd big"), TTF_FontHeight(pString->font), pText->h);
-freelog(LOG_DEBUG, _("SDL_create_str16_surf: String is %d lenght"),
+freelog(LOG_DEBUG, _("SDL_create_str16_surf: String is %d length"),
 pText->w);
   } else {
 freelog(LOG_DEBUG, "SDL_create_str16_surf: pText NULL");
Index: audio.c
===
--- audio.c	(revision 13643)
+++ audio.c	(working copy)
@@ -256,7 +256,7 @@
   freelog(LOG_ERROR,
 _("No real audio subsystem managed to initialize!"));
   freelog(LOG_ERROR,
-_("Perhaps there is some misconfigurationg or bad permissions"));
+_("Perhaps there is some misconfiguration or bad permissions"));
   freelog(LOG_NORMAL, _("Proceeding with sound support disabled"));
 }
 
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39726) Typo in helpdata.txt

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39726 >

This transaction appears to have no content
One small typo: fist for first

Joan
One small typo: fist for firstJoan
Index: helpdata.txt
===
--- helpdata.txt	(revision 13643)
+++ helpdata.txt	(working copy)
@@ -780,7 +780,7 @@
 Cease-fire, Armistice, Peace, and Alliance. The first is the default state, \
 while the others can be achieved by signing diplomatic treaties.\
 "), _("\
- To have a diplomatic relationship with another player, you must fist \
+ To have a diplomatic relationship with another player, you must first \
 establish first contact with that player. To establish first contact, you \
 have to move one of your units next to a city or unit belonging to that \
 player, or vice versa. Unless you establish an embassy with that player, \
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39726) Typo in helpdata.txt

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39726 >

2007/9/26, Egor Vyscrebentsov <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39726 >
>
> On Tue, 25 Sep 2007 13:51:16 -0700 Joan Creus wrote:
>
> >+ To have a diplomatic relationship with another player, you must
> first \
> > establish first contact with that player. To establish first contact,
> you \
>
> This sentence has two words "first" near each other. Could it be changed?


 Three, if you count the next sentence. It sounds awful, indeed. Not being a
native English speaker myself, I just corrected the obvious typo. But let's
try to rephrase it somehow. How about:

Before entering a diplomatic relationship with another player, you must
first meet that player. To establish first contact, ...

Feel free to change the wording if it sounds awkward to you.

Joan

 
2007/9/26, Egor Vyscrebentsov <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=39726
 >On Tue, 25 Sep 2007 13:51:16 -0700 Joan Creus wrote:>+ To have a diplomatic relationship with another player, you must first \> establish first contact with that player. To establish first contact, you \
This sentence has two words "first" near each other. Could it be changed?
 

Three, if you count the next sentence. It sounds awful, indeed. Not being a native English speaker myself, I just corrected the obvious typo. But let's try to rephrase it somehow. How about:
 
Before entering a diplomatic relationship with another player, you must first meet that player. To establish first contact, ...
 
Feel free to change the wording if it sounds awkward to you.
 
Joan 
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39758) Monarchies in the New World

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39758 >

The legend for the Brazilian nation states that:

It is the only country in the New World that has been the seat of a
monarchy.

At least Mexico has also been a monarchy, and it should count as New World;
you can check it in http://en.wikipedia.org/wiki/Mexican_Empire

Cheers,

  Joan

The legend for the Brazilian nation states that:It is the only country in the New World that has been the seat of a monarchy.At least Mexico has also been a monarchy, and it should count as New World; you can check it in 
http://en.wikipedia.org/wiki/Mexican_EmpireCheers,  Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39760) Correction to korean.ruleset

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39760 >

This transaction appears to have no content
The "was" should be "were", I think.

Joan
The "was" should be "were", I think.Joan
Index: korean.ruleset
===
--- korean.ruleset	(revision 13692)
+++ korean.ruleset	(working copy)
@@ -5,7 +5,7 @@
 groups="Ancient", "Medieval", "Asian"
 legend=_("According to legend, the first Korean kingdom was founded in\
  prehistory by the ancestral Tangun in southern Manchuria. The Korean\
- kingdoms was united in 668 by king Munmu. Today the Korean peninsula is\
+ kingdoms were united in 668 by king Munmu. Today the Korean peninsula is\
  divided into two states, North and South Korea as a result of the stalemate\
  after the Korean war in 1953.")
 leader=
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39407) Bug in autogen.sh

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39407 >

> Just tried with S2_2 and it seems to work here. Only an S2_0 problem?
>
> ~Daniel
>


Not even that. I have tested a fresh install on both S2_0 and S2_1 and both
work now. Last time I tried (about a month ago), it still didn't work, but
now there is a "cp ./no.po nb.po" statement when you do a "make" in the po
directory.

I think we can close the issue.

Joan

Just tried with S2_2 and it seems to work here. Only an S2_0 problem? ~Daniel
Not even that. I have tested a fresh install on both S2_0 and S2_1 and both work now. Last time I tried (about a month ago), it still didn't work, but now there is a "cp ./no.po nb.po
" statement when you do a "make" in the po directory.I think we can close the issue.Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39776) Typos in README, and a new translation

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39776 >

This transaction appears to have no content
I have found a couple of minor typos in the README file, and I also have a
question about its content:

In the Mailing lists subsection, on freeciv-announce, it says
"(Announcements sent to this are also sent to freeciv.)" What does this
mean? "all the other freeciv mailing lists?" or a particular one?

And finally, can someone create a "doc/ca" subdirectory, and add the
README.ca file?

Joan
I have found a couple of minor typos in the README file, and I also have a question about its content:In the Mailing lists subsection, on freeciv-announce, it says "(Announcements sent to this are also sent to freeciv.)" What does this mean? "all the other freeciv mailing lists?" or a particular one?
And finally, can someone create a "doc/ca" subdirectory, and add the README.ca file?Joan
Index: README
===
--- README	(revision 13717)
+++ README	(working copy)
@@ -148,7 +148,7 @@
   |  % civclient
 
   This assumes the server is running on the same machine.  If not, you
-  can either specify it on the command use with the '--server' option,
+  can either specify it on the command line with the '--server' option,
   or enter it into the first dialog box once the client starts.
 
   For example, suppose the server is running on a different machine
@@ -259,8 +259,8 @@
 Playing the game:
 =
 
-The game may be saved the game at any time using the 'save' server
-command, like so:
+The game may be saved at any time using the 'save' server command,
+like so:
 
   |  > save mygame.sav
 


README.ca
Description: Binary data
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39788) Incomplete building translations?

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39788 >

I have a weird effect in my 2.1.0rc1: some strings in the online help are
not translated. They certainly are in the .po file, and everything looks
good there, but in the running game, clicking Help - Buildings, some of them
are in English instead of Catalan (my locale).

To be specific, the translations that are missing are the ones in Power
Plants (Power, Hydro and Nuclear), the Offshore Platform and the Harbor, as
well as all the "Requires the xx technology", "Requires: Nothing" or the
"Requires the xx bulding" strings.

I'm using the procedure at the bottom of the
gettext-guideto test,
and perhaps it's just some weirdness in my installation, but I'd
like someone else with a localized version to check if he or she is having
the same kind of problem.

Thanks everyone,

 Joan

I have a weird effect in my 2.1.0rc1: some strings in the online help are not translated. They certainly are in the .po file, and everything looks good there, but in the running game, clicking Help - Buildings, some of them are in English instead of Catalan (my locale).
To be specific, the translations that are missing are the ones in Power Plants (Power, Hydro and Nuclear), the Offshore Platform and the Harbor, as well as all the "Requires the xx technology", "Requires: Nothing" or the "Requires the xx bulding" strings.
I'm using the procedure at the bottom of the gettext-guide to test, and perhaps it's just some weirdness in my installation, but I'd like someone else with a localized version to check if he or she is having the same kind of problem.
Thanks everyone, Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39831) Training and combat

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39831 >

This transaction appears to have no content
Hi,

When I started playing Freeciv, the sentence in the documentation that
puzzled me most was "May become veteran through training or combat". Combat
was clear, but I kept looking for ways to train my units *after* they had
been built. Laugh at me if you want, but it took me a while to figure out
that the training was supposed to take place in the Barracks while the units
were built.

So I have written a small modification to helpdata.c to improve this
sentence:

- for terrestrial units, it will show: "May become veteran through combat or
training (if built in a city with Barracks or in a civilization with an
active Sun Tzu.)"
- for maritime units, it will show: "May become veteran through combat or
training (if built in a city with Port Facility.)"
- for planes and helicopters, the message will be: "May become veteran
through combat or training (if built in a city with Airport.)"

There are three exceptions, though: Triremes can't be built if you have Port
Facility, because Navigation obsoletes them. However, they may become
veteran if they survive in the high seas, so the message could say: "May
become veteran through combat or training (if it survives in the high
seas.)"; the other exceptions are Diplomats and Spies. They are too
high-brow to attend Barracks, but Communist governments make them veteran,
so the message is: "May become veteran through combat or training (if built
under a
communist government.)"

These are the special cases I have thought of. Perhaps rulesets can be
twisted to make Port Facilities without Navigation, but I really think this
new messages would help newbies.

I don't especially like the wording. Feel free to change it.

As for the online manual, the mentions to Barracks, Sun Tzu and the like
could link to the proper pages. I can update it once we have a final
version.

The diff file is for trunk/client/helpdata.c

Cheers,

Joan
Hi,When I started playing Freeciv, the sentence in the documentation that puzzled me most was "May become veteran through training or combat". Combat was clear, but I kept looking for ways to train my units *after* they had been built. Laugh at me if you want, but it took me a while to figure out that the training was supposed to take place in the Barracks while the units were built.
So I have written a small modification to helpdata.c to improve this sentence:- for terrestrial units, it will show: "May become veteran through combat or training (if built in a city with Barracks or in a civilization with an active Sun Tzu.)"
- for maritime units, it will show: "May become veteran through combat or training (if built in a city with Port Facility.)"- for planes and helicopters, the message will be: "May become veteran through combat or training (if built in a city with Airport.)"
There are three exceptions, though: Triremes can't be built if you have Port Facility, because Navigation obsoletes them. However, they may become veteran if they survive in the high seas, so the message could say: "May become veteran through combat or training (if it survives in the high seas.)"; the other exceptions are Diplomats and Spies. They are too high-brow to attend Barracks, but Communist governments make them veteran, so the message is: "May become veteran through combat or training (if built under a
communist government.)"These are the special cases I have thought of. Perhaps rulesets can be twisted to make Port Facilities without Navigation, but I really think this new messages would help newbies.
I don't especially like the wording. Feel free to change it.As for the online manual, the mentions to Barracks, Sun Tzu and the like could link to the proper pages. I can update it once we have a final version.
The diff file is for trunk/client/helpdata.cCheers,Joan
Index: helpdata.c
===
--- helpdata.c	(revision 13910)
+++ helpdata.c	(working copy)
@@ -1010,8 +1010,34 @@
 sprintf(buf + strlen(buf),
 	_("* Will never achieve veteran status.\n"));
   } else {
-sprintf(buf + strlen(buf),
-	_("* May become veteran through training or combat.\n"));
+switch(utype_move_type(utype)) {
+  case AIR_MOVING:
+  case HELI_MOVING:
+  sprintf(buf + strlen(buf),
+	_("* May become veteran through combat or training (if built in a city with Airport.)\n"));
+  break;
+  case LAND_MOVING:
+if (utype_has_flag(utype, F_DIPLOMAT)||utype_has_flag(utype, F_SPY)) {
+  sprintf(buf + strlen(buf),
+	_("* May become veteran through combat or training (if built under a communist government.)\n"));
+} else {
+  sprintf(buf + strlen(buf),
+	_("* May become veteran through combat or training (if built in a city with Barracks or in a civilization with an active Sun Tzu.)\n"));
+}
+break;
+  case SEA_MOVING:
+if (utype_has_fla

Re: [Freeciv-Dev] (PR#39831) Training and combat

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39831 >

Good suggestion. I like it. Just one point: shouldn't it be "with Barracks"
instead of "with a Barracks"? I'm not a native English speaker, but it
doesn't feel right.

Can anybody improve on Randy's suggestion?

Joan

2007/11/3, Randy Kramer <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39831 >
>
> Joan,
>
> I'm not a developer, really just a lurker, well, and a tweaker--on looking
> at
> the messages you changed (thanks, btw), I wondered if they could be
> improved
> any further--see below.  Maybe you can take them even further.
>
> regards,
> Randy Kramer
>
> On Friday 02 November 2007 06:46 pm, Joan Creus wrote:
> > When I started playing Freeciv, the sentence in the documentation that
> > puzzled me most was "May become veteran through training or combat".
> Combat
> > was clear, but I kept looking for ways to train my units *after* they
> had
> > been built. Laugh at me if you want, but it took me a while to figure
> out
> > that the training was supposed to take place in the Barracks while the
> units
> > were built.
> >
> > So I have written a small modification to helpdata.c to improve this
> > sentence:
> >
> > - for terrestrial units, it will show: "May become veteran through
> combat or
> > training (if built in a city with Barracks or in a civilization with an
> > active Sun Tzu.)"
>
> Hmm, how about "Will be built as a veteran unit in a city with a Barracks
> or
> in a civilization with an active Sun Tzu, or can become a veteran through
> combat."
>
> or, if necessary to shorten it:
>
> "Built as a veteran in a city with a Barracks or in a civilization with an
> active Sun Tzu, or can become a veteran through combat."
>
> "Built as a veteran with a Barracks or an active Sun Tzu, or can become a
> veteran through combat."
>
> > - for maritime units, it will show: "May become veteran through combat
> or
> > training (if built in a city with Port Facility.)"
>
> and so on
>
> > - for planes and helicopters, the message will be: "May become veteran
> > through combat or training (if built in a city with Airport.)"
> >
> > There are three exceptions, though: Triremes can't be built if you have
> Port
> > Facility, because Navigation obsoletes them. However, they may become
> > veteran if they survive in the high seas, so the message could say: "May
> > become veteran through combat or training (if it survives in the high
> > seas.)"; the other exceptions are Diplomats and Spies. They are too
> > high-brow to attend Barracks, but Communist governments make them
> veteran,
> > so the message is: "May become veteran through combat or training (if
> built
> > under a
> > communist government.)"
> >
> > These are the special cases I have thought of. Perhaps rulesets can be
> > twisted to make Port Facilities without Navigation, but I really think
> this
> > new messages would help newbies.
> >
> > I don't especially like the wording. Feel free to change it.
> >
> > As for the online manual, the mentions to Barracks, Sun Tzu and the like
> > could link to the proper pages. I can update it once we have a final
> > version.
> >
> > The diff file is for trunk/client/helpdata.c
> >
> > Cheers,
> >
> > Joan
> > Note: This is an HTML message. For security reasons, only the raw HTML
> code
> is shown. If you trust the sender of this message then you can activate
> formatted HTML display for this message by clicking here.
>
>
>

Good suggestion. I like it. Just one point: shouldn't it be "with Barracks" instead of "with a Barracks"? I'm not a native English speaker, but it doesn't feel right.Can anybody improve on Randy's suggestion?
    Joan2007/11/3, Randy Kramer <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=39831 >Joan,I'm not a developer, really just a lurker, well, and a tweaker--on looking at
the messages you changed (thanks, btw), I wondered if they could be improvedany further--see below.  Maybe you can take them even further.regards,Randy KramerOn Friday 02 November 2007 06:46 pm, Joan Creus wrote:
> When I started playing Freeciv, the sentence in the documentation that> puzzled me most was "May become veteran through training or combat". Combat> was clear, but I kept looking for ways to train my units *after* they had
> been built. Laugh

Re: [Freeciv-Dev] (PR#39831) Training and combat

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39831 >

I think you mean EFT_VETERAN_BUILD. I would try to make it shorter, though.
I think your suggestion is great for the general manual, but here we are
dealing with the individual unit help. The original sentence ("may become
veteran throught training or combat") was definitely too short, but this is
probably too much. And we have to think that this will be read by complete
newbies. You don't want to bother them with rulesets.

I see your point, though. Borrowing also from Randy's, how about:

Will be built as a veteran in certain cities (see Barracks, and Sun Tzu).
May also become veteran if it defeats an enemy unit.

I don't like the "certain" word, but it's a start. I think it's important to
refer them to other parts of the manual, where they will get the full
explanation, while keeping it short.

  Joan

2007/11/4, Eddie Anderson <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39831 >
>
> "Joan Creus" <[EMAIL PROTECTED]> wrote:
> >
> >http://bugs.freeciv.org/Ticket/Display.html?id=39831 >
> >
> >Good suggestion. I like it. Just one point: shouldn't it be "with
> Barracks"
> >instead of "with a Barracks"? I'm not a native English speaker, but it
> >doesn't feel right.
> >
> >Can anybody improve on Randy's suggestion?
>
> I suggest some wording that refers to the name of the EFT
> (effect) that having a Barracks or Sun Tzu causes.  I can't remember
> the name of it at the moment (I'll just call it 'upgrade' in this
> email).
>
> The reason for doing so is that it is more portable - i.e. the
> wording will be appropriate for rulesets that may use other
> buildings or wonders that cause the upgrade effect.  Consider this
> wording:
>
> "Land units sometimes gain 'veteran' status by defeating an enemy
> unit in combat.  Also, land units can be created with 'veteran'
> status if they are created in a city where 'upgrade' is in effect.
> The 'upgrade' can be caused by buildings (e.g. Barracks), Wonders
> (e.g. Sun Tzu), or other factors defined in the ruleset."
>
>  Replace 'upgrade' with the name of the EFT and see how it
> sounds.  I still can't remember the name.  Sorry.
>
>  HTH.
>
> -Eddie
>
>
>

I think you mean EFT_VETERAN_BUILD. I would try to make it shorter, though. I think your suggestion is great for the general manual, but here we are dealing with the individual unit help. The original sentence ("may become veteran throught training or combat") was definitely too short, but this is probably too much. And we have to think that this will be read by complete newbies. You don't want to bother them with rulesets.
I see your point, though. Borrowing also from Randy's, how about:Will be built as a veteran in certain cities (see Barracks, and Sun Tzu). May also become veteran if it defeats an enemy unit.I don't like the "certain" word, but it's a start. I think it's important to refer them to other parts of the manual, where they will get the full explanation, while keeping it short.
  Joan2007/11/4, Eddie Anderson <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=39831 >"Joan Creus" <[EMAIL PROTECTED]
> wrote:>>http://bugs.freeciv.org/Ticket/Display.html?id=39831 >>>Good suggestion. I like it. Just one point: shouldn't it be "with Barracks"
>instead of "with a Barracks"? I'm not a native English speaker, but it>doesn't feel right.>>Can anybody improve on Randy's suggestion?I suggest some wording that refers to the name of the EFT
(effect) that having a Barracks or Sun Tzu causes.  I can't rememberthe name of it at the moment (I'll just call it 'upgrade' in thisemail).The reason for doing so is that it is more portable - 
i.e. thewording will be appropriate for rulesets that may use otherbuildings or wonders that cause the upgrade effect.  Consider thiswording:"Land units sometimes gain 'veteran' status by defeating an enemy
unit in combat.  Also, land units can be created with 'veteran'status if they are created in a city where 'upgrade' is in effect.The 'upgrade' can be caused by buildings (e.g. Barracks), Wonders
(e.g. Sun Tzu), or other factors defined in the ruleset." Replace 'upgrade' with the name of the EFT and see how itsounds.  I still can't remember the name.  Sorry. HTH.
-Eddie
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39831) Training and combat

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39831 >

This transaction appears to have no content
2007/11/5, Eddie Anderson <[EMAIL PROTECTED]>:
>
>
>
>  Instead of "certain cities", how about
>
>
>
> 1) "cities with appropriate training facilities",


Sorry about the delay. I think you nailed it right here. I have adapted the
messages to include Eddie's and Randy's suggestions, and have added a
reference to the Lighthouse.

The messages become, now:
For land units, except Diplomats and Spies:
* Will be built as a veteran in cities with appropriate training facilities
(see Barracks and Sun Tzu.) May also become veteran if it defeats an enemy
unit.

For Diplomats and Spies:
* Will be built as a veteran under communist governments. May also become
veteran after a successful mission.

For sea units:
* Will be built as a veteran in cities with appropriate training facilities
(see Port Facility and Lighthouse). May also become veteran if it defeats an
enemy unit.

Triremes will have an additional line:
* May become veteran if it survives in the high seas.

For air units and helicopters:
* Will be built as a veteran in cities with appropriate training facilities
(see Airport.) May also become veteran if it defeats an enemy unit.

Does anybody else have a suggestion?

Joan
2007/11/5, Eddie Anderson <[EMAIL PROTECTED]>:
 Instead of "certain cities", how about1) "cities with appropriate training facilities",Sorry about the delay. I think you nailed it right here. I have adapted the messages to include Eddie's and Randy's suggestions, and have added a reference to the Lighthouse.
The messages become, now:For land units, except Diplomats and Spies:* Will be built as a veteran in cities with appropriate training facilities (see Barracks and Sun Tzu.) May also become veteran if it defeats an enemy unit.
For Diplomats and Spies:* Will be built as a veteran under communist governments. May also become veteran after a successful mission.For sea units:* Will be built as a veteran in cities with appropriate training facilities (see Port Facility and Lighthouse). May also become veteran if it defeats an enemy unit.
Triremes will have an additional line:* May become veteran if it survives in the high seas.For air units and helicopters:* Will be built as a veteran in cities with appropriate training facilities (see Airport.) May also become veteran if it defeats an enemy unit.
Does anybody else have a suggestion?Joan
Index: helpdata.c
===
--- helpdata.c	(revision 13940)
+++ helpdata.c	(working copy)
@@ -1010,8 +1010,32 @@
 sprintf(buf + strlen(buf),
 	_("* Will never achieve veteran status.\n"));
   } else {
-sprintf(buf + strlen(buf),
-	_("* May become veteran through training or combat.\n"));
+switch(utype_move_type(utype)) {
+  case AIR_MOVING:
+  case HELI_MOVING:
+  sprintf(buf + strlen(buf),
+	_("* Will be built as a veteran in cities with appropriate training facilities (see Airport.) May also become veteran if it defeats an enemy unit.\n"));
+  break;
+  case LAND_MOVING:
+if (utype_has_flag(utype, F_DIPLOMAT)||utype_has_flag(utype, F_SPY)) {
+  sprintf(buf + strlen(buf),
+	_("* Will be built as a veteran under communist governments. May also become veteran after a successful mission.\n"));
+} else {
+  sprintf(buf + strlen(buf),
+	_("* Will be built as a veteran in cities with appropriate training facilities (see Barracks and Sun Tzu.) May also become veteran if it defeats an enemy unit.\n"));
+}
+break;
+  case SEA_MOVING:
+sprintf(buf + strlen(buf),
+	_("* Will be built as a veteran in cities with appropriate training facilities (see Port Facility and Lighthouse). May also become veteran if it defeats an enemy unit.\n"));
+if (utype_has_flag(utype, F_TRIREME))
+  sprintf(buf + strlen(buf),
+_("* May become veteran if it survives in the high seas.\n"));
+break;
+  default:		/* should never happen in default rulesets */
+  sprintf(buf + strlen(buf),
+	_("* May become veteran through combat or training\n"));
+}
   }
   if (utype_has_flag(utype, F_TRIREME)) {
 sprintf(buf + strlen(buf),
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39831) Training and combat

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39831 >

This transaction appears to have no content
Good. "Promoted" sounds perfect in this context.

Joan

2007/11/11, William Allen Simpson <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39831 >
>
> Joan Creus wrote:
> > For land units, except Diplomats and Spies:
> > * Will be built as a veteran in cities with appropriate training
> facilities
> > (see Barracks and Sun Tzu.) May also become veteran if it defeats an
> enemy
> > unit.
> >
> In this message, and all that follow, should be "veteran after" or
> "veteran when" -- or transposed to:
>
>   "If it defeats an enemy unit, may be promoted to veteran."
>
>
>
Good. "Promoted" sounds perfect in this context.Joan2007/11/11, William Allen Simpson <[EMAIL PROTECTED]
>:
http://bugs.freeciv.org/Ticket/Display.html?id=39831 >Joan Creus wrote:> For land units, except Diplomats and Spies:> * Will be built as a veteran in cities with appropriate training facilities
> (see Barracks and Sun Tzu.) May also become veteran if it defeats an enemy> unit.>In this message, and all that follow, should be "veteran after" or"veteran when" -- or transposed to:
  "If it defeats an enemy unit, may be promoted to veteran."
Index: helpdata.c
===
--- helpdata.c	(revision 13940)
+++ helpdata.c	(working copy)
@@ -1010,8 +1010,32 @@
 sprintf(buf + strlen(buf),
 	_("* Will never achieve veteran status.\n"));
   } else {
-sprintf(buf + strlen(buf),
-	_("* May become veteran through training or combat.\n"));
+switch(utype_move_type(utype)) {
+  case AIR_MOVING:
+  case HELI_MOVING:
+  sprintf(buf + strlen(buf),
+	_("* Will be built as a veteran in cities with appropriate training facilities (see Airport.) If it defeats an enemy unit, may be promoted to veteran.\n"));
+  break;
+  case LAND_MOVING:
+if (utype_has_flag(utype, F_DIPLOMAT)||utype_has_flag(utype, F_SPY)) {
+  sprintf(buf + strlen(buf),
+	_("* Will be built as a veteran under communist governments. May also become veteran after a successful mission.\n"));
+} else {
+  sprintf(buf + strlen(buf),
+	_("* Will be built as a veteran in cities with appropriate training facilities (see Barracks and Sun Tzu.) If it defeats an enemy unit, may be promoted to veteran.\n"));
+}
+break;
+  case SEA_MOVING:
+sprintf(buf + strlen(buf),
+	_("* Will be built as a veteran in cities with appropriate training facilities (see Port Facility and Lighthouse). If it defeats an enemy unit, may be promoted to veteran.\n"));
+if (utype_has_flag(utype, F_TRIREME))
+  sprintf(buf + strlen(buf),
+_("* May become veteran if it survives in the high seas.\n"));
+break;
+  default:		/* should never happen in default rulesets */
+  sprintf(buf + strlen(buf),
+	_("* May become veteran through combat or training\n"));
+}
   }
   if (utype_has_flag(utype, F_TRIREME)) {
 sprintf(buf + strlen(buf),
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40001 >

This transaction appears to have no content
The catalan ruleset has a few typos in city names. In the attached patch, I
have fixed them, added a few more cities, and added a couple new (long dead)
rulers for good measure. No translatable string has been changed, for
inclusion in 2.1.

Thanks,

Joan
The catalan ruleset has a few typos in city names. In the attached patch, I have fixed them, added a few more cities, and added a couple new (long dead) rulers for good measure. No translatable string has been changed, for inclusion in 
2.1.Thanks,Joan
Index: catalan.ruleset
===
--- catalan.ruleset	(revision 14221)
+++ catalan.ruleset	(working copy)
@@ -10,10 +10,12 @@
  "Ramon Berenguer IV",
  "Jaume I",
  "Pere II",
- "Lluis Companys",
+ "Pau Claris",
+ "Francesc Macià",
+ "Lluís Companys",
  "Josep Tarradellas"
 leader_sex="Male", "Male", "Male", "Male",
-   "Male", "Male"
+   "Male", "Male", "Male", "Male"
 flag="catalan"
 flag_alt = "-"
 city_style = "Classical"
@@ -37,22 +39,102 @@
 ; but rather to the "Països Catalans" of modern ethnolinguistic
 ; nationalists.
 cities =
-  "Barcelona", "Tarragona", "Lleida", "Girona", "Perpinyà", "Valencia",
-  "Tolosa", "Ripoll", "Vic", "La Seu d'Urgell", "Cardona", "Tortosa",
-  "Montserrat (hills)", "Poblet", "Santes Creus",
-  "Vallbona de les Monges", "Balaguer", "Manresa", "Terrassa",
-  "Sabadell", "Palma de Mallorca", "Eivissa", "Alacant", "Elx",
-  "Castelló de la Plana", "Montblanc (hills)", "Igualada", "Cervera",
-  "Berga", "Dénia", "Reus", "Granollers", "Mataró", "Figueres", "Olot",
-  "Badalona", "Tàrrega", "Amposta", "El Bruc", "Valls",
-  "Vilafranca del Penedés", "Manacor", "Alcúdia", "Sóller", "Artà",
-  "Llucmajor", "Felanitx", "Andratx", "Ciutadella", "Penyiscola",
-  "Sitges", "Vilanova i la Geltrú", "Viella", "L'Alguer", "Perelló",
-  "Torelló", "Sant Cugat", "Portbou (ocean)", "Palafrugell", "Manlleu",
-  "Sallent", "Puigcerdà", "Bellver", "Sant Boi de Llobregat",
-  "Vandellós", "Cornellà", "Tremp", "Palamós", "El Vendrell",
-  "Sant Feliu de Guíxols", "Sant Celoni", "Martorell", "L'Hospitalet",
-  "Mollet del Vallès", "Banyoles", "Blanes", "Lloret de mar (ocean)",
-  "Malgrat de mar (ocean)", "Canet de mar (ocean)", "Molins de Rei",
-  "Pons", "Súria", "Llívia", "La Bisbal d'Empurdà", "Prada", "Elna",
-  "Ceret", "Cadaqués", "Begur", "Olesa de Montserrat (hills)"
+ "Barcelona (ocean)",
+ "Tarragona (ocean)",
+ "Lleida (!ocean)",
+ "Girona",
+ "Perpinyà",
+ "València (ocean)",
+ "Tolosa",
+ "Ripoll",
+ "Vic",
+ "La Seu d'Urgell",
+ "Cardona",
+ "Tortosa",
+ "Montserrat (hills)",
+ "Poblet",
+ "Santes Creus",
+ "Vallbona de les Monges",
+ "Balaguer",
+ "Manresa",
+ "Terrassa",
+ "Sabadell",
+ "Palma de Mallorca (ocean)",
+ "Eivissa",
+ "Alacant",
+ "Elx",
+ "Maó (ocean)",
+ "Castelló de la Plana",
+ "Montblanc (hills)",
+ "Igualada",
+ "Cervera",
+ "Berga",
+ "Dénia",
+ "Alcoi",
+ "Reus",
+ "Granollers",
+ "Salses",
+ "Mataró",
+ "Figueres",
+ "Xàtiva",
+ "Olot",
+ "Badalona",
+ "Tàrrega",
+ "Amposta (river)",
+ "El Bruc",
+ "Valls",
+ "Sant Fruitós",
+ "Vilafranca del Penedès",
+ "Manacor",
+ "Alcúdia",
+ "Sóller",
+ "Guardamar",
+ "Artà",
+ "Llucmajor",
+ "Felanitx",
+ "Andratx",
+ "Ciutadella",
+ "Peníscola",
+ "Guardiola",
+ "Fraga",
+ "Almacelles",
+ "Sitges",
+ "Vilanova i la Geltrú",
+ "Vielha",
+ "L'Alguer",
+ "El Perelló",
+ "Torelló",
+ "Sant Cugat",
+ "Portbou (ocean)",
+ "Palafrugell",
+ "Manlleu",
+ "Sallent",
+ "Puigcerdà",
+ "Bellver",
+ "Sant Boi de Llobregat",
+ "Vandellòs",
+ "Cornellà",
+ "Tremp",
+ "Palamós",
+ "El Vendrell",
+ "Sant Feliu de Guíxols",
+ "Sant Celoni",
+ "Martorell",
+ "L'Hospitalet",
+ "Mollet del Vallès",
+ "Banyoles",
+ "Blanes (ocean)",
+ "Lloret de mar (ocean)",
+ "Malgrat de mar (ocean)",
+ "Canet de mar (ocean)",
+ "Molins de Rei",
+ "Ponts",
+ "Súria",
+ "Llívia",
+ "La Bisbal d'Empordà",
+ "Prada",
+ "Elna",
+ "Ceret",
+ "Cadaqués (ocean)",
+ "Begur (ocean)",
+ "Olesa de Montserrat (hills)"
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40001 >

This transaction appears to have no content
You call that being negative? No way! On the contrary, it's great to get
good feedback, particularly from the original author of the ruleset.

Guardamar is Guardamar del Segura, one of the four traditional extreme
points where the Catalan language is spoken (along with Salses, Fraga and
Maó, with permission from l'Alguer). I didn't even know there was a
Guardamar in la Safor, but I will add it.

Sant Fruitós natives never use "de Bages" to refer to their own town (I
know, I'm one), but you're right, we should have the whole name. I will do
the same with "Guardiola" (Sant Salvador de Guardiola, actually).

As for the geographical features, I didn't know about this criterion. It
makes sense, though. I didn't feel much comfortable with geographical
indications just for a few cities.

I will add both "hills" and "ocean" for Peníscola. Yes, only hills is
justified by the name, but I can't resist having "ocean" for a place like
that.

So, here you are, version two.

Joan

2008/1/5, [EMAIL PROTECTED] <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40001 >
>
> Thanks, Joan, for improving on the ruleset I worked on quite some time
> ago. Adding Pau Claris, Salses and Fraga were nice touches, I think.
>
> Now, I hate to be negative, BUT... IIRC, the geographic features (hills,
> ocean, etc.) were supposed to be added when the city name explicitly
> states it, so a city name like Montserrat (meaning "Serrated Mount") can
> get the " (hills)" designation, but Barcelona can't have " (ocean)" even
> if the real-life city is coastal. At least, that's the criteria I used
> back then.
>
> So, I think the added geographical features added to Amposta, Barcelona,
> Begur, Blanes, Cadaqués, Lleida, Maó (newly added), Palma de Mallorca,
> Tarragona and València have to be removed.
>
> By the way, the first time around, we forgot to add " (hills)" to
> Peníscola (it's name derives from "peña", meaning "bouldery hill").
>
> I'd complete the name of newly added Sant Fruitós: Sant Fruitós de
> Bages.
>
> I'm not sure whether the newly added city name of Guardamar refers to
> Guardamar de la Safor or to Guardamar del Segura. Let's add both! :-) In
> both cases, the " (ocean)" designation is warranted, and the latter
> might deserve the " (river)" designation as well.
>
>
>
> On Jan 4, 2008 11:29 AM, Joan Creus <[EMAIL PROTECTED]> wrote:
> >
> > http://bugs.freeciv.org/Ticket/Display.html?id=40001 >
> >
> > This transaction appears to have no content
> >
> > The catalan ruleset has a few typos in city names. In the attached
> patch, I
> > have fixed them, added a few more cities, and added a couple new (long
> dead)
> > rulers for good measure. No translatable string has been changed, for
> > inclusion in 2.1.
> >
> > Thanks,
> >
> > Joan
>
>
> --
> Miguel Farah
> [EMAIL PROTECTED]
>
>
>
You call that being negative? No way! On the contrary, it's great to get good feedback, particularly from the original author of the ruleset.Guardamar is Guardamar del Segura, one of the four traditional extreme points where the Catalan language is spoken (along with Salses, Fraga and Maó, with permission from l'Alguer). I didn't even know there was a Guardamar in la Safor, but I will add it.
Sant Fruitós natives never use "de Bages" to refer to their own town (I know, I'm one), but you're right, we should have the whole name. I will do the same with "Guardiola" (Sant Salvador de Guardiola, actually).
As for the geographical features, I didn't know about this criterion. It makes sense, though. I didn't feel much comfortable with geographical indications just for a few cities. I will add both "hills" and "ocean" for Peníscola. Yes, only hills is justified by the name, but I can't resist having "ocean" for a place like that.
So, here you are, version two.Joan2008/1/5, [EMAIL PROTECTED] <[EMAIL PROTECTED]
>:
http://bugs.freeciv.org/Ticket/Display.html?id=40001 >Thanks, Joan, for improving on the ruleset I worked on quite some timeago. Adding Pau Claris, Salses and Fraga were nice touches, I think.Now, I hate to be negative, BUT... IIRC, the geographic features (hills,
ocean, etc.) were supposed to be added when the city name explicitlystates it, so a city name like Montserrat (meaning "Serrated Mount") canget the " (hills)" designation, but Barcelona can't have " (ocean)" even
i

Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40001 >

Trolling indeed, and it's not strange for Spanish radical nationalists to
deny Catalonia's nationhood. Having its own dinasty and laws for hundreds of
years, and speaking a different language even today doesn't seem to be
enough.

In fact, the wikipedia article he quotes is quite enlightening. "Countries",
in the Middle Ages, were not what we think of nowadays. With poor
communications and a weak central power, nations (as we think of them now)
were just being built. The frontiers we see in the maps are mostly what
certain dinasties ruled. It was common for a king to rule over different
nations.

What he calls the Crown of Aragon was a real thing. It started when Ramiro
II, King of Aragon, who had no male son and wanted to retire, agreed with
Ramon Berenguer IV (of Freeciv fame) to give him the hand of his
one-year-old daughter (wow!) and his kingdom. From then on, Ramon
Berenguer's Dinasty were kings of Aragon and Counts of Barcelona. The kings
lived mainly in Barcelona and Montblanc (both Catalan cities), and they had
to respect the laws of both Aragon and Catalonia. The Aragonese people
didn't speak Catalan, so they probably translated the king's name into their
language (as is their prerrogative).

When the empire expanded (notably into the Balearic Islands and the Kingdom
of Valencia), the new lands were settled by Catalan-speaking people. The
internal organization of the kingdom was confederacy-like. Majorca,
Valencia, Aragon and Catalonia were considered separate kingdoms under the
same Crown. The wikipedia states that it was a "Maritime Empire", so it's
easy to guess that the weight of the empire was not in landlocked Aragon,
although it bore its name.

As for the names of the kings, Jaume I (who is in the ruleset), and who, by
the way, would celebrate his 800th birthday this year, wrote his
autobiography.  As you can
see in the wikipedia, it is written in Catalan, and the name is Jacme (which
is ancient Catalan for "James").

So, the ruleset (in its original form, I haven't made any significant
changes to it) tries to reflect a very real (and powerful) medieval nation.
After the dynastic union with Castille in 1479, the four kingdoms kept their
own laws and institutions, and it wasn't until the XVIII century and the
Spanish succession war that these laws and institutions were revoked. In
fact, the Wikipedia
lists1714
as the date of birth of Spain.

So, what does the ruleset mean, historically?: the part of the Crown of
Aragon settled by Catalan-speaking people (the three maritime kingdoms:
Catalonia, Valencia and the Balearic Islands), who have thus the same
cultural background. If we added Aragonese cities (and cities like Naples,
Athens, and so on), we could have a perfectly valid "Crown of Aragon"
ruleset, that would reflect the possessions of these kings (who, again, were
based in Catalonia). Nothing against that.

The present ruleset reflects a territory with a similar culture and
language. As for territorial claims, this is quite another story. The desire
for independence from Spain exists in very different degrees in each of the
territories, so it's not likely that this ruleset will become "modern"
without any changes.

Cheers,

  Joan

2008/1/6, Daniel Markstedt <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40001 >
>
> While we're on the topic, I'd like to discuss this:
> http://forum.freeciv.org/viewtopic.php?t=4216
>
> The poster is mainly trolling, but he brings up the legit question of
> whether the Catalonia described in our ruleset existed in the middle
> ages or not. From Freeciv's nations policy: "a nation listed as
> ancient or medieval should have
> had an independent dynasty or state in ancient or medieval times
> respectively" (
>
> http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.nations?rev=14172&view=auto
> )
>
> I'm not well versed in Iberian history, so please educate me on the issue.
> :)
>
> ~Daniel
>
>
>

Trolling indeed, and it's not strange for Spanish radical nationalists to deny Catalonia's nationhood. Having its own dinasty and laws for hundreds of years, and speaking a different language even today doesn't seem to be enough.
In fact, the wikipedia article he quotes is quite enlightening. "Countries", in the Middle Ages, were not what we think of nowadays. With poor communications and a weak central power, nations (as we think of them now) were just being built. The frontiers we see in the maps are mostly what certain dinasties ruled. It was common for a king to rule over different nations.
What he calls the Crown of Aragon was a real thing. It started when Ramiro II, King of Aragon, who had no male son and wanted to retire, agreed with Ramon Berenguer IV (of Freeciv fame) to give him the hand of his one-year-old daughter (wow!) and his ki

Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40001 >

2008/1/6, William Allen Simpson <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40001 >
>
> [EMAIL PROTECTED] wrote:
> > Yeah, but the city list in the ruleset DOES contain cities
> > that have never been part of the Principality of Catalonia, or
> > the Region of Catalonia or the current Autonomy.
>
> Which ones?  Do they speak Catalan?  How did they end up speaking
> Catalan without ever being part of Catalonia?  Autonomous colonies?


You might call it like that. There is an ambiguity here. Catalans settled
the kingdoms of Valencia and the Balearic Islands, so people there ended up
speaking Catalan. However, they were considered different territories
(although, they had the same king).

> Option 3: create an aragonese ruleset for the CROWN of Aragon.
> >
> I'm against this for the reasons stated in my previous message.
>
> An Aragonese ruleset for the landlocked kingdom might be OK.
>
>
A Crown of Aragon ruleset would be politically accurate. I'm not against it
being created, although I wouldn't do it. It shouldn't replace
catalan.ruleset, of course. They are different things.

As for the Catalan ruleset, I would leave it like it is. I don't like any of
Miguel's options: restricting to just cities inside present-day Catalonia
cripples a pretty cool ruleset, and forgets a rich history of Mediterranean
expansion. If Catalonia alone becomes independent in the future, this will
be a must for the nation to be considered "modern". In the meantime, there
is no reason for it. As William says, the English ruleset could perfectly
have Boston, Philadelphia (and even Bombay). The cities listed have all been
at some time ruled by a king who spoke Catalan.

As for changing the classification to "fictional", I think that it is too
drastic. Fictional is for "literary", "joke" or "impossible" nations: like
martians, antarctic penguins, or the old Middle-Earth nations. Political
questions aside, there are strong cultural ties between this list of cities.
Heck, there is even an Internet top level domain (.cat) for sites related to
Catalan culture, and it's used in Catalonia, València, Majorca, Southern
France (AKA Northern Catalonia), ... And there are a few people who think
all these territories should become an independent state.

Cheers,

Joan

2008/1/6, William Allen Simpson <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=40001 >[EMAIL PROTECTED] wrote:
> Yeah, but the city list in the ruleset DOES contain cities> that have never been part of the Principality of Catalonia, or> the Region of Catalonia or the current Autonomy.Which ones?  Do they speak Catalan?  How did they end up speaking
Catalan without ever being part of Catalonia?  Autonomous colonies?You might call it like that. There is an ambiguity here. Catalans settled the kingdoms of Valencia and the Balearic Islands, so people there ended up speaking Catalan. However, they were considered different territories (although, they had the same king).
> Option 3: create an aragonese ruleset for the CROWN of Aragon.>
I'm against this for the reasons stated in my previous message.An Aragonese ruleset for the landlocked kingdom might be OK.A Crown of Aragon ruleset would be politically accurate. I'm not against it being created, although I wouldn't do it. It shouldn't replace 
catalan.ruleset, of course. They are different things.As for the Catalan ruleset, I would leave it like it is. I don't like any of Miguel's options: restricting to just cities inside present-day Catalonia cripples a pretty cool ruleset, and forgets a rich history of Mediterranean expansion. If Catalonia alone becomes independent in the future, this will be a must for the nation to be considered "modern". In the meantime, there is no reason for it. As William says, the English ruleset could perfectly have Boston, Philadelphia (and even Bombay). The cities listed have all been at some time ruled by a king who spoke Catalan.
As for changing the classification to "fictional", I think that it is too drastic. Fictional is for "literary", "joke" or "impossible" nations: like martians, antarctic penguins, or the old Middle-Earth nations. Political questions aside, there are strong cultural ties between this list of cities. Heck, there is even an Internet top level domain (.cat) for sites related to Catalan culture, and it's used in Catalonia, València, Majorca, Southern France (AKA Northern Catalonia), ... And there are a few people who think all these territories should become an independent state.
Cheers,Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40001 >

We basically agree. I think the key here is the definition of "medieval" and
"catalan". As I understand, "medieval" in Freeciv is used for "a nation that
existed at some time, but isn't independent nowadays". Since there isn't a
"cultural" category (after all, culture and language is what all these
cities have in common), "medieval" is the closest we have.

 And, indeed, during the Middle Ages these cities formed a nation (at least
culturally, and, to some degree, also politically). Sure, there are a few
cities in the ruleset that are not Catalan, but the King of the Crown of
Aragon, who happened to live in Barcelona, ruled them. And the language
spoken there is Catalan or some variant of it (I don't like the word
"dialect" because it implies some hierarchy among different variants)

Joan

2008/1/6, [EMAIL PROTECTED] <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40001 >
>
> On Jan 6, 2008 12:47 PM, William Allen Simpson
> <[EMAIL PROTECTED]> wrote:
> >
> > http://bugs.freeciv.org/Ticket/Display.html?id=40001 >
> >
> > William Allen Simpson wrote:
> > > Which ones?  Do they speak Catalan?  How did they end up speaking
> > > Catalan without ever being part of Catalonia?  Autonomous colonies?
> > >
> > To clarify my question, our current rule is:
> >
> >An _ancient_ or _medieval_ nation may list any city that it at some
> >point controlled.
> >
> > For the purposes of this ticket, I opine that it is OK for historically
> > Catalan-speaking cities to be included, as former Catalan colonies,
> > whether founded under the Principality or a larger Empire ("Crown").
>
> I understand. But... if we were to keep catalan.ruleset as medieval,
> it would necessarily refer to the Principality of Catalonia, so the only
> cities it could contain would be the ones from Catalonia proper,
> Catalonia Nord and perhaps the Franja Ponent (see my previous post).
> Valencia and Majorca were never part of the principality, nor were
> colonies in the strict sense, so they can't be included if this is the
> criteria to be used (nor Andorra, an independent entity).
>
> --
> Miguel Farah
> [EMAIL PROTECTED]
>
>
>

We basically agree. I think the key here is the definition of "medieval" and "catalan". As I understand, "medieval" in Freeciv is used for "a nation that existed at some time, but isn't independent nowadays". Since there isn't a "cultural" category (after all, culture and language is what all these cities have in common), "medieval" is the closest we have.
 And, indeed, during the Middle Ages these cities formed a nation (at least culturally, and, to some degree, also politically). Sure, there are a few cities in the ruleset that are not Catalan, but the King of the Crown of Aragon, who happened to live in Barcelona, ruled them. And the language spoken there is Catalan or some variant of it (I don't like the word "dialect" because it implies some hierarchy among different variants)
Joan2008/1/6, [EMAIL PROTECTED] <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=40001 >On Jan 6, 2008 12:47 PM, William Allen Simpson<
[EMAIL PROTECTED]> wrote:>> http://bugs.freeciv.org/Ticket/Display.html?id=40001 >>> William Allen Simpson wrote:
> > Which ones?  Do they speak Catalan?  How did they end up speaking> > Catalan without ever being part of Catalonia?  Autonomous colonies?> >> To clarify my question, our current rule is:
>>An _ancient_ or _medieval_ nation may list any city that it at some>point controlled.>> For the purposes of this ticket, I opine that it is OK for historically> Catalan-speaking cities to be included, as former Catalan colonies,
> whether founded under the Principality or a larger Empire ("Crown").I understand. But... if we were to keep catalan.ruleset as medieval,it would necessarily refer to the Principality of Catalonia, so the only
cities it could contain would be the ones from Catalonia proper,Catalonia Nord and perhaps the Franja Ponent (see my previous post).Valencia and Majorca were never part of the principality, nor werecolonies in the strict sense, so they can't be included if this is the
criteria to be used (nor Andorra, an independent entity).--Miguel Farah[EMAIL PROTECTED]
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40001 >

2008/1/6, William Allen Simpson <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40001 >
>
> [EMAIL PROTECTED] wrote:
> > And then's the Sardinian city of Alghero (L'Alguer), which was resettled
> in
> > the 14th century by catalans.
> >
> Cool.  Try what I did for Illyrian, adding dates and alternative names:
>
>"Scodra (hills, plains, river, !ocean)", ;-400 42:04N 19:30E
>; |Scutari|Shkodra|Shkoder
>
> (If I were doing it today, I'd make that 3 lines instead, for
> readability.)


That looks pretty cool. Is the syntax documented in the wiki?

> Finally, Andorra (a catalan speaking country), doesn't have any cities
> > represented in the ruleset (Andorra la Vella, Sant Julià de Lòria,
> Encamp
> > and Soldeu could be added).
> >
> Under our rules, sounds like they should!  They must have been controlled
> or colonized by Catalans in the past.  As mentioned earlier, it's OK for
> the same city to be in multiple nations.  Dates of founding and
> alternative
> names would be good here, too.
>
> If somebody adds Andorran, can have it as a civil-war nation for Catalan.


That's fun. There's a joke  that says that, in order to gain independence,
Catalonia should declare war on Andorra, and then surrender. With such
brilliant strategists, it's no wonder we are not independent any more. More
seriously, yes, there is no reason not to have Andorran cities in the
ruleset, although Andorra has always been independent, as far as I know.
They speak Catalan because it's what was spoken in their area, not because
any one conquered or settled them.

An Andorran ruleset would be quite short of cities (Andorra is really
small), but it could be done.

> According to catalan nationalists, in order for a city or county or
> whatever
> > to be a part of the Països Catalans, it must be a catalan-speaking area.
> >
> Well, this isn't a political organization.  We're more interested in using
> historical information to make the game itself interesting!  We should
> include formerly catalan-speaking areas, too, not only modern ones
>
> Right, let's forget about present-day politics or the whole thing will get
really complicated. History is what it is. Let's leave it like that.

If everybody agrees, I'll add a couple Andorran cities to the ruleset. That
was a good idea.

Joan

2008/1/6, William Allen Simpson <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=40001 >[EMAIL PROTECTED] wrote:
> And then's the Sardinian city of Alghero (L'Alguer), which was resettled in> the 14th century by catalans.>Cool.  Try what I did for Illyrian, adding dates and alternative names:   "Scodra (hills, plains, river, !ocean)", ;-400 42:04N 19:30E
   ; |Scutari|Shkodra|Shkoder(If I were doing it today, I'd make that 3 lines instead, for readability.)That looks pretty cool. Is the syntax documented in the wiki?
> Finally, Andorra (a catalan speaking country), doesn't have any cities> represented in the ruleset (Andorra la Vella, Sant Julià de Lòria, Encamp> and Soldeu could be added).>Under our rules, sounds like they should!  They must have been controlled
or colonized by Catalans in the past.  As mentioned earlier, it's OK forthe same city to be in multiple nations.  Dates of founding and alternativenames would be good here, too.If somebody adds Andorran, can have it as a civil-war nation for Catalan.
That's fun. There's a joke  that says that, in order to gain independence, Catalonia should declare war on Andorra, and then surrender. With such brilliant strategists, it's no wonder we are not independent any more. More seriously, yes, there is no reason not to have Andorran cities in the ruleset, although Andorra has always been independent, as far as I know. They speak Catalan because it's what was spoken in their area, not because any one conquered or settled them.
An Andorran ruleset would be quite short of cities (Andorra is really small), but it could be done.
> According to catalan nationalists, in order for a city or county or whatever> to be a part of the Països Catalans, it must be a catalan-speaking area.>Well, this isn't a political organization.  We're more interested in using
historical information to make the game itself interesting!  We shouldinclude formerly catalan-speaking areas, too, not only modern onesRight, let's forget about present-day politics or the whole thing will get really complicated. History is what it is. Let's leave it like that.
If everybody agrees, I'll add a couple Andorran cities to the ruleset. That was a good idea.Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40001 >

Yes, it's fascinating how Andorrans manage to navigate the balance of power
and remain independent. They have two heads of state (the co-princes): one
still is the Bishop of Urgell, and the other is the President of France
(Nicolas Sarkozy, now), as successor of the kings of France, who succeeded
the Counts of Foix.

They are the largest country in the world whose head of state is a priest
(that may change, though, if Huckabee wins the U.S. presidency B-)).

I'll try to write a ruleset for Andorra.

I have also noticed that one of the cities in the catalan list is not really
Catalan. Tolosa (Toulouse, in its French name) was Occitan. Occitans and
Catalans were traditional allies, and there were lots of ties between the
two nations, but they never had the same ruler. In fact, Vielha is another
city of Occitan culture, but it has been administratively Catalan for
centuries, and now Catalan, Spanish and Occitan are spoken there. So, Vielha
stays.

By the way, Occitania is another nation worth including in Freeciv: full of
legends about the Holy Grail; where troubadours flourished and spread the
Occitan poems all over Europe, ...

BTW, thanks everybody for a great discussion.

Joan

2008/1/6, William Allen Simpson <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40001 >
>
> Joan Creus wrote:
> > ... yes, there is no reason not to have Andorran cities in the
> > ruleset, although Andorra has always been independent, as far as I know.
> > They speak Catalan because it's what was spoken in their area, not
> because
> > any one conquered or settled them.
> >
> To be honest, on this side of the pond, we only know that Andorra is one
> of
> the few remaining micro-states over there.  But they do seem to have been
> both conquered and settled repeatedly (long ago).
>
> According to http://en.wikipedia.org/wiki/History_of_Andorra they speak
> Catalan because they were conquered back in 8th century, were ruled by
> catalans (the Count of Urgell, Bishop of Urgell, the Lord of Caboet), and
> were briefly annexed to the Crown of Aragon twice, in 1396 and 1512.
>
> It's interesting that many of the local toponyms are Iberian-Basque.
>
>
>

Yes, it's fascinating how Andorrans manage to navigate the balance of power and remain independent. They have two heads of state (the co-princes): one still is the Bishop of Urgell, and the other is the President of France (Nicolas Sarkozy, now), as successor of the kings of France, who succeeded the Counts of Foix.
They are the largest country in the world whose head of state is a priest (that may change, though, if Huckabee wins the U.S. presidency B-)).I'll try to write a ruleset for Andorra.I have also noticed that one of the cities in the catalan list is not really Catalan. Tolosa (Toulouse, in its French name) was Occitan. Occitans and Catalans were traditional allies, and there were lots of ties between the two nations, but they never had the same ruler. In fact, Vielha is another city of Occitan culture, but it has been administratively Catalan for centuries, and now Catalan, Spanish and Occitan are spoken there. So, Vielha stays.
By the way, Occitania is another nation worth including in Freeciv: full of legends about the Holy Grail; where troubadours flourished and spread the Occitan poems all over Europe, ...BTW, thanks everybody for a great discussion.
Joan2008/1/6, William Allen Simpson <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=40001 >Joan Creus wrote:> ... yes, there is no reason not to have Andorran cities in the
> ruleset, although Andorra has always been independent, as far as I know.> They speak Catalan because it's what was spoken in their area, not because> any one conquered or settled them.>
To be honest, on this side of the pond, we only know that Andorra is one ofthe few remaining micro-states over there.  But they do seem to have beenboth conquered and settled repeatedly (long ago).According to 
http://en.wikipedia.org/wiki/History_of_Andorra they speakCatalan because they were conquered back in 8th century, were ruled bycatalans (the Count of Urgell, Bishop of Urgell, the Lord of Caboet), and
were briefly annexed to the Crown of Aragon twice, in 1396 and 1512.It's interesting that many of the local toponyms are Iberian-Basque.
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40001 >

And from the point of view of someone who actually has to put up with
this kind of historical distortions on a regular basis, it's
refreshing to see that dispassionate persons with the will to
understand facts can see through all the troll's propaganda.

Miguel's excellent summary of Iberian history should be taught in all
schools. From that solid base, we may have had slight disagreements on
Freeciv concepts and rules, but the discussion was honest and
intelligent. You made my day.

Joan


On 1/8/08, William Allen Simpson <[EMAIL PROTECTED]> wrote:
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40001 >
>
> Daniel Markstedt wrote:
> > Very enlightening discussion. Thanks everyone.
> >
> Yeah, it was kinda fun spending several hours learning something entirely
> new to me
>
> There are a lot of parallels to arguments over Romans and Greeks and Kurds
> and Armenians, among others.
>
>
> > I propose keeping the Catalan nation in its current "Països Catalans"
> > form while removing it from the 'medieval' group, leaving it simply
> > "European".
> >
> Investigation showed the Catalans *were* medieval, the cities listed (with
> one exception) are properly from the medieval areas.  The "Països Catalans"
> are merely an attempt to reunite the culturally related areas.
>
> (Being of Scottish ancestry, and in communication with Scottish 2nd and 3rd
> cousins, I understand and sympathize.)
>
> The silly idea that the label "Crown of ..." is more important is confusing
> heraldic precedence with reality.  The Aragonese princess was a child bride,
> the dominate dynasty was Catalan, the capital was Catalan.
>
> Aragonese culture wasn't the primary culture that was spread, and the
> present language distribution demonstrates the reality
>
> We've seen this before with Greeks.  Alexander the Great wasn't Greek
> (unless you subscribe to the theory that all French and Spanish are
> actually Italian because the language root is the same).  He *conquered*
> the Greeks.  The Empire was officially Macedonian.
>
> But the era is called Hellenic, because the Hellenic culture was spread.
>
> In a truly civilization spanning game, it's helpful to pay more attention
> to scientific archaeological and anthropological analysis instead of
> partisan bickering that the existence of Catalan is somehow insulting to
> the Spanish
>
>
> > Creating a 'cultural' group is a great idea - I'd like to introduce it
> > in 2.2 where we will have a lot more of this kind of nation in the
> > default ruleset.
> >
> Good idea.  But I'd add it in addition to the medieval, etc.  After all,
> it's just a group label.
>
>
>



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] Fwd: (PR#39687) Typos in nation rulesets

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39687 >

This transaction appears to have no content
This fix got forgotten in my mailbox. I have the fix with the same changes,
except I now keep the "devolved" in the purhepecha.ruleset.

Joan

-- Forwarded message --
From: Joan Creus <[EMAIL PROTECTED]>
Date: 09/09/2007 14:22
Subject: Re: [Freeciv-Dev] (PR#39687) Typos in nation rulesets
To: [EMAIL PROTECTED]

You are right. It sounded strange to me, and I looked it up, but I didn't
find the third meaning that says: grow worse; "Her condition
deteriorated".Yep, devolve is fine.

Joan


2007/9/8, Daniel Markstedt < [EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39687 >
>
> On 9/8/07, Joan Creus <[EMAIL PROTECTED]> wrote:
> >
> > http://bugs.freeciv.org/Ticket/Display.html?id=39687
> > >
> >
> > This transaction appears to have no content
> >
> > I think I have found a few typos in several nations; check them out,
> > particularly two that are in proper nouns, one in khwarezmian and the
> other
> > in breton.ruleset
> >
> > Joan
> >
>
> They look like good fixes. Except one in purhepecha.ruleset - I do
> think "devolved into violence" is proper English.
>
> ~Daniel
>
>
>
This fix got forgotten in my mailbox. I have the fix with the same changes, except I now keep the "devolved" in the purhepecha.ruleset.Joan-- Forwarded message --
From: Joan Creus <[EMAIL PROTECTED]>Date: 09/09/2007 14:22Subject: Re: [Freeciv-Dev] (PR#39687) Typos in nation rulesetsTo: 
[EMAIL PROTECTED]You are right. It sounded strange to me, and I looked it up, but I didn't find the third meaning that says: grow worse; "Her condition deteriorated".

 Yep, devolve is fine.Joan2007/9/8, Daniel Markstedt <

[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=39687 >On 9/8/07, Joan Creus <[EMAIL PROTECTED]
> wrote:>> 
http://bugs.freeciv.org/Ticket/Display.html?id=39687> >>> This transaction appears to have no content>> I think I have found a few typos in several nations; check them out,> particularly two that are in proper nouns, one in khwarezmian and the other
> in breton.ruleset>> Joan>They look like good fixes. Except one in purhepecha.ruleset - I dothink "devolved into violence" is proper English. ~Daniel


Index: phoenician.ruleset
===
--- phoenician.ruleset	(revision 14228)
+++ phoenician.ruleset	(working copy)
@@ -7,9 +7,9 @@
  coastal regions of Lebanon and Syria.  They spoke a Canaanite language\
  related to Hebrew and were famed mariners.  Their alphabet served as the\
  source of the Greek alphabet, and from there evolved into the Etruscan\
- and Latin alphabets as well.  The Greeks and Romans new them for their\
+ and Latin alphabets as well.  The Greeks and Romans knew them for their\
  manufacture of purple dye from the myrex shell, which gave them their\
- Greek and Latin names.  They refered to themselves a Kan'ani and thier\
+ Greek and Latin names.  They refered to themselves a Kan'ani and their\
  Punic (Carthaginian) descendents in St. Augustine's day called themselves\
  Chanani.")
 leader=
Index: chola.ruleset
===
--- chola.ruleset	(revision 14228)
+++ chola.ruleset	(working copy)
@@ -4,7 +4,7 @@
 plural=_("?plural:Cholas")
 groups="Asian", "Ancient"
 
-legend=_("The Cholas were a Tamil dynasty in centered in southern India and\
+legend=_("The Cholas were a Tamil dynasty centered in southern India and\
  were rare in their level of influence in northern India. They began as a\
  tributary state to the Pallavas, but in the 9th century their power began\
  to grow. During the 11th century, they lead expeditions against other\
Index: laotian.ruleset
===
--- laotian.ruleset	(revision 14228)
+++ laotian.ruleset	(working copy)
@@ -9,7 +9,7 @@
  century, Laos became part of French Indochina.\
  French rule ended with independence in 1946 followed\
  by 30 years of civil war. In 1975 the communist Pathet\
- Lao established strict solicalist regime. However,\
+ Lao established a strict socialist regime. However,\
  in 1986 the liberalization and a gradual return to\
  private enterpise started.")
 
Index: khwarezmian.ruleset
===
--- khwarezmian.ruleset	(revision 14228)
+++ khwarezmian.ruleset	(working copy)
@@ -9,8 +9,8 @@
  controlling portions of the Silk Road. It was loosely controlled as a\
  satrapy under the Achaemenid and Sassanid Persian dynasties and was mythic\
  

Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40001 >

This transaction appears to have no content
So, last patch (for now) for catalan.ruleset in 2.1.

Basically, it's the same as the current ruleset, with no translatable
strings changed, and:
- two more rulers.
- removed "portuguese" from civilwar_nations (they are too far) and added
"french", which actually makes historical sense (several Catalan cities
became French after a war) in the XVII century.
- modified the comment to reflect that it corresponds to lands settled by
Catalans, where Catalan is still spoken today. There is also a historical
basis (of lands ruled by Catalans) but is not limited to the current
definition of Catalonia.
- added a few cities, including some Andorran ones, and removed the Occitan
city of Tolosa.

About "medieval" or not, your call. I'd leave it, since the Middle Ages is
usually considered the time of splendour of the Catalan empire.

Cheers,

Joan


2008/1/8, William Allen Simpson <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40001 >
>
> Daniel Markstedt wrote:
> > Very enlightening discussion. Thanks everyone.
> >
> Yeah, it was kinda fun spending several hours learning something entirely
> new to me
>
> There are a lot of parallels to arguments over Romans and Greeks and Kurds
> and Armenians, among others.
>
>
> > I propose keeping the Catalan nation in its current "Països Catalans"
> > form while removing it from the 'medieval' group, leaving it simply
> > "European".
> >
> Investigation showed the Catalans *were* medieval, the cities listed (with
> one exception) are properly from the medieval areas.  The "Països
> Catalans"
> are merely an attempt to reunite the culturally related areas.
>
> (Being of Scottish ancestry, and in communication with Scottish 2nd and
> 3rd
> cousins, I understand and sympathize.)
>
> The silly idea that the label "Crown of ..." is more important is
> confusing
> heraldic precedence with reality.  The Aragonese princess was a child
> bride,
> the dominate dynasty was Catalan, the capital was Catalan.
>
> Aragonese culture wasn't the primary culture that was spread, and the
> present language distribution demonstrates the reality
>
> We've seen this before with Greeks.  Alexander the Great wasn't Greek
> (unless you subscribe to the theory that all French and Spanish are
> actually Italian because the language root is the same).  He *conquered*
> the Greeks.  The Empire was officially Macedonian.
>
> But the era is called Hellenic, because the Hellenic culture was spread.
>
> In a truly civilization spanning game, it's helpful to pay more attention
> to scientific archaeological and anthropological analysis instead of
> partisan bickering that the existence of Catalan is somehow insulting to
> the Spanish
>
>
> > Creating a 'cultural' group is a great idea - I'd like to introduce it
> > in 2.2 where we will have a lot more of this kind of nation in the
> > default ruleset.
> >
> Good idea.  But I'd add it in addition to the medieval, etc.  After all,
> it's just a group label.
>
>
>
So, last patch (for now) for catalan.ruleset in 2.1.Basically, it's the same as the current ruleset, with no translatable strings changed, and:- two more rulers.- removed "portuguese" from civilwar_nations (they are too far) and added "french", which actually makes historical sense (several Catalan cities became French after a war) in the XVII century.
- modified the comment to reflect that it corresponds to lands settled by Catalans, where Catalan is still spoken today. There is also a historical basis (of lands ruled by Catalans) but is not limited to the current definition of Catalonia.
- added a few cities, including some Andorran ones, and removed the Occitan city of Tolosa.About "medieval" or not, your call. I'd leave it, since the Middle Ages is usually considered the time of splendour of the Catalan empire.
Cheers,    Joan2008/1/8, William Allen Simpson <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=40001
 >Daniel Markstedt wrote:> Very enlightening discussion. Thanks everyone.>Yeah, it was kinda fun spending several hours learning something entirelynew to meThere are a lot of parallels to arguments over Romans and Greeks and Kurds
and Armenians, among others.> I propose keeping the Catalan nation in its current "Països Catalans"> form while removing it from the 'medieval' group, leaving it simply> "European".
>Investigation showed the Catalans *were* medieval, the cities listed (withone exception) are properly from the medieval areas.  The "Països Catalans"are merely an attempt to reunite the culturally related areas.
(Being of Scottish ancestry, and in communication with Scottish 2nd and 3rdcousins, I understand and sympathize.)The silly idea that the label "Crown of ..." is more important is confusing
heraldic precedence with reality.  The Aragonese princess was a child bride,the dominate d

Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40001 >

This transaction appears to have no content
You're right. There you go.

Joan

2008/1/15, [EMAIL PROTECTED] <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40001 >
>
> On Jan 14, 2008 9:33 PM, Joan Creus <[EMAIL PROTECTED]> wrote:
> > So, last patch (for now) for catalan.ruleset in 2.1.
> >
> > Basically, it's the same as the current ruleset, with no translatable
> > strings changed, and:
> >[...]
>
> It's almost perfect. You forgot to add " (ocean)" to both Guardamar
> cities. :-)
>
>
> --
> Miguel Farah
> [EMAIL PROTECTED]
>
>
>
You're right. There you go.Joan2008/1/15, [EMAIL PROTECTED] <[EMAIL PROTECTED]
>:
http://bugs.freeciv.org/Ticket/Display.html?id=40001 >On Jan 14, 2008 9:33 PM, Joan Creus <[EMAIL PROTECTED]> wrote:> So, last patch (for now) for catalan.ruleset
 in 2.1.>> Basically, it's the same as the current ruleset, with no translatable> strings changed, and:>[...]It's almost perfect. You forgot to add " (ocean)" to both Guardamar cities. :-)
--Miguel Farah[EMAIL PROTECTED]
Index: catalan.ruleset
===
--- catalan.ruleset	(revision 14236)
+++ catalan.ruleset	(working copy)
@@ -10,10 +10,12 @@
  "Ramon Berenguer IV",
  "Jaume I",
  "Pere II",
- "Lluis Companys",
+ "Pau Claris",
+ "Francesc Macià",
+ "Lluís Companys",
  "Josep Tarradellas"
 leader_sex="Male", "Male", "Male", "Male",
-   "Male", "Male"
+   "Male", "Male", "Male", "Male"
 flag="catalan"
 flag_alt = "-"
 city_style = "Classical"
@@ -31,28 +33,120 @@
 
 init_government="Despotism"
 init_units=""
-civilwar_nations = "spanish", "portuguese"
+civilwar_nations = "spanish", "french"
 
 ; This city list does not actually correspond to medieval Catalonia,
-; but rather to the "Països Catalans" of modern ethnolinguistic
+; but rather to all lands settled by Catalans, where Catalan is still spoken
+; nowadays. It corresponds to the "Països Catalans" of modern ethnolinguistic
 ; nationalists.
 cities =
-  "Barcelona", "Tarragona", "Lleida", "Girona", "Perpinyà", "Valencia",
-  "Tolosa", "Ripoll", "Vic", "La Seu d'Urgell", "Cardona", "Tortosa",
-  "Montserrat (hills)", "Poblet", "Santes Creus",
-  "Vallbona de les Monges", "Balaguer", "Manresa", "Terrassa",
-  "Sabadell", "Palma de Mallorca", "Eivissa", "Alacant", "Elx",
-  "Castelló de la Plana", "Montblanc (hills)", "Igualada", "Cervera",
-  "Berga", "Dénia", "Reus", "Granollers", "Mataró", "Figueres", "Olot",
-  "Badalona", "Tàrrega", "Amposta", "El Bruc", "Valls",
-  "Vilafranca del Penedés", "Manacor", "Alcúdia", "Sóller", "Artà",
-  "Llucmajor", "Felanitx", "Andratx", "Ciutadella", "Penyiscola",
-  "Sitges", "Vilanova i la Geltrú", "Viella", "L'Alguer", "Perelló",
-  "Torelló", "Sant Cugat", "Portbou (ocean)", "Palafrugell", "Manlleu",
-  "Sallent", "Puigcerdà", "Bellver", "Sant Boi de Llobregat",
-  "Vandellós", "Cornellà", "Tremp", "Palamós", "El Vendrell",
-  "Sant Feliu de Guíxols", "Sant Celoni", "Martorell", "L'Hospitalet",
-  "Mollet del Vallès", "Banyoles", "Blanes", "Lloret de mar (ocean)",
-  "Malgrat de mar (ocean)", "Canet de mar (ocean)", "Molins de Rei",
-  "Pons", "Súria", "Llívia", "La Bisbal d'Empurdà", "Prada", "Elna",
-  "Ceret", "Cadaqués", "Begur", "Olesa de Montserrat (hills)"
+ "Barcelona",
+ "Tarragona",
+ "Lleida",
+ "Girona",
+ "Perpinyà",
+ "València",
+ "Ripoll",
+ "Vic",
+ "La Seu d'Urgell",
+ "Cardona",
+ "Tortosa",
+ "

Re: [Freeciv-Dev] (PR#39788) translations not displaying

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=39788 >

No. It was a problem in my setup, and Freeciv got the wrong .gmo file.

Joan


2008/1/17, William Allen Simpson <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39788 >
>
> Are you still experiencing this problem?
>
>

No. It was a problem in my setup, and Freeciv got the wrong .gmo file.
 
Joan
 
2008/1/17, William Allen Simpson <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=39788
 >Are you still experiencing this problem?
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#40025) One more plural to fix

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40025 >

I see William has been adding plural translations lately. Well, here's
another:

In #: client/gui-gtk-2.0/happiness.c:252 client/gui-win32/happiness.c:204

the sentence is:

%d additional unhappy citizens.

%d is 1 in the default ruleset, so it would be good to have an option here.

Not a showstopper bug, really, but since we are at it ...

Joan

I see William has been adding plural translations lately. Well, here's another:In #: client/gui-gtk-2.0/happiness.c:252 client/gui-win32/happiness.c:204the sentence is:%d additional unhappy citizens.
%d is 1 in the default ruleset, so it would be good to have an option here.Not a showstopper bug, really, but since we are at it ...Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40025) Happiness plurals

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40025 >

2008/1/18, William Allen Simpson <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40025 >
>
>
> Thanks for bringing this to our attention.  Actually, it is a sentence
> fragment as part of:
>
>"... %d content before penalty with %d additional unhappy citizens."
>
> The noun "citizens" is implied after adjective "content", so you have both
> content and unhappy citizens, even should that be 1 content and 0 unhappy.
> In English, this would always be plural (multiple instances of citizens).
>
> Sentence fragments like this are virtually impossible to translate.
> Therefore, I divided it into two clauses, each is now on a separate line,
> and each can be plural (range 0-21):
>
>Cities: %d total, %d over threshold of %d cities.
>%d content before penalty.
>%d additional unhappy citizens.


Sorry. You are right that the previous sentence also needs to be
"pluralized", but I don't get why  they have to be moved to a separate
line.  They were already in separate strings, so they could be pluralized
independently. Can't we keep the "with"?

Moreover, nearly identical text appears in several different clients.
> These are all supposed to be in client/text.c, so I've moved this there,
> adding some TRANS comments.  Eventually, SDL and xaw should use this, too.


Very nice.

2008/1/18, William Allen Simpson <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=40025 >Thanks for bringing this to our attention.  Actually, it is a sentence
fragment as part of:   "... %d content before penalty with %d additional unhappy citizens."The noun "citizens" is implied after adjective "content", so you have bothcontent and unhappy citizens, even should that be 1 content and 0 unhappy.
In English, this would always be plural (multiple instances of citizens).Sentence fragments like this are virtually impossible to translate.Therefore, I divided it into two clauses, each is now on a separate line,
and each can be plural (range 0-21):   Cities: %d total, %d over threshold of %d cities.   %d content before penalty.   %d additional unhappy citizens.Sorry. You are right that the previous sentence also needs to be "pluralized", but I don't get why  they have to be moved to a separate line.  They were already in separate strings, so they could be pluralized independently. Can't we keep the "with"? 
Moreover, nearly identical text appears in several different clients.These are all supposed to be in client/text.c, so I've moved this there,
adding some TRANS comments.  Eventually, SDL and xaw should use this, too.Very nice. 
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#40049) Losing message is not shown

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40049 >

I have noticed lately that, for failed attacks, the usual message "Your
attacking whatever failed against the %s %s" doesn't appear. I don't see
why, because it even happens in squares that have other units (who should be
able to see the fight and "report" to the supreme leader).

I have checked both trunk and 2.1, and both seem to have this behaviour. I
have even tried an old saved game (from 2.0) with the same results. Is it on
purpose?

Joan

I have noticed lately that, for failed attacks, the usual message "Your attacking whatever failed against the %s %s" doesn't appear. I don't see why, because it even happens in squares that have other units (who should be able to see the fight and "report" to the supreme leader).
I have checked both trunk and 2.1, and both seem to have this behaviour. I have even tried an old saved game (from 2.0) with the same results. Is it on purpose?Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40049) Losing message is not shown

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40049 >

2008/1/26, Marko Lindqvist <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40049 >
>
>
> Have you checked that you have correct message display settings for
> this event ("Attack Failed")? I think that I had to fix it myself at
> some point.


Right on target. I don't remember ever changing that, though. Please, close
the ticket. I'm ashamed.

Joan

2008/1/26, Marko Lindqvist <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=40049 > Have you checked that you have correct message display settings for
this event ("Attack Failed")? I think that I had to fix it myself atsome point.Right on target. I don't remember ever changing that, though. Please, close the ticket. I'm ashamed.
Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#40054) Percentages in helpdata.c

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40054 >

I've noticed that, in the last remodelation of helpdata.c, for trunk and 2.2,
three strings which contained "50%%" have been changed to "50%". But two of
them are still flagged as c-format, and msgfmt doesn't like them ("The
format specifications of argument 1 in msgid and msgstr are not the same",
and "msgstr is not a valid conversion specifier").

The problematic strings are:
"* May be disbanded in a city to recover 50% of the production cost.\n"
"* May fortify, granting a 50% defensive bonus.\n"

How do you remove the c-format?

Joan

I've noticed that, in the last remodelation of helpdata.c, for trunk and 2.2, three strings which contained "50%%" have been changed to "50%". But two of them are still flagged as c-format, and msgfmt doesn't like them ("The format specifications of argument 1 in msgid and msgstr are not the same", and "msgstr is not a valid conversion specifier").
The problematic strings are:"* May be disbanded in a city to recover 50% of the production cost.\n""* May fortify, granting a 50% defensive bonus.\n"How do you remove the c-format?
Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40054) Percentages in client/helpdata.c

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40054 >

Yes, it's fixed now.

Joan

2008/1/28, William Allen Simpson <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40054 >
>
> Committed as part of trunk revision 14337.
> Committed as part of S2_2 revision 14338.
>
>

Yes, it's fixed now.Joan2008/1/28, William Allen Simpson <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=40054 >Committed as part of trunk revision 14337.Committed as part of S2_2 revision 14338.

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40025) Happiness plurals

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40025 >

I have been playing a game lately, and watching what happens as the size of
my empire increases. I believe this effect of additional unhappy citizens
didn't happen in 2.0 (at least, that would explain why, when I imported an
almost perfect saved game from 2.0 into 2.1, half my cities where in
turmoil).

I have reached 80 cities in democracy now, and I have more unhappy citizens
(5) than initial content citizens (4). I don't know whether this is a bug or
a feature, but William is right that the message should be more informative,
and perhaps the help texts should be improved, too.

What I would like to see here is some info about the total number of cities,
how many content citizens have cities by default, and a warning on when this
figure will change. Maybe something like:

40 cities, 10 above the limit of 30, 4 below 44. First 2 citizens content,
next 2 unhappy.

80 cities, on the limit of 80, 14 below 94. First 4 citizens unhappy, next 1
angry.

I'm not sure I have grasped the rule, though, and the figures are more or
less invented.

The only explanation I have found of this rule in the help texts is in some
governments, and in the help for the variables cityfactor and unhappysize.
It doesn't make much sense, though. My cityfactor is 14; however the help
for Democracy says "for each 16 additional cities another unhappy citizen
will appear."

Furthermore, for Communism there is no mention of this rule (why? all the
others have it)

Cheers,

Joan

2008/1/23, William Allen Simpson <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40025 >
>
> Committed S2_2 revision 14284.
> Committed trunk revision 14285.
>
> Still open awaiting win32 verification.
>
> Also hoping for better sentences for 2.2 and later.
>
>

I have been playing a game lately, and watching what happens as the size of my empire increases. I believe this effect of additional unhappy citizens didn't happen in 2.0 (at least, that would explain why, when I imported an almost perfect saved game from 2.0 into 2.1, half my cities where in turmoil).
I have reached 80 cities in democracy now, and I have more unhappy citizens (5) than initial content citizens (4). I don't know whether this is a bug or a feature, but William is right that the message should be more informative, and perhaps the help texts should be improved, too.
What I would like to see here is some info about the total number of cities, how many content citizens have cities by default, and a warning on when this figure will change. Maybe something like:40 cities, 10 above the limit of 30, 4 below 44. First 2 citizens content, next 2 unhappy.
80 cities, on the limit of 80, 14 below 94. First 4 citizens unhappy, next 1 angry.I'm not sure I have grasped the rule, though, and the figures are more or less invented.The only explanation I have found of this rule in the help texts is in some governments, and in the help for the variables cityfactor and unhappysize. It doesn't make much sense, though. My cityfactor is 14; however the help for Democracy says "for each 16 additional cities another unhappy citizen will appear."
Furthermore, for Communism there is no mention of this rule (why? all the others have it)Cheers,Joan2008/1/23, William Allen Simpson <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=40025 >Committed S2_2 revision 14284.Committed trunk revision 14285.Still open awaiting win32 verification.
Also hoping for better sentences for 2.2 and later.
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40025) Happiness plurals

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40025 >

2008/2/3, Christian Knoke <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40025 >
>
>
> This is in there since some time of 2.1. Something has been changed
> intendedly, I don't remember what it was.
>
> I have noticed this earlier and complained about. It is impossible
> now to grow large empires (with happiness), and it may be very hard to
> at least manage them.


It is indeed more challenging. By now, I am doing fine against the "hard"
IAs with 80 cities in democracy. I always build ports when I can, and lots
of Markets and trade routes. Michelangelo's and J.S. Bach's are essential,
of course. I could probably win soon by building the spaceship, but I'll try
to take over all the cities and see whether I can prevent revolutions.

Joan

2008/2/3, Christian Knoke <[EMAIL PROTECTED]>:
http://bugs.freeciv.org/Ticket/Display.html?id=40025 >This is in there since some time of 2.1. Something has been changedintendedly, I don't remember what it was.
I have noticed this earlier and complained about. It is impossiblenow to grow large empires (with happiness), and it may be very hard toat least manage them.It is indeed more challenging. By now, I am doing fine against the "hard" IAs with 80 cities in democracy. I always build ports when I can, and lots of Markets and trade routes. Michelangelo's and J.S. Bach's are essential, of course. I could probably win soon by building the spaceship, but I'll try to take over all the cities and see whether I can prevent revolutions.
Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40187) Configure fails in 2.1

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40187 >

It worked like a charm. Thanks

Joan

2008/4/5, Marko Lindqvist <[EMAIL PROTECTED]>:
>
>
> http://bugs.freeciv.org/Ticket/Display.html?id=40187 >
>
> On 05/04/2008, Joan Creus  wrote:
> >  ./configure: line 2074: syntax error near unexpected token
> `"  Copyright
> > (C)
> >  2004 Freeciv team   "'
> >  ./configure: line 2074: `FREECIV_VERSION_COMMENT("  Copyright (C) 2004
> >  Freeciv team   ")'
>
>   Can  you test if attached patch helps?
>
>
>
>   - ML
>
>
>

It worked like a charm. ThanksJoan2008/4/5, Marko Lindqvist <[EMAIL PROTECTED]>:
 http://bugs.freeciv.org/Ticket/Display.html?id=40187 >  On 05/04/2008, Joan Creus  wrote: >  ./configure: line 2074: syntax error near unexpected token `"  Copyright
 > (C) >  2004 Freeciv team   "' >  ./configure: line 2074: `FREECIV_VERSION_COMMENT("  Copyright (C) 2004 >  Freeciv team   ")'   Can  you test if attached patch helps?
    - ML  
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#40305) G++ not tested in autogen.sh

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40305 >

I can't build version 2.2, because g++ is not installed. The error message
is:

../../../../bootstrap/depcomp: line 470: exec: g++: not found
make[5]: *** [toluaxx.bind.o] Error 127

I can install g++, sure, but perhaps autogen.sh should have checked g++'s
existence before? Right now, autogen doesn't report any problems.

Joan

I can't build version 2.2, because g++ is not installed. The error message is:../../../../bootstrap/depcomp: line 470: exec: g++: not foundmake[5]: *** [toluaxx.bind.o] Error 127I can install g++, sure, but perhaps autogen.sh should have checked g++'s existence before? Right now, autogen doesn't report any problems.
Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40517) Can't load savegames in 2.2

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40517 >

2008/10/7 Egor Vyscrebentsov <[EMAIL PROTECTED]>

>
> http://bugs.freeciv.org/Ticket/Display.html?id=40517 >
>
>
> base_list (and therefore base_buf) for archers at [39,40] (line 1278)
> is "��x�ſ-�\017\b\214�ſ �\b��". Most of these symbols are illegal.
>
> What are your system/encoding?


It's a kubuntu 8.04, up-to date, on an Acer Travelmate 290. My encoding is
ca_ES.UTF-8.

>
> Is there a previous savegame that loads normally?


This was the first time I was playing 2.2. No game saved under 2.2 can be
loaded, neither by 2.2 or 2.1. 2.2 can't load any savegame, even the ones
created under 2.1 that can be loaded by 2.1. Furthermore, there's one file
that generates that series of popups.

>
>
> activity_list for same unit is "". Wonder if this was one more
> out-of-pointer'ing?
>
> Phalanx at [45,45] (line 1279) has the same problems. Looks like these
> units are the only that have base_list and activity_list differ from '-'.
>
> orders_list and dir_list also look strange.
>

It looks like the problem my be in the saving rather than in the loading?


>
> Error message may be improved. I guess that telling wrong
> element/line of savegame might be useful when working with
> scenario.


Well, this is not supposed to happen when the game is released, right? I
wouldn't worry about this too much.

Thanks,

Joan

2008/10/7 Egor Vyscrebentsov <[EMAIL PROTECTED]>

http://bugs.freeciv.org/Ticket/Display.html?id=40517 >


base_list (and therefore base_buf) for archers at [39,40] (line 1278)
is "��x�ſ-�\017\b\214�ſ �\b��". Most of these symbols are illegal.

What are your system/encoding?It's a kubuntu 8.04, up-to date, on an Acer Travelmate 290. My encoding is ca_ES.UTF-8.

Is there a previous savegame that loads normally? This was the first time I was playing 2.2. No game saved under 2.2 can be loaded, neither by 2.2 or 2.1. 2.2 can't load any savegame, even the ones created under 2.1 that can be loaded by 2.1. Furthermore, there's one file that generates that series of popups.


activity_list for same unit is "". Wonder if this was one more
out-of-pointer'ing?

Phalanx at [45,45] (line 1279) has the same problems. Looks like these
units are the only that have base_list and activity_list differ from '-'.

orders_list and dir_list also look strange.
It looks like the problem my be in the saving rather than in the loading? 

Error message may be improved. I guess that telling wrong
element/line of savegame might be useful when working with
scenario. Well, this is not supposed to happen when the game is released, right? I wouldn't worry about this too much. Thanks,    Joan
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40517) Can't load savegames in 2.2

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40517 >

I have applied the patch, and started a new game. It didn't make any
difference, and I still couldn't load any of the saved files.

Then I have started ./civ with the --log option, and the problem was in
fact:

3: Could not find readable file
"/home/joanc/.freeciv/saves/anemdeconya.sav..sav" in data path.
3: Could not find readable file
"/home/joanc/.freeciv/saves/anemdeconya.sav..sav.gz" in data path.

So most of the problem is really the way the filename to open gets
generated. Your patch may still fix the problem that generated all the
popups, I suppose.

Thanks,

Joan


2008/10/9 Egor Vyscrebentsov <[EMAIL PROTECTED]>

>
> http://bugs.freeciv.org/Ticket/Display.html?id=40517 >
>
> On Thu, 9 Oct 2008 Egor Vyscrebentsov wrote:
> > On Thu, 9 Oct 2008 Egor Vyscrebentsov wrote:
> >
> > > Quickest (not the best) fix is
> > >
> > > -  } else if (base_buf) {
> > > +  } else if (base_buf && base_buf[j] != '?') {
> > >
> > > at server/savegame.c:1862
> >
> > After some thoughts I've decided that this fix is proper.
>
> And after some more thoughts I've decided opposite...
> Patch with more or less accurate workaround is attached.
>
> There should be some action after each of two added LOG_ERRORs.
> One variant is to abort civserver. Opinions?
>
> --
> Thanks, evyscr
>
>

I have applied the patch, and started a new game. It didn't make any difference, and I still couldn't load any of the saved files.Then I have started ./civ with the --log option, and the problem was in fact:
3: Could not find readable file "/home/joanc/.freeciv/saves/anemdeconya.sav..sav" in data path.3: Could not find readable file "/home/joanc/.freeciv/saves/anemdeconya.sav..sav.gz" in data path.
So most of the problem is really the way the filename to open gets generated. Your patch may still fix the problem that generated all the popups, I suppose.Thanks,Joan
2008/10/9 Egor Vyscrebentsov <[EMAIL PROTECTED]>

http://bugs.freeciv.org/Ticket/Display.html?id=40517 >

On Thu, 9 Oct 2008 Egor Vyscrebentsov wrote:
> On Thu, 9 Oct 2008 Egor Vyscrebentsov wrote:
>
> > Quickest (not the best) fix is
> >
> > -          } else if (base_buf) {
> > +          } else if (base_buf && base_buf[j] != '?') {
> >
> > at server/savegame.c:1862
>
> After some thoughts I've decided that this fix is proper.

And after some more thoughts I've decided opposite...
Patch with more or less accurate workaround is attached.

There should be some action after each of two added LOG_ERRORs.
One variant is to abort civserver. Opinions?

--
Thanks, evyscr


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40305) G++ not tested in autogen.sh

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40305 >

I have uninstalled g++, applied the patch, called make, and now the checks
warn of the missing compiler. Here is the relevant output:

checking for gawk... (cached) mawk
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking how to run the C preprocessor... gcc -E
checking for g++... no
checking for c++... no
checking for gpp... no
checking for aCC... no
checking for CC... no
checking for cxx... no
checking for cc++... no
checking for cl.exe... no
checking for FCC... no
checking for KCC... no
checking for RCC... no
checking for xlC_r... no
checking for xlC... no
checking whether we are using the GNU C++ compiler... no
checking whether g++ accepts -g... no
checking dependency style of g++... none
checking whether the C++ compiler works... no
configure: error: no acceptable C++ compiler found in $PATH
See `config.log' for more details.
make: *** [config.status] Error 1

Thanks a lot!

Joan

2009/3/4 Christian Prochaska 

>
> http://bugs.freeciv.org/Ticket/Display.html?id=40305 >
>
> > [joan.cr...@gmail.com - Sun Jun 22 15:36:48 2008]:
> >
> > I can't build version 2.2, because g++ is not installed. The error
> message
> > is:
> >
> > ../../../../bootstrap/depcomp: line 470: exec: g++: not found
> > make[5]: *** [toluaxx.bind.o] Error 127
> >
> > I can install g++, sure, but perhaps autogen.sh should have checked g++'s
> > existence before? Right now, autogen doesn't report any problems.
> >
> > Joan
> >
> >
>
> Patch attached.
>
> AC_PROG_CXX does not abort when no C++ compiler is found, it just sets
> CXX to "g++" in this case. So a separate check is needed.
>
>

I have uninstalled g++, applied the patch, called make, and now the checks warn of the missing compiler. Here is the relevant output:checking for gawk... (cached) mawkchecking for gcc... (cached) gccchecking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yeschecking for gcc option to accept ISO C89... (cached) none neededchecking dependency style of gcc... (cached) gcc3checking how to run the C preprocessor... gcc -E
checking for g++... nochecking for c++... nochecking for gpp... nochecking for aCC... nochecking for CC... nochecking for cxx... nochecking for cc++... nochecking for cl.exe... nochecking for FCC... no
checking for KCC... nochecking for RCC... nochecking for xlC_r... nochecking for xlC... nochecking whether we are using the GNU C++ compiler... nochecking whether g++ accepts -g... nochecking dependency style of g++... none
checking whether the C++ compiler works... noconfigure: error: no acceptable C++ compiler found in $PATHSee `config.log' for more details.make: *** [config.status] Error 1Thanks a lot!Joan
2009/3/4 Christian Prochaska 

http://bugs.freeciv.org/Ticket/Display.html?id=40305 >

> [joan.cr...@gmail.com - Sun Jun 22 15:36:48 2008]:
>
> I can't build version 2.2, because g++ is not installed. The error message
> is:
>
> ../../../../bootstrap/depcomp: line 470: exec: g++: not found
> make[5]: *** [toluaxx.bind.o] Error 127
>
> I can install g++, sure, but perhaps autogen.sh should have checked g++'s
> existence before? Right now, autogen doesn't report any problems.
>
> Joan
>
>

Patch attached.

AC_PROG_CXX does not abort when no C++ compiler is found, it just sets
CXX to "g++" in this case. So a separate check is needed.


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#40744) Slight error in new strings

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40744 >

This transaction appears to have no content
While updating my translation, I have noticed that a few new strings in
text.c had a double singular/plural form, but the plural one was the same as
the singular.

The sentences were about "%d turns cease-fire"

Patch included, in case you feel it should be committed. Freeciv.pot should
be updated, too.

Joan
While updating my translation, I have noticed that a few new strings in text.c had a double singular/plural form, but the plural one was the same as the singular.The sentences were about "%d turns cease-fire"
Patch included, in case you feel it should be committed. Freeciv.pot should be updated, too.Joan
Index: text.c
===
--- text.c	(revision 15569)
+++ text.c	(working copy)
@@ -184,7 +184,7 @@
  * ( turn cease-fire)" */
 astr_add_line(&str,
   PL_("Territory of %s (%s) (%d turn cease-fire)",
-  "Territory of %s (%s) (%d turn cease-fire)",
+  "Territory of %s (%s) (%d turns cease-fire)",
   turns),
   username, nation, turns);
   } else {
@@ -222,7 +222,7 @@
 /* TRANS:  "City:  | 
  * (,  turn cease-fire)" */
 astr_add_line(&str, PL_("City: %s | %s (%s, %d turn cease-fire)",
-"City: %s | %s (%s, %d turn cease-fire)",
+"City: %s | %s (%s, %d turns cease-fire)",
 turns),
   city_name(pcity), username, nation, turns);
   } else {
@@ -303,7 +303,7 @@
 /* TRANS:  "Unit:  |  (,
  *  turn cease-fire)" */
 astr_add_line(&str, PL_("Unit: %s | %s (%s, %d turn cease-fire)",
-"Unit: %s | %s (%s, %d turn cease-fire)",
+"Unit: %s | %s (%s, %d turns cease-fire)",
 turns),
   utype_name_translation(ptype),
   username, nation, turns);
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40744) Slight error in new strings

[Joan Creus]

http://bugs.freeciv.org/Ticket/Display.html?id=40744 >

You're right. If you consider %d turn as a determinant to cease-fire, it
makes grammatical sense, and the PL_ is good for languages such as mine.

OK, then.
Joan
2009/3/8 Madeline Book 

>
> http://bugs.freeciv.org/Ticket/Display.html?id=40744 >
>
> > [book - Sat Mar 07 20:30:02 2009]:
> >
> > > [joan.cr...@gmail.com - Sat Mar 07 18:28:20 2009]:
> > >
> > > While updating my translation, I have noticed that a few
> > > new strings in text.c had a double singular/plural form,
> > > but the plural one was the same as the singular.
> > >
> > > The sentences were about "%d turns cease-fire"
> > >
> > > Patch included, in case you feel it should be
> > > committed. Freeciv.pot should be updated, too.
> >
> > Thanks for noticing the typos and making a patch. I must
> > have made the mistakes when copying the new code; I'll
> > commit your fix as soon as possible.
>
> I checked the original (before my recent popit text patch)
> and it too had "N turn cease-fire" (N > 1). I think in
> English saying "5 turn cease-fire" is grammatically fine,
> at least I gather as much from my gut instinct. I assume
> the reason this string was wrapped in PL_() was for other
> languages for which some part of the phrase might need to
> be modified for N > 1.
>
> So unless someone can convince me that indeed "5 turns
> cease-fire" is more correct according to some rule of
> English grammar, I will keep the current strings as they
> are.
>
>
> ---
> 文法屋が町を出たという噂を聞きましたか。
>

You're right. If you consider %d turn as a determinant to cease-fire, it makes grammatical sense, and the PL_ is good for languages such as mine.
 
OK, then. 
Joan
2009/3/8 Madeline Book 
http://bugs.freeciv.org/Ticket/Display.html?id=40744 >
> [book - Sat Mar 07 20:30:02 2009]:>> > [joan.cr...@gmail.com - Sat Mar 07 18:28:20 2009]:> >> > While updating my translation, I have noticed that a few
> > new strings in text.c had a double singular/plural form,> > but the plural one was the same as the singular.> >> > The sentences were about "%d turns cease-fire"> >
> > Patch included, in case you feel it should be> > committed. Freeciv.pot should be updated, too.>> Thanks for noticing the typos and making a patch. I must> have made the mistakes when copying the new code; I'll
> commit your fix as soon as possible.I checked the original (before my recent popit text patch)and it too had "N turn cease-fire" (N > 1). I think inEnglish saying "5 turn cease-fire" is grammatically fine,
at least I gather as much from my gut instinct. I assumethe reason this string was wrapped in PL_() was for otherlanguages for which some part of the phrase might need tobe modified for N > 1.So unless someone can convince me that indeed "5 turns
cease-fire" is more correct according to some rule ofEnglish grammar, I will keep the current strings as theyare.---文法屋が町を出たという噂を聞きましたか。

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [patch #1238] Add nation: Toulousain

[Joan Creus]

Follow-up Comment #2, patch #1238 (project freeciv):

I am not Occitan, nor an expert in Occitan history, but I think this ruleset
has a few problems:

- The county of Toulouse was one of several independent counties and duchies
that existed in today's southern France. They shared a common language, but
were never united under a single ruler. Some counties were intertwined with
each other as fiefs, so this complicates the issue a little more. So, Foix
and Carcasonne, although technically fiefs of Toulouse, were also "de facto"
independent, quite powerful (and even waged war on Toulouse).

- So, I would remove cities like Foix, and several villages around Foix, as
well as Carcasonne.

- The names of the rulers are incorrect. If given in French, they should be
Raymond; in Occitan, they should be Raimon; the women should be Felipa and
Joana.

- Some cities do not belong at all here, not even as Occitan. Perpignan
wasn't French until 1659, and belonged to the Kingdom of Catalonia-Aragon
during all the Medieval period. Also, there are several "Prades" in the area,
but the largest one is also Catalan. (There is a Prades near Foix, but it's
only got 50 inhabitants) I haven't found a "Carol", but if it means "La
Tour-de-Carol", that is also Catalan.

- The ruleset uses the current official names of the cities, in French. I
think that we should respect the original names, in Occitan: Tolosa,
Montpelhièr, Besièrs, Cassanhas, ... At least, this is how they were called
in the heyday of the Occitan counties.

In short, if this ruleset is to be "just Toulousain", it should use only
cities that had belonged to the County of Toulouse. If we keep the list, then
most of them (and a few rulers) could be merged with the Occitan ruleset. 

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [patch #1238] Add nation: Toulousain

[Joan Creus]

Follow-up Comment #4, patch #1238 (project freeciv):

I agree that it's hard to define the boundaries of these counties. In fact,
the map of the County of Toulouse shown in the French wikipedia shows the
county of Roussillon as part of the county of Toulouse in 1154. I have found
no other source that confirms this. As far as I know, it was an independent
county that became part of the kingdom of Aragon in 1172. Before the formal
annexion, it had been the birthplace of the first Catalan count, and that's
why it's always considered Catalan. This goes for Perpignan. But the Prades
you mention is indeed Occitan.

Daniel is the expert, here, but I believe that, for non-modern nations, it's
OK in Freeciv to include cities that have been part of the empire at some
point in time.

I agree that it would be a good thing to include some women as rulers. I am
not sure that Joana is considered a "good" queen for Occitans,though, since
she is the one that "sold out" to the French King. If we expand the scope to
all the Occitan counties and duchies, there is another excellent candidate,
though: Alienòr d'Aquitània (Eleanor of Aquitaine), who must have been an
extraordinary woman, who actually ruled as a duchess of Aquitaine, became
Queen of France, divorced, married an English prince and became the mother of
two English Kings (Richard the Lionheart and John Lackland). During her
extremely long rule as Duchess (from the age of 15 until her death at 82) she
had a very important role in European politics.

So, if you want to add rulers or cities to the Occitan ruleset, feel free. Or
I can do it for you, as you like.

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #14813] Several typos in options.c

[Joan Creus]

URL:
  

 Summary: Several typos in options.c
 Project: Freeciv
Submitted by: jcreus
Submitted on: Saturday 11/21/09 at 15:16
Category: client
Severity: 2 - Minor
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.2
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 2.2.0

___

Details:

I have found a few mistakes in the new options for 2.2.

I am including a diff file with my corrections.



___

File Attachments:


---
Date: Saturday 11/21/09 at 15:16  Name: options.diff  Size: 4kB   By: jcreus



___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #14814] Typos in help and in some server files

[Joan Creus]

URL:
  

 Summary: Typos in help and in some server files
 Project: Freeciv
Submitted by: jcreus
Submitted on: Saturday 11/21/09 at 15:46
Category: general
Severity: 2 - Minor
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.2
 Discussion Lock: Any
Operating System: None
 Planned Release: 2.2.0

___

Details:

This is my last typo submission (at least, for a while). I am including
corrections which I'm not much sure of.

In client/helpdata.c, there's a strange sentence about a requirement to play
a given nation; also, I don't think the word "you" should be capitalized in
the help system.

Also, in the server/commands.c file, the "reset" command shouldn't be
translated. Right now, it's asking to, and this may confuse translators.

Finally, in server/stdinhand.c, I think the verb tense in that sentence
should be Present Perfect, instead of Simple Past.



___

File Attachments:


---
Date: Saturday 11/21/09 at 15:46  Name: helpdata.c.diff  Size: 1kB   By:
jcreus


---
Date: Saturday 11/21/09 at 15:46  Name: stdinhand.c.diff  Size: 426B   By:
jcreus


---
Date: Saturday 11/21/09 at 15:46  Name: commands.c.diff  Size: 817B   By:
jcreus



___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #14813] Several typos in options.c

[Joan Creus]

Follow-up Comment #2, bug #14813 (project freeciv):

You are right. I have deleted the old patch and I am including an up-to-date
one.

(file #7360)
___

Additional Item Attachment:

File name: options2.diff  Size:3 KB


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #14814] Typos in help and in some server files

[Joan Creus]

Follow-up Comment #7, bug #14814 (project freeciv):

Looks good to me. With this patch the translation of commands gets settled
for good.

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #14898] Copy/paste typo in helpdata

[Joan Creus]

URL:
  

 Summary: Copy/paste typo in helpdata
 Project: Freeciv
Submitted by: jcreus
Submitted on: Monday 12/07/09 at 16:02
Category: docs
Severity: 2 - Minor
Priority: 3 - Low
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 2.2.0

___

Details:

In the help for links to units in the chat window there is a reference to
cities, probably because it's been pasted from the previous lines.

I am including a patch.



___

File Attachments:


---
Date: Monday 12/07/09 at 16:02  Name: helpdata.diff  Size: 563B   By: jcreus



___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #14898] Copy/paste typo in helpdata

[Joan Creus]

Follow-up Comment #1, bug #14898 (project freeciv):

Now that we are at it, how can you get the id of a city or a unit?

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15001] map generator does not honor temperature setting

[Joan Creus]

Follow-up Comment #4, bug #15001 (project freeciv):

I can confirm that the map generation is acting strange. I am playing a world
with the default settings (as far as I know, the generation method is 1), and
I have jungles right beside the poles. The mean temperature setting is 50. In
2.1, this resulted in normal polar areas, with tundra and forests.

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected

[Joan Creus]

URL:
  

 Summary: Trade route revenue lower than expected
 Project: Freeciv
Submitted by: jcreus
Submitted on: Sunday 01/10/10 at 14:40
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.2 beta 2
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 2.2

___

Details:

I am playing a game against cheating AIs. I have noticed that all my trade
routes give a revenue of 2 or lower. For instance, a trade route between two
cities with 39 and 21 trade points, on different continents, half a world
apart, gives only 2 points. According to the formula in
http://freeciv.wikia.com/wiki/Trade_route_revenue#Trade that should be 8
(39+21+4)/8

I am attaching a savegame. There are lots of trade routes, but you may look
at the ones in Montserrat, on a small island north of the Catalan nation.



___

File Attachments:


---
Date: Sunday 01/10/10 at 14:40  Name: creix.sav.gz  Size: 84kB   By: jcreus
Savegame showing low-revenue trade routes


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15093] Hut messages not localized

[Joan Creus]

URL:
  

 Summary: Hut messages not localized
 Project: Freeciv
Submitted by: jcreus
Submitted on: Sunday 01/10/10 at 15:28
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.2 beta 2
 Discussion Lock: Any
Operating System: None
 Planned Release: 2.2

___

Details:

I have noticed that the messages you get when exploring a hut are not
translated. In most .po files, the strings still exist, but they have been
commented out.

These strings are defined in data/default/default.lua, but this file doesn't
appear in the Makefile, or in POTFILES.in

It would be interesting to make un update-po after fixing POTFILES.in, so
most translations will be recovered.

Patch attached.



___

File Attachments:


---
Date: Sunday 01/10/10 at 15:28  Name: potfiles.diff  Size: 362B   By: jcreus



___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15094] Small typo in server/commands.c

[Joan Creus]

URL:
  

 Summary: Small typo in server/commands.c
 Project: Freeciv
Submitted by: jcreus
Submitted on: Sunday 01/10/10 at 15:33
Category: None
Severity: 2 - Minor
Priority: 1 - Later
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.2 beta 2
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 2.2

___

Details:

There is a space missing in the server options help text. Patch attached.



___

File Attachments:


---
Date: Sunday 01/10/10 at 15:33  Name: commands.diff  Size: 622B   By: jcreus
diff file


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected

[Joan Creus]

Follow-up Comment #3, bug #15092 (project freeciv):

With this algorithm, in one of the routes, the distance is about 30, city
sizes are 11 and 6, and they are both mine. So, we get (30+11+6)/16 = 2.93. I
get 2 revenue. Damn, at least we could round it up!

This is one major change. It's a lot harder to make cities celebrate. Plus,
trade route revenue doesn't depend on how "commercial" a city is or on which
continent they are. Is this the goal? Were trade routes too advantageous to
humans over AIs?

I see that the change was done in March 2007, but there wasn't much
discussion about its chilling effects on world trade. Maybe it's time to
debate it now? My opinion is that it's too drastic, and most other users will
complain loudly. At least, we should change the division factor from 16 to 8
or more. It will still be half of what it used to be, but right now, making
trade routes is not that attractive any more.

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected

[Joan Creus]

Follow-up Comment #5, bug #15092 (project freeciv):

I think in this case, the same-player quality cancels out the
different-continent, so it would be (30+11+6)/8 = 5,87. If we round it
instead of truncating, a 6. It would be lower than usual, but this is OK. I
think trade routes are possibly too much of an advantage.

Anyway, I think this issue has strong effects on gameplay and deserves some
more feedback from the community. Any more opinions?

One more question: will trade route revenues get updated as cities grow?

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected

[Joan Creus]

Follow-up Comment #8, bug #15092 (project freeciv):

In 2.1, it is already difficult to rapture on your own island. I think that
distance should be a major factor in the revenue of a given trade route. It
already is for the initial payout, isn't it?

Anyway, from what I've seen, the goal of this change wasn't to decrease the
power of Caravans: it looks like this reduction is the unintended side-effect
of a change that intended to simplify trade computations and savegame
complexity, breaking the circularity of having trade depend on trade routes
and trade routes depend on trade.

So, the challenge is to come up with a formula that doesn't use trade as an
input, and gets a similar result to the old one. The old formula is basically
(Trade1+Trade2+4)/16. This is doubled if cities are in different continents,
and/or if cities belong to different players.

Pepeto's proposal could be seen as an approximation of the old formula, if we
think that trade is twice the size of the city. Then (Trade1+Trade2)/16 ~
2*(Size1+Size2)/16 = (size1+size2)/8.

The big difference is that other trade routes don't influence the final
result, so they don't multiply. To compensate for that, we add the
distance_between_cities parameter.

I think it's good enough. Sure, at the beginning of the game on a single
island, trade routes won't amount to much, but as game progresses, if you get
a good railroad and transport network, the distance parameter may shoot up,
resulting in astronomic revenues.

Since we are in a beta, we might as well try it, and keep an eye on it,
listen to feedback, and perhaps change it again before the final release
(perhaps the distance_between_cities parameter should be divided by 16
instead of 8, I don't know).

We should always check that the revenue is at least 1, to prevent short trade
routes from giving 0 revenue.

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected

[Joan Creus]

Follow-up Comment #12, bug #15092 (project freeciv):

The bonus for trade routes spanning different empires has always been there,
and for a good reason: if both cities belong to you, each city gets half the
revenue, but the empire gets it twice. So, yes, if you lose a city, the trade
for the remaining city will double (but you will lose all the trade from the
other).

The bonus for different continents has also been there forever, and it
reflects the added difficulty of having to carry the caravan overseas. It
does have an historical analogy: think the Silk Route or the gold trade with
America. Trade with other continents brings more valuable stuff and traders
get richer.

As for the factor of 6 vs. 8, we should really do some simulations and choose
whatever is closer to 2.1. Do you really ever get 5 revenue on the same island
in 2.1, even in large islands? I'm afraid that, as game progresses, and trade
routes span really large distances, we will have absurdly large revenues if
the division factor is too low.

I would start with 8 in beta 3, and perhaps try 6 in beta 4, then take a
final decision before release. This will give my empire a much-needed
economic boost in its war against cheating AIs :-).

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15092] Trade route revenue lower than expected

[Joan Creus]

Follow-up Comment #14, bug #15092 (project freeciv):

I have tested the patch and it works just fine. Up to now the best trade
route I had was 3 and it became 9. Other intercontinental trade routes range
between 5 and 8. Good for me.

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15324] Line feed not escaped in help text

[Joan Creus]

URL:
  

 Summary: Line feed not escaped in help text
 Project: Freeciv
Submitted by: jcreus
Submitted on: Tuesday 02/09/10 at 23:05
Category: general
Severity: 3 - Normal
Priority: 3 - Low
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.2.0beta
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 2.2.0

___

Details:

A backslash is missing at the end of a line, which makes the string
incomplete, in helpdata.txt

Patch included.



___

File Attachments:


---
Date: Tuesday 02/09/10 at 23:05  Name: helpdata.diff  Size: 540B   By: jcreus
Patch suggested


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15890] Typo in settings.c

[Joan Creus]

URL:
  

 Summary: Typo in settings.c
 Project: Freeciv
Submitted by: jcreus
Submitted on: Friday 04/16/10 at 22:43
Category: None
Severity: 2 - Minor
Priority: 3 - Low
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.2.0
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

In one of the new help texts, there is a "non" instead of "none".
Furthermore, careful is spelt with two l's.

There is also a plural form after "none". There are lots of discussions
concerning this last plural form, but it seems that formal English requires
singular (although many speakers will use plural informally). See
http://forum.wordreference.com/showthread.php?t=91606

Patch attached.



___

File Attachments:


---
Date: Friday 04/16/10 at 22:43  Name: settings.diff  Size: 837B   By: jcreus
Patch suggested


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16374] Typos in

[Joan Creus]

URL:
  

 Summary: Typos in 
 Project: Freeciv
Submitted by: jcreus
Submitted on: Friday 08/06/10 at 20:57
Category: general
Severity: 3 - Normal
Priority: 3 - Low
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: trunk
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

I have found a few typos while translating. Most are invalid plurals, and
also a non-capitalized Freeciv.

Patches attached for trunk (these strings don't appear in 2.2).



___

File Attachments:


---
Date: Friday 08/06/10 at 20:57  Name: settings.diff  Size: 3kB   By: jcreus
Patches proposed

---
Date: Friday 08/06/10 at 20:57  Name: techtools.diff  Size: 991B   By: jcreus
Patches proposed

---
Date: Friday 08/06/10 at 20:57  Name: stdinhand.diff  Size: 762B   By: jcreus
Patches proposed


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16374] Typos in

[Joan Creus]

Additional Item Attachment, bug #16374 (project freeciv):

File name: all.diff   Size:4 KB


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16401] Typos, mostly in new nations

[Joan Creus]

URL:
  

 Summary: Typos, mostly in new nations
 Project: Freeciv
Submitted by: jcreus
Submitted on: Tuesday 08/10/10 at 20:26
Category: general
Severity: 3 - Normal
Priority: 3 - Low
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

I have found a few more typos. One seems to be a forgotten "because" in
edithand.c (it used to be there in 2.2), and the others are several mistakes
in nation legends. I have taken the liberty to replace "situated" by
"located" in the cypriot ruleset. I am not a native English speaker, but
"situated" sounds like a literal translation from some romance language.

Only one mistake is in 2.2; the rest are just for trunk.

I am including three separate patches: one for server/edithand.c, another for
the trunk rulesets and the other for the laotian ruleset in 2.2.





___

File Attachments:


---
Date: Tuesday 08/10/10 at 20:26  Name: edithand.diff  Size: 520B   By: jcreus
Patches

---
Date: Tuesday 08/10/10 at 20:26  Name: laotian.diff  Size: 575B   By: jcreus
Patches

---
Date: Tuesday 08/10/10 at 20:26  Name: nations.diff  Size: 4kB   By: jcreus
Patches


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16514] Several typos detected

[Joan Creus]

URL:
  

 Summary: Several typos detected
 Project: Freeciv
Submitted by: jcreus
Submitted on: Sunday 08/22/10 at 13:28
Category: general
Severity: 2 - Minor
Priority: 3 - Low
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: trunk
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

I have found a few more typos during translation, mostly in new nations, and
one in the client options.

Everything is in trunk; 2.2 is not affected.

Patches attached.



___

File Attachments:


---
Date: Sunday 08/22/10 at 13:28  Name: nations.diff  Size: 3kB   By: jcreus
Patches for trunk

---
Date: Sunday 08/22/10 at 13:28  Name: options.diff  Size: 839B   By: jcreus
Patches for trunk


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16543] Grammar mistake

[Joan Creus]

URL:
  

 Summary: Grammar mistake
 Project: Freeciv
Submitted by: jcreus
Submitted on: Thursday 08/26/10 at 15:59
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

I have found a grammar mistake in options.c, both in trunk and in 2.2.

If the string freeze is not final, can we squeeze it into 2.2.3?

Patches attached.



___

File Attachments:


---
Date: Thursday 08/26/10 at 15:59  Name: options.diff  Size: 750B   By: jcreus
Patches for 2.2 and trunk

---
Date: Thursday 08/26/10 at 15:59  Name: optionstrunk.diff  Size: 752B   By:
jcreus
Patches for 2.2 and trunk


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16662] Some more string corrections

[Joan Creus]

URL:
  

 Summary: Some more string corrections
 Project: Freeciv
Submitted by: jcreus
Submitted on: Tuesday 09/07/10 at 21:18
Category: None
Severity: 2 - Minor
Priority: 4
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

I have found a few more typos, grammar and punctuation mistakes, mostly in
the new batch of nations, but also in the server settings.

In the case of the Crimean Tatars, I don't like my own proposal very much.
Perhaps a full rewrite should be better.

Patches attached, just for trunk. 2.2 is not affected.



___

File Attachments:


---
Date: Tuesday 09/07/10 at 21:18  Name: nations.diff  Size: 5kB   By: jcreus
Patches for trunk

---
Date: Tuesday 09/07/10 at 21:18  Name: settings.diff  Size: 698B   By: jcreus
Patches for trunk


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16750] Visigothic nation breaks freeciv.pot

[Joan Creus]

URL:
  

 Summary: Visigothic nation breaks freeciv.pot
 Project: Freeciv
Submitted by: jcreus
Submitted on: Thursday 09/23/10 at 18:28
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

The Monarchy name for the visigothic nation (on line 40) contains a strange
character that breaks the compilation of freeciv.pot.




___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16662] Some more string corrections

[Joan Creus]

Follow-up Comment #2, bug #16662 (project freeciv):

I am adding a few more corrections for new nations.

(file #10427)
___

Additional Item Attachment:

File name: morenations.diff   Size:6 KB


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16799] String in freeciv.pot can't be translated

[Joan Creus]

URL:
  

 Summary: String in freeciv.pot can't be translated
 Project: Freeciv
Submitted by: jcreus
Submitted on: Saturday 10/02/10 at 10:56
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: trunk
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

The new string (generated after the recent string split in trunk) 
"Under Despotism the city containing the palace gains a +75% production
bonus, and under Monarchy a +50% production bonus." 
contains the percent sign, but lacks the no-c-format directive, which
confuses gettext.

Patch attached.



___

File Attachments:


---
Date: Saturday 10/02/10 at 10:56  Name: buildings.diff  Size: 599B   By:
jcreus
Patch for buildings.diff


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16799] String in freeciv.pot can't be translated

[Joan Creus]

Follow-up Comment #2, bug #16799 (project freeciv):

Two more rulesets? Only the default one is in POTFILES.in, though.

Perhaps we should add the multiplayer and experimental stuff in POTFILES.in?

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16878] Some strings can't be translated

[Joan Creus]

URL:
  

 Summary: Some strings can't be translated
 Project: Freeciv
Submitted by: jcreus
Submitted on: Saturday 10/16/10 at 23:21
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: trunk
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

The buildings.ruleset in experimental and multiplayer have a few strings with
percent signs that lack the no-c-format directive.

The attached patch also corrects a frequent typo in "continent".



___

File Attachments:


---
Date: Saturday 10/16/10 at 23:21  Name: cformat.diff  Size: 2kB   By: jcreus
Patch for experimental and multiplayer rulesets


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16881] Sundry corrections, mostly in new nations

[Joan Creus]

URL:
  

 Summary: Sundry corrections, mostly in new nations
 Project: Freeciv
Submitted by: jcreus
Submitted on: Sunday 10/17/10 at 10:32
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: trunk
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

I have found a few more typos and grammar mistakes, mostly in new nations.

I have also removed the ^M's in the teutonic ruleset, which makes it hard to
find the corrections. The fix is "Franconia" for "Franconian", and the
removal of the space after "Baden-".

Patch attached.



___

File Attachments:


---
Date: Sunday 10/17/10 at 10:32  Name: nations.diff  Size: 15kB   By: jcreus
Corrections patch


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16881] Sundry corrections, mostly in new nations

[Joan Creus]

Follow-up Comment #1, bug #16881 (project freeciv):

In the southamerican ruleset, the female title for "Comandante" should be
"Comandanta" instead of "Comananta".

(file #10815)
___

Additional Item Attachment:

File name: southam.diff   Size:1 KB


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16884] What is a Quincy, anyway?

[Joan Creus]

Update of bug #16884 (project freeciv):

Severity:  3 - Normal => 1 - Wish   


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16884] What is a Quincy, anyway?

[Joan Creus]

URL:
  

 Summary: What is a Quincy, anyway?
 Project: Freeciv
Submitted by: jcreus
Submitted on: Sunday 10/17/10 at 17:11
Category: None
Severity: 3 - Normal
Priority: 3 - Low
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

The multiplayer ruleset has a lot of team names, and they are supposed to be
translated. The theme for the names is "colors", and some of them are quite
unusual (Xanadu!), but, hey, that's what Google is for.

One of them beats me, though: Quincy.

Am I missing something? Can someone add a translator note, or just remove it?




___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16894] Non-ASCII string at mordvin.ruleset

[Joan Creus]

Follow-up Comment #2, bug #16894 (project freeciv):

Just for the record, I have done an octal dump of the file, and the "c" at
the word "Finnic" was in fact characters 0xD1 and 0x81 (the octal dump
translated them as a capital Q and a  character which is what you get if
you drop the high order bit).

Strange what some keyboards can do.

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16896] Indonesian ordinal numbers

[Joan Creus]

Follow-up Comment #7, bug #16896 (project freeciv):

Pepeto's solution works for Indonesian (you would translate all strings like
"%sst", "%snd",... as "ke-%s"), but, as he points out, it will be hard to
accomodate all languages, and the current coding is English-centric. Catalan
is similar to French, but we have 1 to 4 as special cases.

Probably the only way around that will suit most languages is the "ranked %d"
approach, as coded in Daniel's patch.

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #17034] Several typos in nations and settings

[Joan Creus]

URL:
  

 Summary: Several typos in nations and settings
 Project: Freeciv
Submitted by: jcreus
Submitted on: Sunday 11/07/10 at 19:05
Category: None
Severity: 2 - Minor
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: trunk
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

I have found a few typographic errors in new nations. The only remarkable
change is in the uzbek ruleset, where I have changed ancestors to
descendants. I think it makes more sense.



___

File Attachments:


---
Date: Sunday 11/07/10 at 19:05  Name: typos.diff  Size: 5kB   By: jcreus
Corrections patch


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #17078] Corrections to the celtiberian ruleset

[Joan Creus]

URL:
  

 Summary: Corrections to the celtiberian ruleset
 Project: Freeciv
Submitted by: jcreus
Submitted on: Sunday 11/14/10 at 13:51
Category: None
Severity: 3 - Normal
Priority: 3 - Low
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.3, trunk
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

I think the celtiberians shouldn't be described as coming from Eastern Spain.
See http://en.wikipedia.org/wiki/File:Ethnographic_Iberia_200_BCE.PNG. They
lived in Central Spain or, at most, East-Central Spain.

I have done some language corrections, too.



___

File Attachments:


---
Date: Sunday 11/14/10 at 13:51  Name: celt.diff  Size: 754B   By: jcreus
Patch for the celtiberian ruleset


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #17079] Help text wrong, I think

[Joan Creus]

URL:
  

 Summary: Help text wrong, I think
 Project: Freeciv
Submitted by: jcreus
Submitted on: Sunday 11/14/10 at 13:58
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.3, trunk
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

When describing the Citizen Governor, you get the following text:

Use 'Game' --> 'Save Settings' to store your presets permanently.

I think this is wrong, at least in the GTK version. It should be 'Game' ->
'Options' -> 'Save Options Now'.

Is this right?




___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #17161] Article missing

[Joan Creus]

URL:
  

 Summary: Article missing
 Project: Freeciv
Submitted by: jcreus
Submitted on: Saturday 11/27/10 at 19:33
Category: None
Severity: 3 - Normal
Priority: 3 - Low
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.2, 2.3, trunk
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

I think that the new enhanced strings for diplomatic actions lack an article,
as in "Eliminated a French Spy while infiltrating..." or "Your Diplomat
eliminated a Polish Diplomat while ..."

There's a problem in English if the nation starts with a vowel, but the
missing article is altogether worse.



___

File Attachments:


---
Date: Saturday 11/27/10 at 19:33  Name: dipl.diff  Size: 3kB   By: jcreus
Suggested patch


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #17163] String corrections

[Joan Creus]

URL:
  

 Summary: String corrections
 Project: Freeciv
Submitted by: jcreus
Submitted on: Saturday 11/27/10 at 21:26
Category: None
Severity: 3 - Normal
Priority: 3 - Low
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

The allied victory string had a grammar mistake, and I have rephrased it. I
think it's clearer now.

There was another problem in stdinhand.c 



___

File Attachments:


---
Date: Saturday 11/27/10 at 21:26  Name: sett.diff  Size: 1kB   By: jcreus
Patch with corrections


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev