[Freeciv-commits] r25587 - /trunk/translations/freeciv/es.po

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Wed Jul 16 02:02:33 2014
New Revision: 25587

URL: http://svn.gna.org/viewcvs/freeciv?rev=25587&view=rev
Log:
Updated Spanish translation by Jordi Negrevernis i Font
(this is just a copy of S2_5 r25586).
Stats on trunk:
freeciv: 81%: 5246 translated, 766 fuzzy, 485 untranslated.

Modified:
trunk/translations/freeciv/es.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/translations/freeciv/es.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/es.po?rev=25587&r1=25586&r2=25587&view=diff


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


[Freeciv-commits] r25586 - /branches/S2_5/translations/freeciv/es.po

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Wed Jul 16 01:57:54 2014
New Revision: 25586

URL: http://svn.gna.org/viewcvs/freeciv?rev=25586&view=rev
Log:
Updated Spanish translation by Jordi Negrevernis i Font.
freeciv: 90%: 5337 translated, 421 fuzzy, 192 untranslated.

Modified:
branches/S2_5/translations/freeciv/es.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_5/translations/freeciv/es.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/es.po?rev=25586&r1=25585&r2=25586&view=diff


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


[Freeciv-commits] r25585 - /branches/S2_5/fc_version

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Wed Jul 16 01:45:34 2014
New Revision: 25585

URL: http://svn.gna.org/viewcvs/freeciv?rev=25585&view=rev
Log:
Change follow tag for unstable branches to branch-specific tag
("S2_5" for S2_5).

See gna patch #4942.

Modified:
branches/S2_5/fc_version

Modified: branches/S2_5/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/fc_version?rev=25585&r1=25584&r2=25585&view=diff
==
--- branches/S2_5/fc_version(original)
+++ branches/S2_5/fc_versionWed Jul 16 01:45:34 2014
@@ -29,6 +29,8 @@
 #   - IS_DEVEL_VERSION=0
 #   - IS_FREEZE_VERSION=0
 #   - IS_BETA_VERSION=0
+# (and update DEFAULT_FOLLOW_TAG to "stable", and also
+# win32/installer/Makefile --follow-tag to "win32")
 
 IS_DEVEL_VERSION=0
 IS_FREEZE_VERSION=0
@@ -40,7 +42,7 @@
 RELEASE_MONTH=0
 
 DATASUBDIR=2.5
-DEFAULT_FOLLOW_TAG=stable
+DEFAULT_FOLLOW_TAG=S2_5
 
 # Freeciv network capstring: see documentation in common/capstr.c
 #


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


[Freeciv-commits] r25584 - /trunk/fc_version

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Wed Jul 16 01:45:00 2014
New Revision: 25584

URL: http://svn.gna.org/viewcvs/freeciv?rev=25584&view=rev
Log:
Change follow tag for unstable branches to branch-specific tag
("S2_6" for trunk).

See gna patch #4942.

Modified:
trunk/fc_version

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=25584&r1=25583&r2=25584&view=diff
==
--- trunk/fc_version(original)
+++ trunk/fc_versionWed Jul 16 01:45:00 2014
@@ -29,6 +29,8 @@
 #   - IS_DEVEL_VERSION=0
 #   - IS_FREEZE_VERSION=0
 #   - IS_BETA_VERSION=0
+# (and update DEFAULT_FOLLOW_TAG to "stable", and also
+# win32/installer/Makefile --follow-tag to "win32")
 
 IS_DEVEL_VERSION=1
 IS_FREEZE_VERSION=0
@@ -40,7 +42,7 @@
 RELEASE_MONTH=0
 
 DATASUBDIR=dev
-DEFAULT_FOLLOW_TAG=stable
+DEFAULT_FOLLOW_TAG=S2_6
 
 # Freeciv network capstring: see documentation in common/capstr.c
 #


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


[Freeciv-commits] r25582 - in /trunk: data/alien/effects.ruleset data/alien/techs.ruleset data/alien/terrain.ruleset doc/README.ruleset_alien

2014-07-15 Thread cazfi74
Author: cazfi
Date: Tue Jul 15 19:31:51 2014
New Revision: 25582

URL: http://svn.gna.org/viewcvs/freeciv?rev=25582&view=rev
Log:
Adjusted working of alien ruleset Thick Mountains
- Road building time reduced to 12 movement points
- They cannot be mined before Burrowing is known
- Mining time reduced to 17 movement points

See patch #4941

Modified:
trunk/data/alien/effects.ruleset
trunk/data/alien/techs.ruleset
trunk/data/alien/terrain.ruleset
trunk/doc/README.ruleset_alien

Modified: trunk/data/alien/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/effects.ruleset?rev=25582&r1=25581&r2=25582&view=diff
==
--- trunk/data/alien/effects.ruleset(original)
+++ trunk/data/alien/effects.rulesetTue Jul 15 19:31:51 2014
@@ -886,6 +886,20 @@
 [effect_mining]
 type= "Mining_Possible"
 value   = 1
+reqs=
+  { "type", "name", "range", "present"
+"Terrain", "Thick Mountains", "Local", FALSE
+  }
+
+[effect_mine_mountains]
+type= "Mining_Possible"
+value   = 1
+reqs=
+  {
+"type", "name", "range"
+"Tech", "Burrowing", "Player"
+"Terrain", "Thick Mountains", "Local"
+  }
 
 [effect_irrig_tf]
 type= "Irrig_TF_Possible"

Modified: trunk/data/alien/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/techs.ruleset?rev=25582&r1=25581&r2=25582&view=diff
==
--- trunk/data/alien/techs.ruleset  (original)
+++ trunk/data/alien/techs.ruleset  Tue Jul 15 19:31:51 2014
@@ -116,8 +116,10 @@
 flags   = ""
 graphic = "a.burrowing"
 graphic_alt = "-"
-helptext= _("Since it seems to be impossible to fly in this world, we\
- focus on opposite direction. Burrowing through earth is possible.")
+helptext= _("Since it seems to be impossible to fly in this world, we \
+focus on opposite direction. Burrowing through earth is possible.\n\n
+In addition to making first burrowing units available, knowledge of this \
+tech allows mining of Thick Mountains.")
 
 [advance_brain_development]
 name= _("Brain Development")

Modified: trunk/data/alien/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/terrain.ruleset?rev=25582&r1=25581&r2=25582&view=diff
==
--- trunk/data/alien/terrain.ruleset(original)
+++ trunk/data/alien/terrain.rulesetTue Jul 15 19:31:51 2014
@@ -378,13 +378,13 @@
 resources= "Alien Mine"
 road_trade_incr_pct  = 0
 base_time= 1
-road_time= 20
+road_time= 12
 irrigation_result= "no"
 irrigation_food_incr = 0
 irrigation_time  = 0
 mining_result= "yes"
 mining_shield_incr   = 1
-mining_time  = 50
+mining_time  = 17
 transform_result = "no"
 transform_time   = 24
 clean_pollution_time = 3
@@ -401,7 +401,8 @@
 color.b  = 38
 helptext = _("\
 What are these mountains made of?!? Diamond drill makes no scratch on 
them.\n\n\
-Burrowing units are unable to burrow through these mountains.\
+Burrowing units are unable to burrow through these mountains, \
+but at least Burrowing technology makes mining them possible.\
 ")
 
 [terrain_ocean]

Modified: trunk/doc/README.ruleset_alien
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.ruleset_alien?rev=25582&r1=25581&r2=25582&view=diff
==
--- trunk/doc/README.ruleset_alien  (original)
+++ trunk/doc/README.ruleset_alien  Tue Jul 15 19:31:51 2014
@@ -99,3 +99,7 @@
   Destroyer:4
   Light Saucer: 3
   Bomb Saucer:  2
+
+- Thick Mountains cannot be mined at all until Burrowing is known, but then
+  it requires just 17 movement points, road building time reduced to 12 
movement
+  points


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


[Freeciv-commits] r25583 - in /branches/S2_5: data/alien/ doc/

2014-07-15 Thread cazfi74
Author: cazfi
Date: Tue Jul 15 19:32:05 2014
New Revision: 25583

URL: http://svn.gna.org/viewcvs/freeciv?rev=25583&view=rev
Log:
Adjusted working of alien ruleset Thick Mountains
- Road building time reduced to 12 movement points
- They cannot be mined before Burrowing is known
- Mining time reduced to 17 movement points

See patch #4941

Modified:
branches/S2_5/data/alien/effects.ruleset
branches/S2_5/data/alien/techs.ruleset
branches/S2_5/data/alien/terrain.ruleset
branches/S2_5/doc/README.ruleset_alien

Modified: branches/S2_5/data/alien/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/effects.ruleset?rev=25583&r1=25582&r2=25583&view=diff
==
--- branches/S2_5/data/alien/effects.ruleset(original)
+++ branches/S2_5/data/alien/effects.rulesetTue Jul 15 19:32:05 2014
@@ -854,6 +854,20 @@
 [effect_mining]
 type= "Mining_Possible"
 value   = 1
+nreqs=
+  { "type", "name", "range"
+"Terrain", "Thick Mountains", "Local"
+  }
+
+[effect_mine_mountains]
+type= "Mining_Possible"
+value   = 1
+reqs=
+  {
+"type", "name", "range"
+"Tech", "Burrowing", "Player"
+"Terrain", "Thick Mountains", "Local"
+  }
 
 [effect_irrig_tf]
 type= "Irrig_TF_Possible"

Modified: branches/S2_5/data/alien/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/techs.ruleset?rev=25583&r1=25582&r2=25583&view=diff
==
--- branches/S2_5/data/alien/techs.ruleset  (original)
+++ branches/S2_5/data/alien/techs.ruleset  Tue Jul 15 19:32:05 2014
@@ -117,8 +117,10 @@
 flags   = ""
 graphic = "a.burrowing"
 graphic_alt = "-"
-helptext= _("Since it seems to be impossible to fly in this world, we\
- focus on opposite direction. Burrowing through earth is possible.")
+helptext= _("Since it seems to be impossible to fly in this world, we \
+focus on opposite direction. Burrowing through earth is possible.\n\n
+In addition to making first burrowing units available, knowledge of this \
+tech allows mining of Thick Mountains.")
 
 [advance_brain_development]
 name= _("Brain Development")

Modified: branches/S2_5/data/alien/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/terrain.ruleset?rev=25583&r1=25582&r2=25583&view=diff
==
--- branches/S2_5/data/alien/terrain.ruleset(original)
+++ branches/S2_5/data/alien/terrain.rulesetTue Jul 15 19:32:05 2014
@@ -384,13 +384,13 @@
 resources= "resource_alien_mine"
 road_trade_incr_pct  = 0
 base_time= 1
-road_time= 20
+road_time= 12
 irrigation_result= "no"
 irrigation_food_incr = 0
 irrigation_time  = 0
 mining_result= "yes"
 mining_shield_incr   = 1
-mining_time  = 50
+mining_time  = 17
 transform_result = "no"
 transform_time   = 24
 clean_pollution_time = 3
@@ -406,7 +406,8 @@
 color.b  = 38
 helptext = _("\
 What are these mountains made of?!? Diamond drill makes no scratch on 
them.\n\n\
-Burrowing units are unable to burrow through these mountains.\
+Burrowing units are unable to burrow through these mountains, \
+but at least Burrowing technology makes mining them possible.\
 ")
 
 [terrain_ocean]

Modified: branches/S2_5/doc/README.ruleset_alien
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/README.ruleset_alien?rev=25583&r1=25582&r2=25583&view=diff
==
--- branches/S2_5/doc/README.ruleset_alien  (original)
+++ branches/S2_5/doc/README.ruleset_alien  Tue Jul 15 19:32:05 2014
@@ -96,3 +96,7 @@
   Destroyer:4
   Light Saucer: 3
   Bomb Saucer:  2
+
+- Thick Mountains cannot be mined at all until Burrowing is known, but then
+  it requires just 17 movement points, road building time reduced to 12 
movement
+  points


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


[Freeciv-commits] r25581 - /trunk/common/tech.c

2014-07-15 Thread cazfi74
Author: cazfi
Date: Tue Jul 15 18:07:07 2014
New Revision: 25581

URL: http://svn.gna.org/viewcvs/freeciv?rev=25581&view=rev
Log:
Initialize tech_bulb_sum before starting to add cost components to it
in tech_upkeep_calc().

See bug #22321

Modified:
trunk/common/tech.c

Modified: trunk/common/tech.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/tech.c?rev=25581&r1=25580&r2=25581&view=diff
==
--- trunk/common/tech.c (original)
+++ trunk/common/tech.c Tue Jul 15 18:07:07 2014
@@ -309,7 +309,7 @@
 {
   struct research *research = research_get(pplayer);
   int f = research->future_tech, t = research->techs_researched;
-  double tech_bulb_sum;
+  double tech_bulb_sum = 0.0;
 
   /* upkeep cost for 'normal' techs (t) */
   switch (game.info.tech_cost_style) {


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


[Freeciv-commits] r25580 - /trunk/common/unit.c

2014-07-15 Thread cazfi74
Author: cazfi
Date: Tue Jul 15 16:40:09 2014
New Revision: 25580

URL: http://svn.gna.org/viewcvs/freeciv?rev=25580&view=rev
Log:
Fixed CleanPollution and CleanFallout activities to respect extra removal
requirements.

See bug #22312

Modified:
trunk/common/unit.c

Modified: trunk/common/unit.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.c?rev=25580&r1=25579&r2=25580&view=diff
==
--- trunk/common/unit.c (original)
+++ trunk/common/unit.c Tue Jul 15 16:40:09 2014
@@ -1060,7 +1060,8 @@
 return FALSE;
   }
 
-  if (!unit_has_type_flag(punit, UTYF_SETTLERS)) {
+  if (!unit_has_type_flag(punit, UTYF_SETTLERS)
+  || !can_remove_extra(pextra, punit, ptile)) {
 return FALSE;
   }
 
@@ -1094,7 +1095,8 @@
 return FALSE;
   }
 
-  if (!unit_has_type_flag(punit, UTYF_SETTLERS)) {
+  if (!unit_has_type_flag(punit, UTYF_SETTLERS)
+  || !can_remove_extra(pextra, punit, ptile)) {
 return FALSE;
   }
 


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


[Freeciv-commits] r25579 - /branches/S2_4/po/fr.po

2014-07-15 Thread igx31
Author: igx31
Date: Tue Jul 15 14:19:05 2014
New Revision: 25579

URL: http://svn.gna.org/viewcvs/freeciv?rev=25579&view=rev
Log:
- Updated following latest developments


Modified:
branches/S2_4/po/fr.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_4/po/fr.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/fr.po?rev=25579&r1=25578&r2=25579&view=diff


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


[Freeciv-commits] r25578 - in /trunk/common: game.c requirements.c requirements.h

2014-07-15 Thread persia
Author: persia
Date: Tue Jul 15 14:14:23 2014
New Revision: 25578

URL: http://svn.gna.org/viewcvs/freeciv?rev=25578&view=rev
Log:
Rewrite universal_fulfills_requirement

Performance considerations inspired by Marko Lindqvist 

See patch #4940

Modified:
trunk/common/game.c
trunk/common/requirements.c
trunk/common/requirements.h

Modified: trunk/common/game.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/game.c?rev=25578&r1=25577&r2=25578&view=diff
==
--- trunk/common/game.c (original)
+++ trunk/common/game.c Tue Jul 15 14:14:23 2014
@@ -441,6 +441,7 @@
   idex_init();
   cm_init();
   researches_init();
+  universal_found_functions_init();
 }
 
 /

Modified: trunk/common/requirements.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/requirements.c?rev=25578&r1=25577&r2=25578&view=diff
==
--- trunk/common/requirements.c (original)
+++ trunk/common/requirements.c Tue Jul 15 14:14:23 2014
@@ -38,6 +38,13 @@
 
 /* The item contradicts, fulfills or is irrelevant to the requirement */
 enum item_found {ITF_NO, ITF_YES, ITF_NOT_APPLICABLE};
+
+/
+  Container for item_found functions
+/
+typedef enum item_found (*universal_found)(const struct requirement *,
+   const struct universal *);
+static universal_found universal_found_function[VUT_COUNT] = {NULL};
 
 /**
   Parse requirement type (kind) and value strings into a universal
@@ -2811,19 +2818,13 @@
 
   Not being mentioned counts as fulfillment.
 **/
-static bool
-universal_fulfills_requirement(universals_u *univ,
-   enum item_found (*fulfills)(
- const struct requirement *,
- universals_u *),
-   const struct requirement_vector *reqs)
-{
-  fc_assert(univ);
-  fc_assert(fulfills);
-  fc_assert(reqs);
+bool universal_fulfills_requirement(const struct requirement_vector *reqs,
+const struct universal *source)
+{
+  fc_assert(universal_found_function[source->kind]);
 
   requirement_vector_iterate(reqs, preq) {
-switch (fulfills(preq, univ)) {
+switch ((*universal_found_function[source->kind])(preq, source)) {
 case ITF_NOT_APPLICABLE:
   continue;
 case ITF_NO:
@@ -2846,16 +2847,16 @@
   Find if a unit class fulfills a requirement
 **/
 static enum item_found unit_class_found(const struct requirement *preq,
-universals_u *uclass)
-{
-  fc_assert(uclass);
-  fc_assert(preq);
+const struct universal *source)
+{
+  fc_assert(source->value.uclass);
 
   switch (preq->source.kind) {
   case VUT_UCLASS:
-return uclass->uclass == preq->source.value.uclass ? ITF_YES : ITF_NO;
+return source->value.uclass == preq->source.value.uclass ? ITF_YES
+ : ITF_NO;
   case VUT_UCFLAG:
-return uclass_has_flag(uclass->uclass,
+return uclass_has_flag(source->value.uclass,
preq->source.value.unitclassflag) ? ITF_YES
  : ITF_NO;
 
@@ -2869,22 +2870,21 @@
   Find if a unit type fulfills a requirement
 **/
 static enum item_found unit_type_found(const struct requirement *preq,
-   universals_u *utype)
-{
-  fc_assert(utype);
-  fc_assert(preq);
+   const struct universal *source)
+{
+  fc_assert(source->value.utype);
 
   switch (preq->source.kind) {
   case VUT_UTYPE:
-return utype->utype == preq->source.value.utype ? ITF_YES : ITF_NO;
+return source->value.utype == preq->source.value.utype ? ITF_YES : ITF_NO;
   case VUT_UCLASS:
-return utype_class(utype->utype) == preq->source.value.uclass ? ITF_YES
-  : ITF_NO;
+return utype_class(source->value.utype) == preq->source.value.uclass
+? ITF_YES : ITF_NO;
   case VUT_UTFLAG:
-return utype_has_flag(utype->utype,
+return utype_has_flag(source->value.utype,
   preq->source.value.unitflag) ? ITF_YES : ITF_NO;
   case VUT_UCFLAG:
-return uclass_has_flag(utype_class(utype->utype),
+ret

[Freeciv-commits] r25577 - /branches/S2_4/po/es.po

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jul 15 10:56:11 2014
New Revision: 25577

URL: http://svn.gna.org/viewcvs/freeciv?rev=25577&view=rev
Log:
Updated Spanish translation by Jordi Negrevernis i Font.
99.6%: 7173 translated, 14 fuzzy, 13 untranslated.

Modified:
branches/S2_4/po/es.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_4/po/es.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/es.po?rev=25577&r1=25576&r2=25577&view=diff


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


[Freeciv-commits] r25576 - /branches/S2_4/data/multiplayer/game.ruleset

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jul 15 10:56:06 2014
New Revision: 25576

URL: http://svn.gna.org/viewcvs/freeciv?rev=25576&view=rev
Log:
Make multiplayer ruleset default to iso topology, to match client default.

See gna bug #22325.

Modified:
branches/S2_4/data/multiplayer/game.ruleset

Modified: branches/S2_4/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/multiplayer/game.ruleset?rev=25576&r1=25575&r2=25576&view=diff
==
--- branches/S2_4/data/multiplayer/game.ruleset (original)
+++ branches/S2_4/data/multiplayer/game.ruleset Tue Jul 15 10:56:06 2014
@@ -327,7 +327,7 @@
 set =
 { "name", "value", "lock"
   "generator", "ISLAND", FALSE
-  "topology", "WRAPX|WRAPY", FALSE
+  "topology", "WRAPX|WRAPY|ISO", FALSE
   "startpos", "SINGLE", FALSE
   "tinyisles", FALSE, FALSE
   "alltemperate", TRUE, FALSE


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


[Freeciv-commits] r25574 - in /branches/S2_4/data/nation: algerian.ruleset belgic.ruleset boian.ruleset filipino.ruleset syrian.ruleset

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jul 15 10:55:58 2014
New Revision: 25574

URL: http://svn.gna.org/viewcvs/freeciv?rev=25574&view=rev
Log:
Ensure all female ruler titles which are the same as the male one are
qualified for i18n, and remove an unnecessary qualifier.

See gna bug #22322.

Modified:
branches/S2_4/data/nation/algerian.ruleset
branches/S2_4/data/nation/belgic.ruleset
branches/S2_4/data/nation/boian.ruleset
branches/S2_4/data/nation/filipino.ruleset
branches/S2_4/data/nation/syrian.ruleset

Modified: branches/S2_4/data/nation/algerian.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/nation/algerian.ruleset?rev=25574&r1=25573&r2=25574&view=diff
==
--- branches/S2_4/data/nation/algerian.ruleset  (original)
+++ branches/S2_4/data/nation/algerian.ruleset  Tue Jul 15 10:55:58 2014
@@ -18,7 +18,7 @@
 
 ruler_titles = {
  "government",  "male_title",  "female_title"
- "Communism",   _("Secretary General %s"), _("Secretary General %s")
+ "Communism",   _("Secretary General %s"), _("?female:Secretary General 
%s")
  "Despotism",   _("%s Dey"),   _("?female:%s Dey")
  "Fundamentalism",  _("Caliph %s"),_("Calipha %s")
 }

Modified: branches/S2_4/data/nation/belgic.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/nation/belgic.ruleset?rev=25574&r1=25573&r2=25574&view=diff
==
--- branches/S2_4/data/nation/belgic.ruleset(original)
+++ branches/S2_4/data/nation/belgic.rulesetTue Jul 15 10:55:58 2014
@@ -27,7 +27,7 @@
 
 ruler_titles = {
  "government",   "male_title", "female_title"
- "Fundamentalism",   _("High Druid %s"),   _("High Druid %s")
+ "Fundamentalism",   _("High Druid %s"),   _("?female:High Druid %s")
  "Communism",_("Brother %s"),  _("Sister %s")
  "Republic", _("Spokesman %s"),_("Spokeswoman %s")
  "Democracy",_("Speaker %s"),  _("?female:Speaker %s")

Modified: branches/S2_4/data/nation/boian.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/nation/boian.ruleset?rev=25574&r1=25573&r2=25574&view=diff
==
--- branches/S2_4/data/nation/boian.ruleset (original)
+++ branches/S2_4/data/nation/boian.ruleset Tue Jul 15 10:55:58 2014
@@ -19,7 +19,7 @@
 
 ruler_titles = {
  "government",  "male_title",  "female_title"
- "Fundamentalism",   _("High Druid %s"),   _("High Druid %s")
+ "Fundamentalism",   _("High Druid %s"),   _("?female:High Druid %s")
 }
 
 init_techs=""

Modified: branches/S2_4/data/nation/filipino.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/nation/filipino.ruleset?rev=25574&r1=25573&r2=25574&view=diff
==
--- branches/S2_4/data/nation/filipino.ruleset  (original)
+++ branches/S2_4/data/nation/filipino.ruleset  Tue Jul 15 10:55:58 2014
@@ -20,7 +20,7 @@
 ruler_titles = {
  "government",  "male_title",   "female_title"
  "Fundamentalism",  _("Cardinal %s"),   _("Mother Superior %s")
- "Republic",   _("Governor %s"),   _("Governor %s")
+ "Republic",_("Governor %s"),   _("?female:Governor %s")
 }
 flag="philippines"
 flag_alt = "-"

Modified: branches/S2_4/data/nation/syrian.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/nation/syrian.ruleset?rev=25574&r1=25573&r2=25574&view=diff
==
--- branches/S2_4/data/nation/syrian.ruleset(original)
+++ branches/S2_4/data/nation/syrian.rulesetTue Jul 15 10:55:58 2014
@@ -17,7 +17,7 @@
 
 ruler_titles = {
  "government", "male_title",  "female_title"
- "Despotism",  _("Sheikh %s"),_("?female:Shaykha %s")
+ "Despotism",  _("Sheikh %s"),_("Shaykha %s")
  "Fundamentalism", _("Caliph %s"),_("Calipha %s")
  "Monarchy",   _("Emir %s"),  _("Emira %s")
 }


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


[Freeciv-commits] r25575 - /branches/S2_4/data/helpdata.txt

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jul 15 10:56:02 2014
New Revision: 25575

URL: http://svn.gna.org/viewcvs/freeciv?rev=25575&view=rev
Log:
Make project mailing lists the primary point of contact in help (after
the bug tracker).

Requested by Marko Lindqvist (cazfi@gna), who is currently top of the
list :)

See gna patch #4125.

Modified:
branches/S2_4/data/helpdata.txt

Modified: branches/S2_4/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/helpdata.txt?rev=25575&r1=25574&r2=25575&view=diff
==
--- branches/S2_4/data/helpdata.txt (original)
+++ branches/S2_4/data/helpdata.txt Tue Jul 15 10:56:02 2014
@@ -2275,30 +2275,41 @@
 name = _("About Freeciv")
 text = "\
 $FreecivVersion\
-", _("\
-  Original authors:\n\
-(they are no longer involved, please don't mail them!)\
-"), "\
-Allan Ove Kjeldbjerg - al...@daimi.aau.dk\n\
-Claus Leth Gregersen - l...@daimi.aau.dk\n\
-Peter Joachim Unold  - pjun...@daimi.aau.dk\
-", _("\
-  Present administrators: \
-"), "\
-Marko Lindqvist  - cazf...@gmail.com\n\
-R. Daniel Markstedt  - markst...@gmail.com\n\
-Christian Prochaska  - cp.ml.freeciv@googlemail.com\n\
-Jacob Nevins - 0jacobnk@chiark.greenend.org.uk\
-", _("\
+",
+; /* TRANS: followed by a URL */
+_("\
 If you find any bugs, then please send us a bug report.  This is \
 best done by visiting the Freeciv Bug Tracking System, at:\
 "), "\
   http://gna.org/projects/freeciv/\
 ", _("\
-Please quote the above version information.  \
+Please quote the above version information. \
 For more information about submitting bug reports see the file BUGS \
-in the Freeciv distribution.  For more information in general, \
-visit the Freeciv website, at:\
+in the Freeciv distribution.\
+"), _("\
+To contact the developers about anything else, please email one of the \
+project's mailing lists:\
+"), _("\
+freeciv-...@gna.org - public development mailing\n\
+  list (archives are public)\n\
+freeciv-maintain...@gna.org - private project administration\n\
+  list (for security issues, etc)\
+"), _("\
+  Original authors:\n\
+(they are no longer involved, please don't mail them!)\
+"), "\
+Allan Ove Kjeldbjerg - al...@daimi.aau.dk\n\
+Claus Leth Gregersen - l...@daimi.aau.dk\n\
+Peter Joachim Unold  - pjun...@daimi.aau.dk\
+", _("\
+  Present administrators: \
+"), "\
+Marko Lindqvist  - cazf...@gmail.com\n\
+R. Daniel Markstedt  - markst...@gmail.com\n\
+Christian Prochaska  - cp.ml.freeciv@googlemail.com\n\
+Jacob Nevins - 0jacobnk@chiark.greenend.org.uk\
+", _("\
+For more information in general, visit the Freeciv website, at:\
 "), "\
   http://www.freeciv.org/\
 "


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


[Freeciv-commits] r25571 - in /branches/S2_5/data: alien/ nation/

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jul 15 10:38:49 2014
New Revision: 25571

URL: http://svn.gna.org/viewcvs/freeciv?rev=25571&view=rev
Log:
Ensure all female ruler titles which are the same as the male one are
qualified for i18n, and remove some unnecessary qualifiers.

See gna bug #22322.

Modified:
branches/S2_5/data/alien/governments.ruleset
branches/S2_5/data/nation/algerian.ruleset
branches/S2_5/data/nation/belgic.ruleset
branches/S2_5/data/nation/boian.ruleset
branches/S2_5/data/nation/filipino.ruleset
branches/S2_5/data/nation/italiangreek.ruleset
branches/S2_5/data/nation/kushan.ruleset
branches/S2_5/data/nation/langobardic.ruleset
branches/S2_5/data/nation/rusyn.ruleset
branches/S2_5/data/nation/syrian.ruleset

Modified: branches/S2_5/data/alien/governments.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/governments.ruleset?rev=25571&r1=25570&r2=25571&view=diff
==
--- branches/S2_5/data/alien/governments.ruleset(original)
+++ branches/S2_5/data/alien/governments.rulesetTue Jul 15 10:38:49 2014
@@ -70,7 +70,7 @@
 graphic_alt = "-"
 
 ruler_male_title = _("Leader %s")
-ruler_female_title = _("Leader %s")
+ruler_female_title = _("?female:Leader %s")
 
 helptext = _("\
 This is the only available form of government in the beginning.\n\n\

Modified: branches/S2_5/data/nation/algerian.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/nation/algerian.ruleset?rev=25571&r1=25570&r2=25571&view=diff
==
--- branches/S2_5/data/nation/algerian.ruleset  (original)
+++ branches/S2_5/data/nation/algerian.ruleset  Tue Jul 15 10:38:49 2014
@@ -18,7 +18,7 @@
 
 ruler_titles = {
  "government",  "male_title",  "female_title"
- "Communism",   _("Secretary General %s"), _("Secretary General %s")
+ "Communism",   _("Secretary General %s"), _("?female:Secretary General 
%s")
  "Despotism",   _("%s Dey"),   _("?female:%s Dey")
  "Fundamentalism",  _("Caliph %s"),_("Calipha %s")
 }

Modified: branches/S2_5/data/nation/belgic.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/nation/belgic.ruleset?rev=25571&r1=25570&r2=25571&view=diff
==
--- branches/S2_5/data/nation/belgic.ruleset(original)
+++ branches/S2_5/data/nation/belgic.rulesetTue Jul 15 10:38:49 2014
@@ -27,7 +27,7 @@
 
 ruler_titles = {
  "government",   "male_title", "female_title"
- "Fundamentalism",   _("High Druid %s"),   _("High Druid %s")
+ "Fundamentalism",   _("High Druid %s"),   _("?female:High Druid %s")
  "Communism",_("Brother %s"),  _("Sister %s")
  "Republic", _("Spokesman %s"),_("Spokeswoman %s")
  "Democracy",_("Speaker %s"),  _("?female:Speaker %s")

Modified: branches/S2_5/data/nation/boian.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/nation/boian.ruleset?rev=25571&r1=25570&r2=25571&view=diff
==
--- branches/S2_5/data/nation/boian.ruleset (original)
+++ branches/S2_5/data/nation/boian.ruleset Tue Jul 15 10:38:49 2014
@@ -19,7 +19,7 @@
 
 ruler_titles = {
  "government",  "male_title",  "female_title"
- "Fundamentalism",   _("High Druid %s"),   _("High Druid %s")
+ "Fundamentalism",   _("High Druid %s"),   _("?female:High Druid %s")
 }
 
 init_techs=""

Modified: branches/S2_5/data/nation/filipino.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/nation/filipino.ruleset?rev=25571&r1=25570&r2=25571&view=diff
==
--- branches/S2_5/data/nation/filipino.ruleset  (original)
+++ branches/S2_5/data/nation/filipino.ruleset  Tue Jul 15 10:38:49 2014
@@ -20,7 +20,7 @@
 ruler_titles = {
  "government",  "male_title",   "female_title"
  "Fundamentalism",  _("Cardinal %s"),   _("Mother Superior %s")
- "Republic",   _("Governor %s"),   _("Governor %s")
+ "Republic",_("Governor %s"),   _("?female:Governor %s")
 }
 flag="philippines"
 flag_alt = "-"

Modified: branches/S2_5/data/nation/italiangreek.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/nation/italiangreek.ruleset?rev=25571&r1=25570&r2=25571&view=diff
==
--- branches/S2_5/data/nation/italiangreek.ruleset  (original)
+++ branches/S2_5/data/nation/italiangreek.ruleset  Tue Jul 15 10:38:49 2014
@@ -42,11 +42,11 @@
 
 ruler_titles = {
  "government",  "male_title",  "female_title"
- "Anarchy", _("Usurper %s"),   _("Usurper %s")
+ "Anarchy", _("Usurper %s"),   _("?female:Us

[Freeciv-commits] r25572 - /branches/S2_5/data/helpdata.txt

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jul 15 10:38:52 2014
New Revision: 25572

URL: http://svn.gna.org/viewcvs/freeciv?rev=25572&view=rev
Log:
Make project mailing lists the primary point of contact in help (after
the bug tracker).

Requested by Marko Lindqvist (cazfi@gna), who is currently top of the
list :)

See gna patch #4125.

Modified:
branches/S2_5/data/helpdata.txt

Modified: branches/S2_5/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/helpdata.txt?rev=25572&r1=25571&r2=25572&view=diff
==
--- branches/S2_5/data/helpdata.txt (original)
+++ branches/S2_5/data/helpdata.txt Tue Jul 15 10:38:52 2014
@@ -2267,30 +2267,41 @@
 name = _("About Freeciv")
 text = "\
 $FreecivVersion\
-", _("\
-  Original authors:\n\
-(they are no longer involved, please don't mail them!)\
-"), "\
-Allan Ove Kjeldbjerg - al...@daimi.aau.dk\n\
-Claus Leth Gregersen - l...@daimi.aau.dk\n\
-Peter Joachim Unold  - pjun...@daimi.aau.dk\
-", _("\
-  Present administrators: \
-"), "\
-Marko Lindqvist  - cazf...@gmail.com\n\
-R. Daniel Markstedt  - markst...@gmail.com\n\
-Christian Prochaska  - cp.ml.freeciv@googlemail.com\n\
-Jacob Nevins - 0jacobnk@chiark.greenend.org.uk\
-", _("\
+",
+; /* TRANS: followed by a URL */
+_("\
 If you find any bugs, then please send us a bug report.  This is \
 best done by visiting the Freeciv Bug Tracking System, at:\
 "), "\
   http://gna.org/projects/freeciv/\
 ", _("\
-Please quote the above version information.  \
+Please quote the above version information. \
 For more information about submitting bug reports see the file BUGS \
-in the Freeciv distribution.  For more information in general, \
-visit the Freeciv website, at:\
+in the Freeciv distribution.\
+"), _("\
+To contact the developers about anything else, please email one of the \
+project's mailing lists:\
+"), _("\
+freeciv-...@gna.org - public development mailing\n\
+  list (archives are public)\n\
+freeciv-maintain...@gna.org - private project administration\n\
+  list (for security issues, etc)\
+"), _("\
+  Original authors:\n\
+(they are no longer involved, please don't mail them!)\
+"), "\
+Allan Ove Kjeldbjerg - al...@daimi.aau.dk\n\
+Claus Leth Gregersen - l...@daimi.aau.dk\n\
+Peter Joachim Unold  - pjun...@daimi.aau.dk\
+", _("\
+  Present administrators: \
+"), "\
+Marko Lindqvist  - cazf...@gmail.com\n\
+R. Daniel Markstedt  - markst...@gmail.com\n\
+Christian Prochaska  - cp.ml.freeciv@googlemail.com\n\
+Jacob Nevins - 0jacobnk@chiark.greenend.org.uk\
+", _("\
+For more information in general, visit the Freeciv website, at:\
 "), "\
   http://www.freeciv.org/\
 "


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


[Freeciv-commits] r25573 - /branches/S2_5/data/multiplayer/game.ruleset

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jul 15 10:38:55 2014
New Revision: 25573

URL: http://svn.gna.org/viewcvs/freeciv?rev=25573&view=rev
Log:
Make multiplayer ruleset default to iso topology, to match client default.

See gna bug #22325.

Modified:
branches/S2_5/data/multiplayer/game.ruleset

Modified: branches/S2_5/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/game.ruleset?rev=25573&r1=25572&r2=25573&view=diff
==
--- branches/S2_5/data/multiplayer/game.ruleset (original)
+++ branches/S2_5/data/multiplayer/game.ruleset Tue Jul 15 10:38:55 2014
@@ -391,7 +391,7 @@
 { "name", "value", "lock"
   "minplayers", 2, FALSE
   "generator", "ISLAND", FALSE
-  "topology", "WRAPX|WRAPY", FALSE
+  "topology", "WRAPX|WRAPY|ISO", FALSE
   "startpos", "SINGLE", FALSE
   "tinyisles", FALSE, FALSE
   "alltemperate", TRUE, FALSE


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


[Freeciv-commits] r25568 - in /trunk/data: alien/ nation/

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jul 15 10:29:37 2014
New Revision: 25568

URL: http://svn.gna.org/viewcvs/freeciv?rev=25568&view=rev
Log:
Ensure all female ruler titles which are the same as the male one are
qualified for i18n, and remove some unnecessary qualifiers.

See gna bug #22322.

Modified:
trunk/data/alien/governments.ruleset
trunk/data/nation/algerian.ruleset
trunk/data/nation/belgic.ruleset
trunk/data/nation/boian.ruleset
trunk/data/nation/filipino.ruleset
trunk/data/nation/italiangreek.ruleset
trunk/data/nation/kushan.ruleset
trunk/data/nation/langobardic.ruleset
trunk/data/nation/rusyn.ruleset
trunk/data/nation/syrian.ruleset

Modified: trunk/data/alien/governments.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/governments.ruleset?rev=25568&r1=25567&r2=25568&view=diff
==
--- trunk/data/alien/governments.ruleset(original)
+++ trunk/data/alien/governments.rulesetTue Jul 15 10:29:37 2014
@@ -70,7 +70,7 @@
 graphic_alt = "-"
 
 ruler_male_title = _("Leader %s")
-ruler_female_title = _("Leader %s")
+ruler_female_title = _("?female:Leader %s")
 
 helptext = _("\
 This is the only available form of government in the beginning.\n\n\

Modified: trunk/data/nation/algerian.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/nation/algerian.ruleset?rev=25568&r1=25567&r2=25568&view=diff
==
--- trunk/data/nation/algerian.ruleset  (original)
+++ trunk/data/nation/algerian.ruleset  Tue Jul 15 10:29:37 2014
@@ -18,7 +18,7 @@
 
 ruler_titles = {
  "government",  "male_title",  "female_title"
- "Communism",   _("Secretary General %s"), _("Secretary General %s")
+ "Communism",   _("Secretary General %s"), _("?female:Secretary General 
%s")
  "Despotism",   _("%s Dey"),   _("?female:%s Dey")
  "Fundamentalism",  _("Caliph %s"),_("Calipha %s")
 }

Modified: trunk/data/nation/belgic.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/nation/belgic.ruleset?rev=25568&r1=25567&r2=25568&view=diff
==
--- trunk/data/nation/belgic.ruleset(original)
+++ trunk/data/nation/belgic.rulesetTue Jul 15 10:29:37 2014
@@ -27,7 +27,7 @@
 
 ruler_titles = {
  "government",   "male_title", "female_title"
- "Fundamentalism",   _("High Druid %s"),   _("High Druid %s")
+ "Fundamentalism",   _("High Druid %s"),   _("?female:High Druid %s")
  "Communism",_("Brother %s"),  _("Sister %s")
  "Republic", _("Spokesman %s"),_("Spokeswoman %s")
  "Democracy",_("Speaker %s"),  _("?female:Speaker %s")

Modified: trunk/data/nation/boian.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/nation/boian.ruleset?rev=25568&r1=25567&r2=25568&view=diff
==
--- trunk/data/nation/boian.ruleset (original)
+++ trunk/data/nation/boian.ruleset Tue Jul 15 10:29:37 2014
@@ -19,7 +19,7 @@
 
 ruler_titles = {
  "government",  "male_title",  "female_title"
- "Fundamentalism",   _("High Druid %s"),   _("High Druid %s")
+ "Fundamentalism",   _("High Druid %s"),   _("?female:High Druid %s")
 }
 
 init_techs=""

Modified: trunk/data/nation/filipino.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/nation/filipino.ruleset?rev=25568&r1=25567&r2=25568&view=diff
==
--- trunk/data/nation/filipino.ruleset  (original)
+++ trunk/data/nation/filipino.ruleset  Tue Jul 15 10:29:37 2014
@@ -20,7 +20,7 @@
 ruler_titles = {
  "government",  "male_title",   "female_title"
  "Fundamentalism",  _("Cardinal %s"),   _("Mother Superior %s")
- "Republic",   _("Governor %s"),   _("Governor %s")
+ "Republic",_("Governor %s"),   _("?female:Governor %s")
 }
 flag="philippines"
 flag_alt = "-"

Modified: trunk/data/nation/italiangreek.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/nation/italiangreek.ruleset?rev=25568&r1=25567&r2=25568&view=diff
==
--- trunk/data/nation/italiangreek.ruleset  (original)
+++ trunk/data/nation/italiangreek.ruleset  Tue Jul 15 10:29:37 2014
@@ -42,11 +42,11 @@
 
 ruler_titles = {
  "government",  "male_title",  "female_title"
- "Anarchy", _("Usurper %s"),   _("Usurper %s")
+ "Anarchy", _("Usurper %s"),   _("?female:Usurper %s")
  "Communism",   _("Brother %s"),   _("Sister %s")
- "Democracy",   _("Speaker %s"),   _("Speaker %s")
+ "Democracy",   _("Speaker %s"),   _("?female:Speaker %s")
  "Despotism",   _("Tyrant %s"),_("Tyranne %s")
- "Republic",_("Captai

[Freeciv-commits] r25569 - /trunk/data/helpdata.txt

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jul 15 10:29:41 2014
New Revision: 25569

URL: http://svn.gna.org/viewcvs/freeciv?rev=25569&view=rev
Log:
Make project mailing lists the primary point of contact in help (after
the bug tracker).

Requested by Marko Lindqvist (cazfi@gna), who is currently top of the
list :)

See gna patch #4125.

Modified:
trunk/data/helpdata.txt

Modified: trunk/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/helpdata.txt?rev=25569&r1=25568&r2=25569&view=diff
==
--- trunk/data/helpdata.txt (original)
+++ trunk/data/helpdata.txt Tue Jul 15 10:29:41 2014
@@ -2271,30 +2271,41 @@
 name = _("About Freeciv")
 text = "\
 $FreecivVersion\
-", _("\
-  Original authors:\n\
-(they are no longer involved, please don't mail them!)\
-"), "\
-Allan Ove Kjeldbjerg - al...@daimi.aau.dk\n\
-Claus Leth Gregersen - l...@daimi.aau.dk\n\
-Peter Joachim Unold  - pjun...@daimi.aau.dk\
-", _("\
-  Present administrators: \
-"), "\
-Marko Lindqvist  - cazf...@gmail.com\n\
-R. Daniel Markstedt  - markst...@gmail.com\n\
-Christian Prochaska  - cp.ml.freeciv@googlemail.com\n\
-Jacob Nevins - 0jacobnk@chiark.greenend.org.uk\
-", _("\
+",
+; /* TRANS: followed by a URL */
+_("\
 If you find any bugs, then please send us a bug report.  This is \
 best done by visiting the Freeciv Bug Tracking System, at:\
 "), "\
   http://gna.org/projects/freeciv/\
 ", _("\
-Please quote the above version information.  \
+Please quote the above version information. \
 For more information about submitting bug reports see the file BUGS \
-in the Freeciv distribution.  For more information in general, \
-visit the Freeciv website, at:\
+in the Freeciv distribution.\
+"), _("\
+To contact the developers about anything else, please email one of the \
+project's mailing lists:\
+"), _("\
+freeciv-...@gna.org - public development mailing\n\
+  list (archives are public)\n\
+freeciv-maintain...@gna.org - private project administration\n\
+  list (for security issues, etc)\
+"), _("\
+  Original authors:\n\
+(they are no longer involved, please don't mail them!)\
+"), "\
+Allan Ove Kjeldbjerg - al...@daimi.aau.dk\n\
+Claus Leth Gregersen - l...@daimi.aau.dk\n\
+Peter Joachim Unold  - pjun...@daimi.aau.dk\
+", _("\
+  Present administrators: \
+"), "\
+Marko Lindqvist  - cazf...@gmail.com\n\
+R. Daniel Markstedt  - markst...@gmail.com\n\
+Christian Prochaska  - cp.ml.freeciv@googlemail.com\n\
+Jacob Nevins - 0jacobnk@chiark.greenend.org.uk\
+", _("\
+For more information in general, visit the Freeciv website, at:\
 "), "\
   http://www.freeciv.org/\
 "


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


[Freeciv-commits] r25570 - /trunk/data/multiplayer/game.ruleset

2014-07-15 Thread 0jacobnk . gna
Author: jtn
Date: Tue Jul 15 10:29:44 2014
New Revision: 25570

URL: http://svn.gna.org/viewcvs/freeciv?rev=25570&view=rev
Log:
Make multiplayer ruleset default to iso topology, to match client default.

See gna bug #22325.

Modified:
trunk/data/multiplayer/game.ruleset

Modified: trunk/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=25570&r1=25569&r2=25570&view=diff
==
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Tue Jul 15 10:29:44 2014
@@ -558,7 +558,7 @@
 { "name", "value", "lock"
   "minplayers", 2, FALSE
   "generator", "ISLAND", FALSE
-  "topology", "WRAPX|WRAPY", FALSE
+  "topology", "WRAPX|WRAPY|ISO", FALSE
   "startpos", "SINGLE", FALSE
   "tinyisles", FALSE, FALSE
   "alltemperate", TRUE, FALSE


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