Re: [Freeciv-Dev] S2_5 branching

2013-05-01 Thread Marko Lindqvist 
On 28 April 2013 18:47, Marko Lindqvist cazf...@gmail.com wrote:

 We're just a couple of days from branching S2_5 02-May. My timezone is
 EEST (UTC +3), and I'm about start the branching activities as soon as
 clock hits 00:00 here. So for you in western Europe, let alone in Americas,
 it will be still 01-May.

 After the bracnhing we will have four active branches: S2_3, S2_4, S2_5
 and TRUNK. That's more than we'd like to divide our attention to, but at
 the same time we don't want to postpone branching further and letting even
 more new features to get in to trunk then to be polished in stable branch
 forever. Let's hope that time between S2_5 branching and 2.5.0 release is
 not longer than the road from S2_4 to 2.4.0 has been.

 I'll refresh all po-files under version control against latest strings
 before the branching. One of the new features in 2.6 is inclusion of Alien
 World ruleset ( http://www.cazfi.net/freeciv/alien/ ). Strings from the
 ruleset will be added to trunk translation as soon as S2_5 has been safely
 branched without the strings. I'll upload po-files with these strings to
 http://www.cazfi.net/freeciv/translations/S2_6/ within 24 hours from the
 branching.

 Next milestone for 2.5 after branching will be datafile format and network
 protocol freezes. We are not yet even planning the dates for these, but
 please make any tickets that must go in before the freezes as dependency of
 the relevant task-tickets, so once we start to plan the dates, we see what
 needs to be done.



 S2_5 has now been branched, and TRUNK is open for 2.6 development. While
2.6 development in TRUNK is already possible, our priority should be in
stable branches, especially in getting 2.4.0 finally out. Now that I've got
the S2_5 branching out of the way, I'll try to sum current 2.4.0 blockers
in the coming days.

 When I added Alien World ruleset strings to translations, it turned out
that one gettext error was crept in to those files. Fix for that is in
patch #3890, and that patch was applied to my local tree when I created
po-files uploaded to http://www.cazfi.net/freeciv/translations/S2_6/
 I've uploaded po-files from all the active branches to cazfi.net, and here
are current translation statistics from them:


S2_3


ca: 6302 translated messages.
pl: 6302 translated messages.
fr: 6302 translated messages.
gd: 6302 translated messages.
es: 6302 translated messages.
ja: 6291 translated messages, 10 fuzzy translations, 1 untranslated message.
fi: 6212 translated messages, 90 untranslated messages.
da: 5948 translated messages, 218 fuzzy translations, 136 untranslated
messages.
uk: 5116 translated messages, 546 fuzzy translations, 640 untranslated
messages.
it: 4582 translated messages, 1153 fuzzy translations, 567 untranslated
messages.
nl: 4529 translated messages, 1080 fuzzy translations, 693 untranslated
messages.
pt_BR: 4335 translated messages, 1391 fuzzy translations, 576 untranslated
messages.
ru: 4271 translated messages, 1374 fuzzy translations, 657 untranslated
messages.
sv: 3709 translated messages, 1448 fuzzy translations, 1145 untranslated
messages.
ga: 3557 translated messages, 3 fuzzy translations, 2742 untranslated
messages.
de: 3315 translated messages, 1938 fuzzy translations, 1049 untranslated
messages.
tr: 2940 translated messages, 1991 fuzzy translations, 1371 untranslated
messages.
et: 2922 translated messages, 2094 fuzzy translations, 1286 untranslated
messages.
cs: 2889 translated messages, 2201 fuzzy translations, 1212 untranslated
messages.
eo: 2774 translated messages, 1554 fuzzy translations, 1974 untranslated
messages.
lt: 2713 translated messages, 1677 fuzzy translations, 1912 untranslated
messages.
ro: 2537 translated messages, 2256 fuzzy translations, 1509 untranslated
messages.
zh_CN: 2494 translated messages, 2369 fuzzy translations, 1439 untranslated
messages.
no: 2437 translated messages, 2512 fuzzy translations, 1353 untranslated
messages.
ar: 2436 translated messages, 2641 fuzzy translations, 1225 untranslated
messages.
sr: 2067 translated messages, 1070 fuzzy translations, 3165 untranslated
messages.
el: 2047 translated messages, 1905 fuzzy translations, 2350 untranslated
messages.
ko: 1990 translated messages, 1520 fuzzy translations, 2792 untranslated
messages.
bg: 1958 translated messages, 10 fuzzy translations, 4334 untranslated
messages.
hu: 1881 translated messages, 2768 fuzzy translations, 1653 untranslated
messages.
pt: 1715 translated messages, 2781 fuzzy translations, 1806 untranslated
messages.
fa: 1660 translated messages, 1718 fuzzy translations, 2924 untranslated
messages.
he: 1651 translated messages, 1482 fuzzy translations, 3169 untranslated
messages.
en_GB: 322 translated messages, 5980 untranslated messages.


S2_4


pl: 7117 translated messages.
en_GB: 7113 translated messages, 3 fuzzy translations, 1 untranslated
message.
ca: 7113 translated messages, 3 fuzzy translations, 1 untranslated message.
fr: 7113 translated messages, 3 fuzzy

Re: [Freeciv-Dev] S2_5 branching

2013-04-02 Thread Emmet Hikory 
On Tue, Apr 02, 2013 at 03:37PM +0300, Marko Lindqvist wrote:
 As it's 30 days to S2_5 branching, my take on new feature patches coming
 in will now on be that they get targeted to 2.6 unless:
 
 - It complements 2.5 feature (already committed or agreed about) OR
 - It's very low impact: almost trivial = not bugprone, not increasing
 requirements in a significant manner

I have two features for which I have yet to publish patches that I'd like
to land sooner than later, as they block my local ruleset testing (and I would
prefer not to port them to 2.6 later if I can avoid it).  Beyond that, while
there are certainly interesting features to add, I'm happy to wait until much
later (as there's plenty more data entry, balancing, and graphics production
to do to make my ruleset work).

A) Allow constructed bases and roads in cities
Currently, cities automatically get every road, and don't get (and
can't build) any bases.  This makes it very hard to model Mine as a
base (which I want because I want to use Mining for transformation),
and limits a few other things.

This patch allows ruleset authors to define some bases to be automatic
in cities, some to be permitted to be constructed, and some to be denied
from construction.  The same automatic/permission/restriction structure
is also provided for roads.

I'm just doing final testing on this, and ruleset adjustments for
shipping rulesets (to make sure it both doesn't work for them, and doesn't
cause any other behavioural difference), and expect to publish to GNA within
the next several hours.

B) Road compatibility
Design finalisedi (see other thread): should be ready by Thursday at the
latest, but probably tomorrow.

Would either of these need to wait for 2.6?

-- 
Emmet HIKORY


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

Re: [Freeciv-Dev] S2_5 branching

2013-04-02 Thread Marko Lindqvist 
On 2 April 2013 17:40, Emmet Hikory per...@shipstone.jp wrote:

 On Tue, Apr 02, 2013 at 03:37PM +0300, Marko Lindqvist wrote:
  As it's 30 days to S2_5 branching, my take on new feature patches coming
  in will now on be that they get targeted to 2.6 unless:
 
  - It complements 2.5 feature (already committed or agreed about) OR
  - It's very low impact: almost trivial = not bugprone, not increasing
  requirements in a significant manner



 Would either of these need to wait for 2.6?


 Can't make any final decisions before seeing the patches, but at least
they should fit in to complement road types -feature -category.


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