from:"0jacobnk . gna"

[Freeciv-commits] r35556 - in /trunk/translations: nations/en_GB.po ruledit/en_GB.po

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 16:25:38 2017
New Revision: 35556

URL: http://svn.gna.org/viewcvs/freeciv?rev=35556=rev
Log:
Update my email address in nations,ruledit/en_GB.po too.

Modified:
trunk/translations/nations/en_GB.po
trunk/translations/ruledit/en_GB.po

Modified: trunk/translations/nations/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/nations/en_GB.po?rev=35556=3=35556=diff
==
--- trunk/translations/nations/en_GB.po (original)
+++ trunk/translations/nations/en_GB.po Sat May 13 16:25:38 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2017-01-01 22:01+0200\n"
 "PO-Revision-Date: 2014-07-17 10:09+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"

Modified: trunk/translations/ruledit/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/ruledit/en_GB.po?rev=35556=3=35556=diff
==
--- trunk/translations/ruledit/en_GB.po (original)
+++ trunk/translations/ruledit/en_GB.po Sat May 13 16:25:38 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2017-01-01 22:01+0200\n"
 "PO-Revision-Date: 2014-09-08 22:21+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


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

[Freeciv-commits] r35555 - in /branches/S3_0/translations: nations/en_GB.po ruledit/en_GB.po

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 16:19:29 2017
New Revision: 3

URL: http://svn.gna.org/viewcvs/freeciv?rev=3=rev
Log:
Update my email address in nations,ruledit/en_GB.po too.

Modified:
branches/S3_0/translations/nations/en_GB.po
branches/S3_0/translations/ruledit/en_GB.po

Modified: branches/S3_0/translations/nations/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/translations/nations/en_GB.po?rev=3=35554=3=diff
==
--- branches/S3_0/translations/nations/en_GB.po (original)
+++ branches/S3_0/translations/nations/en_GB.po Sat May 13 16:19:29 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2017-01-01 22:01+0200\n"
 "PO-Revision-Date: 2014-07-17 10:09+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"

Modified: branches/S3_0/translations/ruledit/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/translations/ruledit/en_GB.po?rev=3=35554=3=diff
==
--- branches/S3_0/translations/ruledit/en_GB.po (original)
+++ branches/S3_0/translations/ruledit/en_GB.po Sat May 13 16:19:29 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2017-01-01 22:01+0200\n"
 "PO-Revision-Date: 2014-09-08 22:21+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


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

[Freeciv-commits] r35554 - in /branches/S2_6/translations: nations/en_GB.po ruledit/en_GB.po

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 16:11:42 2017
New Revision: 35554

URL: http://svn.gna.org/viewcvs/freeciv?rev=35554=rev
Log:
Update my email address in nations,ruledit/en_GB.po too.

Modified:
branches/S2_6/translations/nations/en_GB.po
branches/S2_6/translations/ruledit/en_GB.po

Modified: branches/S2_6/translations/nations/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/en_GB.po?rev=35554=35553=35554=diff
==
--- branches/S2_6/translations/nations/en_GB.po (original)
+++ branches/S2_6/translations/nations/en_GB.po Sat May 13 16:11:42 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2015-09-20 02:35+0300\n"
 "PO-Revision-Date: 2014-07-17 10:09+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"

Modified: branches/S2_6/translations/ruledit/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/ruledit/en_GB.po?rev=35554=35553=35554=diff
==
--- branches/S2_6/translations/ruledit/en_GB.po (original)
+++ branches/S2_6/translations/ruledit/en_GB.po Sat May 13 16:11:42 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2014.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2014.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: http://gna.org/projects/freeciv/\n;
 "POT-Creation-Date: 2015-12-09 01:02+0200\n"
 "PO-Revision-Date: 2014-09-08 22:21+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


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

[Freeciv-commits] r35553 - in /website: download.html index.html js/freeciv.js

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 15:17:53 2017
New Revision: 35553

URL: http://svn.gna.org/viewcvs/freeciv?rev=35553=rev
Log:
Announce 2.5.7.

Modified:
website/download.html
website/index.html
website/js/freeciv.js

Modified: website/download.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/download.html?rev=35553=35552=35553=diff
==
--- website/download.html   (original)
+++ website/download.html   Sat May 13 15:17:53 2017
@@ -63,26 +63,26 @@
 
 
 
-Here you can download the latest version of Freeciv: 2.5.6. To learn what's 
changed between releases, see the http://www.freeciv.org/wiki/NEWS;>NEWS page. For more download 
distributions, see the http://www.freeciv.org/wiki/More_distributions;>wiki. 
+Here you can download the latest version of Freeciv: 2.5.7. To learn what's 
changed between releases, see the http://www.freeciv.org/wiki/NEWS;>NEWS page. For more download 
distributions, see the http://www.freeciv.org/wiki/More_distributions;>wiki. 
 
 Stable 2.5
-See the http://www.freeciv.org/wiki/NEWS-2.5.6;>list of changes 
in the most recent release.
+See the http://www.freeciv.org/wiki/NEWS-2.5.7;>list of changes 
in the most recent release.
 
 Source Code
 To compile Freeciv yourself, download the source code:
 
 
-freeciv-2.5.6.tar.bz2 
-http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.6.tar.bz2?download;>Mirror
 1 (sourceforge.net)
-http://files.freeciv.org/stable/freeciv-2.5.6.tar.bz2;>Mirror 2 
(freeciv.org)
-freeciv-2.5.6.zip 
-http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.6.zip?download;>Mirror
 1 (sourceforge.net)
-http://files.freeciv.org/stable/freeciv-2.5.6.zip;>Mirror 2 
(freeciv.org)
+freeciv-2.5.7.tar.bz2 
+http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.7.tar.bz2?download;>Mirror
 1 (sourceforge.net)
+http://files.freeciv.org/stable/freeciv-2.5.7.tar.bz2;>Mirror 2 
(freeciv.org)
+freeciv-2.5.7.zip 
+http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.7.zip?download;>Mirror
 1 (sourceforge.net)
+http://files.freeciv.org/stable/freeciv-2.5.7.zip;>Mirror 2 
(freeciv.org)
 
 
 Windows Packages
 
-
+Windows packages for the latest release are not 
available yet.
 
 Windows binaries are available at:
 

Modified: website/index.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/index.html?rev=35553=35552=35553=diff
==
--- website/index.html  (original)
+++ website/index.html  Sat May 13 15:17:53 2017
@@ -62,7 +62,7 @@


Download Freeciv 
-   Stable Version 2.5.6 released on 19th 
November 2016
+   Stable Version 2.5.7 released on 13th May 
2017
https://play.freeciv.org/;>Play Freeciv-web 
The online browser version of Freeciv using 
HTML5
http://forum.freeciv.org/;>Community Forum 
@@ -92,6 +92,7 @@
 
   Project news

+13th May 2017 - http://www.freeciv.org/wiki/NEWS-2.5.7;>Freeciv 2.5.7 is a minor 
bugfix release in the stable 2.5 series.
 16th Apr 2017 - http://gna.org/;>Gna!, 
which has been faithfully hosting the Freeciv code for nearly 12 years, is http://gna.org/forum/forum.php?forum_id=2545;>expected to shut down 
soon. This website is unaffected and we have already moved downloads to new 
hosting, but we expect some interruption to some other project infrastructure 
(code version control, bug tracking, and mailing lists). We are in the process 
of making alternative arrangements; all important project data is already 
safely backed up. Watch this space for more detail.
 19th Nov 2016 - http://www.freeciv.org/wiki/NEWS-2.5.6;>Freeciv 2.5.6 is a bugfix 
release in the stable 2.5 series.
 30th Jul 2016 - http://www.freeciv.org/wiki/NEWS-2.5.5;>Freeciv 2.5.5 is a bugfix 
release in the stable 2.5 series.

Modified: website/js/freeciv.js
URL: 
http://svn.gna.org/viewcvs/freeciv/website/js/freeciv.js?rev=35553=35552=35553=diff
==
--- website/js/freeciv.js   (original)
+++ website/js/freeciv.js   Sat May 13 15:17:53 2017
@@ -22,9 +22,9 @@
* place.
   
   if (window.ui.os=="Windows") {
-$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.6-win32-gtk2-setup.exe?download;);
+$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.7-win32-gtk2-setup.exe?download;);
   } else if (window.ui.os=="Linux") {
-$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.6.tar.bz2?download;);
+$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.7.tar.bz2?download;);
   } else if (window.ui.os=="Mac OS X") {
 $("#download_button").attr("href",

[Freeciv-commits] r35552 - /website/index.html

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 15:11:07 2017
New Revision: 35552

URL: http://svn.gna.org/viewcvs/freeciv?rev=35552=rev
Log:
Change gna.org links from https to http.

gna.org is still there, but they've let their TLS certificate lapse.

Modified:
website/index.html

Modified: website/index.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/index.html?rev=35552=35551=35552=diff
==
--- website/index.html  (original)
+++ website/index.html  Sat May 13 15:11:07 2017
@@ -83,7 +83,7 @@
   https://www.hostedredmine.com/projects/freeciv;>Bug 
tracker | 
   http://gna.org/projects/freeciv/;>Code | 
   https://github.com/freeciv/freeciv-web;>Freeciv-web 
Github | 
-  https://gna.org/mail/?group=freeciv;>Mailing lists  
+  http://gna.org/mail/?group=freeciv;>Mailing lists  
 
 
 
@@ -92,7 +92,7 @@
 
   Project news

-16th Apr 2017 - https://gna.org/;>Gna!, which has been faithfully hosting the Freeciv 
code for nearly 12 years, is https://gna.org/forum/forum.php?forum_id=2545;>expected to shut down 
soon. This website is unaffected and we have already moved downloads to new 
hosting, but we expect some interruption to some other project infrastructure 
(code version control, bug tracking, and mailing lists). We are in the process 
of making alternative arrangements; all important project data is already 
safely backed up. Watch this space for more detail.
+16th Apr 2017 - http://gna.org/;>Gna!, 
which has been faithfully hosting the Freeciv code for nearly 12 years, is http://gna.org/forum/forum.php?forum_id=2545;>expected to shut down 
soon. This website is unaffected and we have already moved downloads to new 
hosting, but we expect some interruption to some other project infrastructure 
(code version control, bug tracking, and mailing lists). We are in the process 
of making alternative arrangements; all important project data is already 
safely backed up. Watch this space for more detail.
 19th Nov 2016 - http://www.freeciv.org/wiki/NEWS-2.5.6;>Freeciv 2.5.6 is a bugfix 
release in the stable 2.5 series.
 30th Jul 2016 - http://www.freeciv.org/wiki/NEWS-2.5.5;>Freeciv 2.5.5 is a bugfix 
release in the stable 2.5 series.
 14th May 2016 - http://www.freeciv.org/wiki/NEWS-2.5.4;>Freeciv 2.5.4 is a bugfix 
release in the stable 2.5 series.


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

[Freeciv-commits] r35547 - /tags/R2_5_7/fc_version

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 13:48:48 2017
New Revision: 35547

URL: http://svn.gna.org/viewcvs/freeciv?rev=35547=rev
Log:
Strip '+' from version string for release.

Modified:
tags/R2_5_7/fc_version

Modified: tags/R2_5_7/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/tags/R2_5_7/fc_version?rev=35547=35546=35547=diff
==
--- tags/R2_5_7/fc_version  (original)
+++ tags/R2_5_7/fc_version  Sat May 13 13:48:48 2017
@@ -7,7 +7,7 @@
 MAJOR_VERSION="2"
 MINOR_VERSION="5"
 PATCH_VERSION="7"
-VERSION_LABEL="+"
+VERSION_LABEL=""
 
 # 1) Development until MAJOR and MINOR version numbers are
 #set to new release series:


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

[Freeciv-commits] r35546 - /tags/R2_5_7/

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 13:41:05 2017
New Revision: 35546

URL: http://svn.gna.org/viewcvs/freeciv?rev=35546=rev
Log:
Tag 2.5.7 release.

Added:
tags/R2_5_7/
  - copied from r35545, branches/S2_5/


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

[Freeciv-commits] r35545 - /branches/S2_5/ChangeLog

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 13:39:02 2017
New Revision: 35545

URL: http://svn.gna.org/viewcvs/freeciv?rev=35545=rev
Log:
Update ChangeLog as of S2_5 r35544.

Modified:
branches/S2_5/ChangeLog

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

Modified: branches/S2_5/ChangeLog
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/ChangeLog?rev=35545=35544=35545=diff


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

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

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 13:36:18 2017
New Revision: 35544

URL: http://svn.gna.org/viewcvs/freeciv?rev=35544=rev
Log:
Bump version number to '2.5.7'.

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=35544=35543=35544=diff
==
--- branches/S2_5/fc_version(original)
+++ branches/S2_5/fc_versionSat May 13 13:36:18 2017
@@ -6,7 +6,7 @@
 
 MAJOR_VERSION="2"
 MINOR_VERSION="5"
-PATCH_VERSION="6"
+PATCH_VERSION="7"
 VERSION_LABEL="+"
 
 # 1) Development until MAJOR and MINOR version numbers are


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

[Freeciv-commits] r35543 - /branches/S2_5/NEWS-2.5

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 13:30:59 2017
New Revision: 35543

URL: http://svn.gna.org/viewcvs/freeciv?rev=35543=rev
Log:
Refresh NEWS-2.5 for 2.5.7, from wiki.

Modified:
branches/S2_5/NEWS-2.5

Modified: branches/S2_5/NEWS-2.5
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/NEWS-2.5?rev=35543=35542=35543=diff
==
--- branches/S2_5/NEWS-2.5  (original)
+++ branches/S2_5/NEWS-2.5  Sat May 13 13:30:59 2017
@@ -1,10 +1,76 @@
 
-Welcome to Freeciv 2.5.6
+Welcome to Freeciv 2.5.7
 
 
 The changes in the 2.5.x series are summarised below.
 For changes prior to 2.5, see NEWS. For more detailed changes,
 see the ChangeLog file.
+
+
+CHANGES FROM 2.5.6 to 2.5.7
+---
+
+   (from )
+
+   2.5.7 is a bugfix release.
+
+Server / General
+
+Changes affecting players (supplied rulesets)
+
+ * The score list shown when the game is over now includes dead
+   players. GNA#17248
+ * Fix a server crash when the AI could not find a suitable ferryboat
+   unit type. (This was observed with a modified ruleset.) GNA#25628
+ * Fix a typo'd city name in the Newfoundland nation. HRM#658528
+ * Correctly diagnose failure to load a ruleset needed by a saved
+   game. HRM#659503
+ * Improved behavior after failing to write a file such as a saved
+   game. GNAPATCH#8048 GNA#25391
+ * Improved robustness against reading broken savegames. GNA#25416
+
+General
+
+ * Tiny optimization for speed. HRM#658612
+ * Fix a tiny memory leak. GNA#25246
+ * Various internal changes which should only affect developers.
+   GNA#25319 GNA#25508 HRM#655305 GNA#25430
+
+Clients
+
+ * The "Manual Turn Done in AI mode" client option now does something
+   useful. HRM#657412
+ * (Qt) Player dialog now shows whether given nation shares vision to
+   other nations. GNAPATCH#8115
+ * (Qt) In pregame, pressing Enter on the username text box will now
+   initiate a connection. GNAPATCH#8118
+ * (Qt) The player dialog sometimes did not show new players, e.g.
+   after a civil war. GNA#25506
+ * (Qt) Focus might be set incorrectly to map after the selected unit
+   changed. GNA#25505
+ * (Gtk3) Fix some Gtk warnings on the console. GNAPATCH#7163
+
+Help / Documentation
+
+ * Update docs to reflect move away from gna.org. HRM#637952
+   HRM#652494 HRM#655380 HRM#637953 HRM#656595
+ * Refresh some links in INSTALL. HRM#656476
+ * Update the FAQ a bit.
+ * Miscellaneous changes to developer/ruleset docs. GNAPATCH#8109
+
+Translations
+
+ * Updated translations:
+  + Complete translations: French, British English, Russian.
+  + Incomplete translations: Finnish (100% core, 92% nations),
+Ukrainian (100% core, 79% nations).
+
+Build/portability
+
+ * Fix warning seen with Clang 3.9. Freeciv builds cleanly with Clang
+   4.0. GNA#25314
+ * Fix warnings seen with GCC 7, with which Freeciv builds cleanly.
+   HRM#657309 HRM#657332
 
 
 CHANGES FROM 2.5.5 to 2.5.6


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

[Freeciv-commits] r35542 - in /branches/S2_5/translations: freeciv/ nations/

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 13:22:58 2017
New Revision: 35542

URL: http://svn.gna.org/viewcvs/freeciv?rev=35542=rev
Log:
Results of running "make update-po"
in translations/freeciv/ and translations/nations/

Modified:
branches/S2_5/translations/freeciv/ar.po
branches/S2_5/translations/freeciv/bg.po
branches/S2_5/translations/freeciv/ca.po
branches/S2_5/translations/freeciv/cs.po
branches/S2_5/translations/freeciv/da.po
branches/S2_5/translations/freeciv/de.po
branches/S2_5/translations/freeciv/el.po
branches/S2_5/translations/freeciv/en_GB.po
branches/S2_5/translations/freeciv/eo.po
branches/S2_5/translations/freeciv/es.po
branches/S2_5/translations/freeciv/et.po
branches/S2_5/translations/freeciv/fa.po
branches/S2_5/translations/freeciv/fi.po
branches/S2_5/translations/freeciv/fr.po
branches/S2_5/translations/freeciv/ga.po
branches/S2_5/translations/freeciv/gd.po
branches/S2_5/translations/freeciv/he.po
branches/S2_5/translations/freeciv/hu.po
branches/S2_5/translations/freeciv/id.po
branches/S2_5/translations/freeciv/it.po
branches/S2_5/translations/freeciv/ja.po
branches/S2_5/translations/freeciv/ko.po
branches/S2_5/translations/freeciv/lt.po
branches/S2_5/translations/freeciv/nb.po
branches/S2_5/translations/freeciv/nl.po
branches/S2_5/translations/freeciv/pl.po
branches/S2_5/translations/freeciv/pt.po
branches/S2_5/translations/freeciv/pt_BR.po
branches/S2_5/translations/freeciv/ro.po
branches/S2_5/translations/freeciv/ru.po
branches/S2_5/translations/freeciv/sr.po
branches/S2_5/translations/freeciv/sv.po
branches/S2_5/translations/freeciv/tr.po
branches/S2_5/translations/freeciv/uk.po
branches/S2_5/translations/freeciv/zh_CN.po
branches/S2_5/translations/freeciv/zh_TW.po
branches/S2_5/translations/nations/ar.po
branches/S2_5/translations/nations/bg.po
branches/S2_5/translations/nations/ca.po
branches/S2_5/translations/nations/cs.po
branches/S2_5/translations/nations/da.po
branches/S2_5/translations/nations/de.po
branches/S2_5/translations/nations/el.po
branches/S2_5/translations/nations/en_GB.po
branches/S2_5/translations/nations/eo.po
branches/S2_5/translations/nations/es.po
branches/S2_5/translations/nations/et.po
branches/S2_5/translations/nations/fa.po
branches/S2_5/translations/nations/fi.po
branches/S2_5/translations/nations/fr.po
branches/S2_5/translations/nations/ga.po
branches/S2_5/translations/nations/gd.po
branches/S2_5/translations/nations/he.po
branches/S2_5/translations/nations/hu.po
branches/S2_5/translations/nations/id.po
branches/S2_5/translations/nations/it.po
branches/S2_5/translations/nations/ja.po
branches/S2_5/translations/nations/ko.po
branches/S2_5/translations/nations/lt.po
branches/S2_5/translations/nations/nb.po
branches/S2_5/translations/nations/nl.po
branches/S2_5/translations/nations/pl.po
branches/S2_5/translations/nations/pt.po
branches/S2_5/translations/nations/pt_BR.po
branches/S2_5/translations/nations/ro.po
branches/S2_5/translations/nations/ru.po
branches/S2_5/translations/nations/sr.po
branches/S2_5/translations/nations/sv.po
branches/S2_5/translations/nations/tr.po
branches/S2_5/translations/nations/uk.po
branches/S2_5/translations/nations/zh_CN.po
branches/S2_5/translations/nations/zh_TW.po

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

Modified: branches/S2_5/translations/freeciv/ar.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ar.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/bg.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/bg.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/ca.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ca.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/cs.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/cs.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/da.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/da.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/de.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/de.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/el.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/el.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/en_GB.po?rev=35542=35541=35542=diff

Modified: branches/S2_5/translations/freeciv/eo.po
URL:

[Freeciv-commits] r35541 - /branches/S2_5/translations/nations/en_GB.po

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 13:20:01 2017
New Revision: 35541

URL: http://svn.gna.org/viewcvs/freeciv?rev=35541=rev
Log:
Update my email address in nations/en_GB.po too.

Modified:
branches/S2_5/translations/nations/en_GB.po

Modified: branches/S2_5/translations/nations/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/en_GB.po?rev=35541=35540=35541=diff
==
--- branches/S2_5/translations/nations/en_GB.po (original)
+++ branches/S2_5/translations/nations/en_GB.po Sat May 13 13:20:01 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2016.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2016.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -20,7 +20,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-11-19 11:39+\n"
 "PO-Revision-Date: 2016-07-07 01:48+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


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

[Freeciv-commits] r35540 - /branches/S2_5/doc/FAQ

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 13:09:19 2017
New Revision: 35540

URL: http://svn.gna.org/viewcvs/freeciv?rev=35540=rev
Log:
Update doc/FAQ manually from wiki.

Modified:
branches/S2_5/doc/FAQ

Modified: branches/S2_5/doc/FAQ
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/FAQ?rev=35540=35539=35540=diff
==
--- branches/S2_5/doc/FAQ   (original)
+++ branches/S2_5/doc/FAQ   Sat May 13 13:09:19 2017
@@ -647,7 +647,7 @@
 mike@localhost:/usr/local/bin$ ./freeciv-server
 This is the server for Freeciv version 2.5.0
 You can learn a lot about Freeciv at http://www.freeciv.org/
-2: Loading rulesets
+2: Loading rulesets.
 2: AI*1 has been added as Easy level AI-controlled player (classic).
 2: AI*2 has been added as Easy level AI-controlled player (classic).
 2: AI*3 has been added as Easy level AI-controlled player (classic).
@@ -679,9 +679,11 @@
If your Metaserver tab turns up an empty list, there might something
wrong with your setup.
 
-   First, check your Freeciv version. Freeciv 1.9.0 up to and including
-   1.14.2 use the old metaserver, 2.0 and higher use the new metaserver;
-   if you're mixing versions, you may be getting the wrong list.
+   First, check your Freeciv version. Freeciv clients can only talk to
+   servers of the same major version (2.5.x can only talk to 2.5.y), and
+   there may simply be no public servers for the version you're running.
+   Check out the web interface (which shows servers for all versions) and
+   look at the "version" column.
 
If you can view the metaserver page with your web browser, and servers
are listed, but the client's Metaserver tab still fails to list them,
@@ -698,8 +700,8 @@
 
 3.5 Am I using the latest version? Do I need to upgrade?
 
-   The current stable Freeciv version is 2.4.2. For an overview of changes
-   that went into this release, see the NEWS-2.4.2 article.
+   The current stable Freeciv version is 2.5.7. For an overview of changes
+   that went into this release, see the NEWS-2.5.7 article.
 
The NEWS-#.#.# article is only updated for a new release; updates to
Subversion are listed in the freeciv-commits archives (see Mailing
@@ -710,14 +712,14 @@
contributed binaries.
 
It's unlikely that all precompiled binaries and ports have been updated
-   to 2.4.2 yet. If you can contribute, please do! Prepare a package and
+   to 2.5.7 yet. If you can contribute, please do! Prepare a package and
announce it to freeciv-...@freelists.org.
 
Clients and servers of different major versions are generally
incompatible due to changes in the client/server protocol. You will see
incompatibilities as a 'mismatched capabilities' error. Different minor
versions should be compatible, however. For example, 2.0.0 and 2.0.8
-   are compatible; 2.0.0 and 2.4.2 are not.
+   are compatible; 2.0.0 and 2.5.7 are not.
 
 ---
 
@@ -736,7 +738,7 @@
 3.7 HOME directory not set?
 
The Freeciv client wants to write a configuration file named
-   .freeciv-client-rc-2.2 (for Freeciv 2.2.x) in your $HOME directory. On
+   .freeciv-client-rc-2.5 (for Freeciv 2.5.x) in your $HOME directory. On
Windows XP $HOME is usually "C:\Documents and
Settings\username\Application Data" On Windows 7 it can be found under
"C:\Users\username\AppData\Roaming".The $HOME directory can be set from
@@ -764,9 +766,9 @@
 3.9 How do I restart a saved game?
 
If for some reason you can't use the start-screen interface for loading
-   a game, you can load one directly through the server command line (see
-   Command-line options). You can start freeciv-server with the -f option,
-   for example:
+   a game, you can load one directly through the client or server command
+   line (see Command-line options). You can start a client such as
+   freeciv-gtk2, or freeciv-server, with the -f option, for example:
 freeciv-server -f freeciv-T0175-Y01250-auto.sav.bz2
 
Or you can use the /load command inside the server before starting the
@@ -779,11 +781,12 @@
In a local game started from the client, the games will be saved into
the default Freeciv save directory (typically ~/.freeciv/saves/). If
you are running the server from the command line, however, any
-   savegames will be stored in the current directory. If the saveturns
-   server variable is set, the server will periodically save the game
-   automatically (which can take a lot of disk space in some cases). In
-   any case, you should check the ownership, permissions, and disk
-   space/quota for the directory or partition you're trying to save to.
+   savegames will be stored in the current directory. If the autosaves
+   server setting is set appropriately, the server will periodically save
+   the game automatically (which can take a lot of disk space in some
+   cases); the frequency is controlled by the saveturns setting. In any
+   case, you should check the ownership,

[Freeciv-commits] r35537 - /branches/S2_5/server/savegame2.c

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 12:03:37 2017
New Revision: 35537

URL: http://svn.gna.org/viewcvs/freeciv?rev=35537=rev
Log:
Bomb out after failing to load ruleset during savegame loading.

Since first parameter of sg_failure_ret() is an assert kind of pattern
to decide if any error handling is needed, having 'TRUE' there is
certainly an error. There is one such case, when loading of ruleset has
failed.

Patch by Marko Lindqvist.

See hrm bug #659503.

Modified:
branches/S2_5/server/savegame2.c

Modified: branches/S2_5/server/savegame2.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/savegame2.c?rev=35537=35536=35537=diff
==
--- branches/S2_5/server/savegame2.c(original)
+++ branches/S2_5/server/savegame2.cSat May 13 12:03:37 2017
@@ -1660,7 +1660,7 @@
   }
   if (!load_rulesets(NULL, TRUE)) {
 /* Failed to load correct ruleset */
-sg_failure_ret(TRUE, "Failed to load ruleset");
+sg_failure_ret(FALSE, "Failed to load ruleset");
   }
 
   /* Load improvements. */


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

[Freeciv-commits] r35536 - /branches/S2_5/doc/README

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 12:03:33 2017
New Revision: 35536

URL: http://svn.gna.org/viewcvs/freeciv?rev=35536=rev
Log:
Update README for freeciv-announce move.

See hrm feature #637953.

Modified:
branches/S2_5/doc/README

Modified: branches/S2_5/doc/README
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/README?rev=35536=35535=35536=diff
==
--- branches/S2_5/doc/README(original)
+++ branches/S2_5/doc/READMESat May 13 12:03:33 2017
@@ -516,24 +516,29 @@
 Mailing lists:
 ==
 
-We maintain 4 mailing lists. (At the time of writing, the mailing list
-hosting for -announce and -commits is subject to change.)
-
-  freeciv-annou...@gna.org
+We maintain 4 mailing lists:
+
+  freeciv-annou...@freelists.org
Announcements of general interest.
This is a "Read Only" list, with infrequent messages.
In other words you can't mail this list, just read it.
+   Subscribe: https://www.freelists.org/list/freeciv-announce
   freeciv-i...@freelists.org
Freeciv translation.
All discussions related to translating the Freeciv code,
documentation, and website, into other languages than
English.
+   Subscribe: https://www.freelists.org/list/freeciv-i18n
   freeciv-...@freelists.org
Freeciv development.
+   Subscribe: https://www.freelists.org/list/freeciv-dev
   freeciv-commits@gna.org
Notifications of changes to the code repository.
This is a "Read Only" list, carrying automated messages.
In other words you can't mail this list, just read it.
+   (At the time of writing, gna.org is expected to shut
+   down soon; we're not yet sure what arrangements we'll
+   have for a replacement commits mailing list.)
 
 All lists are open to the general public and everyone is welcome to join.
 Only maintainers may post to the -announce and -commits lists.


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

[Freeciv-commits] r35534 - /branches/S2_6/doc/README

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 12:03:11 2017
New Revision: 35534

URL: http://svn.gna.org/viewcvs/freeciv?rev=35534=rev
Log:
Update README for freeciv-announce move.

See hrm feature #637953.

Modified:
branches/S2_6/doc/README

Modified: branches/S2_6/doc/README
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README?rev=35534=35533=35534=diff
==
--- branches/S2_6/doc/README(original)
+++ branches/S2_6/doc/READMESat May 13 12:03:11 2017
@@ -526,24 +526,29 @@
 Mailing lists:
 ==
 
-We maintain 4 mailing lists. (At the time of writing, the mailing list
-hosting for -announce and -commits is subject to change.)
-
-  freeciv-annou...@gna.org
+We maintain 4 mailing lists:
+
+  freeciv-annou...@freelists.org
Announcements of general interest.
This is a "Read Only" list, with infrequent messages.
In other words you can't mail this list, just read it.
+   Subscribe: https://www.freelists.org/list/freeciv-announce
   freeciv-i...@freelists.org
Freeciv translation.
All discussions related to translating the Freeciv code,
documentation, and website, into other languages than
English.
+   Subscribe: https://www.freelists.org/list/freeciv-i18n
   freeciv-...@freelists.org
Freeciv development.
+   Subscribe: https://www.freelists.org/list/freeciv-dev
   freeciv-commits@gna.org
Notifications of changes to the code repository.
This is a "Read Only" list, carrying automated messages.
In other words you can't mail this list, just read it.
+   (At the time of writing, gna.org is expected to shut
+   down soon; we're not yet sure what arrangements we'll
+   have for a replacement commits mailing list.)
 
 All lists are open to the general public and everyone is welcome to join.
 Only maintainers may post to the -announce and -commits lists.


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

[Freeciv-commits] r35535 - /branches/S2_6/server/savegame2.c

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 12:03:15 2017
New Revision: 35535

URL: http://svn.gna.org/viewcvs/freeciv?rev=35535=rev
Log:
Bomb out after failing to load ruleset during savegame loading.

Since first parameter of sg_failure_ret() is an assert kind of pattern
to decide if any error handling is needed, having 'TRUE' there is
certainly an error. There is one such case, when loading of ruleset has
failed.

Patch by Marko Lindqvist.

See hrm bug #659503.

Modified:
branches/S2_6/server/savegame2.c

Modified: branches/S2_6/server/savegame2.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/savegame2.c?rev=35535=35534=35535=diff
==
--- branches/S2_6/server/savegame2.c(original)
+++ branches/S2_6/server/savegame2.cSat May 13 12:03:15 2017
@@ -1569,7 +1569,7 @@
   }
   if (!load_rulesets(NULL, TRUE, FALSE)) {
 /* Failed to load correct ruleset */
-sg_failure_ret(TRUE, _("Failed to load ruleset"));
+sg_failure_ret(FALSE, _("Failed to load ruleset"));
   }
 }
 


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

[Freeciv-commits] r35533 - in /branches/S3_0/server: savegame2.c savegame3.c

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 12:02:44 2017
New Revision: 35533

URL: http://svn.gna.org/viewcvs/freeciv?rev=35533=rev
Log:
Bomb out after failing to load ruleset during savegame loading.

Since first parameter of sg_failure_ret() is an assert kind of pattern
to decide if any error handling is needed, having 'TRUE' there is
certainly an error. There is one such case, when loading of ruleset has
failed.

Patch by Marko Lindqvist.

See hrm bug #659503.

Modified:
branches/S3_0/server/savegame2.c
branches/S3_0/server/savegame3.c

Modified: branches/S3_0/server/savegame2.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/savegame2.c?rev=35533=35532=35533=diff
==
--- branches/S3_0/server/savegame2.c(original)
+++ branches/S3_0/server/savegame2.cSat May 13 12:02:44 2017
@@ -1093,7 +1093,7 @@
   }
   if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
 /* Failed to load correct ruleset */
-sg_failure_ret(TRUE, _("Failed to load ruleset"));
+sg_failure_ret(FALSE, _("Failed to load ruleset"));
   }
 }
 

Modified: branches/S3_0/server/savegame3.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/savegame3.c?rev=35533=35532=35533=diff
==
--- branches/S3_0/server/savegame3.c(original)
+++ branches/S3_0/server/savegame3.cSat May 13 12:02:44 2017
@@ -1312,7 +1312,7 @@
 }
 if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
   /* Failed to load correct ruleset */
-  sg_failure_ret(TRUE, "Failed to load ruleset");
+  sg_failure_ret(FALSE, "Failed to load ruleset");
 }
   }
 


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

[Freeciv-commits] r35532 - /branches/S3_0/doc/README

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 12:02:40 2017
New Revision: 35532

URL: http://svn.gna.org/viewcvs/freeciv?rev=35532=rev
Log:
Update README for freeciv-announce move.

See hrm feature #637953.

Modified:
branches/S3_0/doc/README

Modified: branches/S3_0/doc/README
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/README?rev=35532=35531=35532=diff
==
--- branches/S3_0/doc/README(original)
+++ branches/S3_0/doc/READMESat May 13 12:02:40 2017
@@ -521,24 +521,29 @@
 Mailing lists:
 ==
 
-We maintain 4 mailing lists. (At the time of writing, the mailing list
-hosting for -announce and -commits is subject to change.)
-
-  freeciv-annou...@gna.org
+We maintain 4 mailing lists:
+
+  freeciv-annou...@freelists.org
Announcements of general interest.
This is a "Read Only" list, with infrequent messages.
In other words you can't mail this list, just read it.
+   Subscribe: https://www.freelists.org/list/freeciv-announce
   freeciv-i...@freelists.org
Freeciv translation.
All discussions related to translating the Freeciv code,
documentation, and website, into other languages than
English.
+   Subscribe: https://www.freelists.org/list/freeciv-i18n
   freeciv-...@freelists.org
Freeciv development.
+   Subscribe: https://www.freelists.org/list/freeciv-dev
   freeciv-commits@gna.org
Notifications of changes to the code repository.
This is a "Read Only" list, carrying automated messages.
In other words you can't mail this list, just read it.
+   (At the time of writing, gna.org is expected to shut
+   down soon; we're not yet sure what arrangements we'll
+   have for a replacement commits mailing list.)
 
 All lists are open to the general public and everyone is welcome to join.
 Only maintainers may post to the -announce and -commits lists.


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

[Freeciv-commits] r35531 - in /trunk/server: savegame2.c savegame3.c

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 12:02:18 2017
New Revision: 35531

URL: http://svn.gna.org/viewcvs/freeciv?rev=35531=rev
Log:
Bomb out after failing to load ruleset during savegame loading.

Since first parameter of sg_failure_ret() is an assert kind of pattern
to decide if any error handling is needed, having 'TRUE' there is
certainly an error. There is one such case, when loading of ruleset has
failed.

Patch by Marko Lindqvist.

See hrm bug #659503.

Modified:
trunk/server/savegame2.c
trunk/server/savegame3.c

Modified: trunk/server/savegame2.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=35531=35530=35531=diff
==
--- trunk/server/savegame2.c(original)
+++ trunk/server/savegame2.cSat May 13 12:02:18 2017
@@ -1099,7 +1099,7 @@
   }
   if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
 /* Failed to load correct ruleset */
-sg_failure_ret(TRUE, _("Failed to load ruleset"));
+sg_failure_ret(FALSE, _("Failed to load ruleset"));
   }
 }
 

Modified: trunk/server/savegame3.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?rev=35531=35530=35531=diff
==
--- trunk/server/savegame3.c(original)
+++ trunk/server/savegame3.cSat May 13 12:02:18 2017
@@ -1318,7 +1318,7 @@
 }
 if (!load_rulesets(NULL, FALSE, TRUE, FALSE)) {
   /* Failed to load correct ruleset */
-  sg_failure_ret(TRUE, "Failed to load ruleset");
+  sg_failure_ret(FALSE, "Failed to load ruleset");
 }
   }
 


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

[Freeciv-commits] r35530 - /trunk/doc/README

2017-05-13 Thread 0jacobnk . gna

Author: jtn
Date: Sat May 13 12:02:14 2017
New Revision: 35530

URL: http://svn.gna.org/viewcvs/freeciv?rev=35530=rev
Log:
Update README for freeciv-announce move.

See hrm feature #637953.

Modified:
trunk/doc/README

Modified: trunk/doc/README
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README?rev=35530=35529=35530=diff
==
--- trunk/doc/README(original)
+++ trunk/doc/READMESat May 13 12:02:14 2017
@@ -516,24 +516,29 @@
 Mailing lists:
 ==
 
-We maintain 4 mailing lists. (At the time of writing, the mailing list
-hosting for -announce and -commits is subject to change.)
-
-  freeciv-annou...@gna.org
+We maintain 4 mailing lists:
+
+  freeciv-annou...@freelists.org
Announcements of general interest.
This is a "Read Only" list, with infrequent messages.
In other words you can't mail this list, just read it.
+   Subscribe: https://www.freelists.org/list/freeciv-announce
   freeciv-i...@freelists.org
Freeciv translation.
All discussions related to translating the Freeciv code,
documentation, and website, into other languages than
English.
+   Subscribe: https://www.freelists.org/list/freeciv-i18n
   freeciv-...@freelists.org
Freeciv development.
+   Subscribe: https://www.freelists.org/list/freeciv-dev
   freeciv-commits@gna.org
Notifications of changes to the code repository.
This is a "Read Only" list, carrying automated messages.
In other words you can't mail this list, just read it.
+   (At the time of writing, gna.org is expected to shut
+   down soon; we're not yet sure what arrangements we'll
+   have for a replacement commits mailing list.)
 
 All lists are open to the general public and everyone is welcome to join.
 Only maintainers may post to the -announce and -commits lists.


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

[Freeciv-commits] r35529 - in /branches/S2_5/translations: freeciv/ru.po nations/ru.po

2017-05-12 Thread 0jacobnk . gna

Author: jtn
Date: Fri May 12 21:24:38 2017
New Revision: 35529

URL: http://svn.gna.org/viewcvs/freeciv?rev=35529=rev
Log:
Updated Russian translation from Konstantin Vedeneev.
freeciv: 100%: 6293 translated.
nations: 100%: 1844 translated.

Modified:
branches/S2_5/translations/freeciv/ru.po
branches/S2_5/translations/nations/ru.po

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

Modified: branches/S2_5/translations/freeciv/ru.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ru.po?rev=35529=35528=35529=diff

Modified: branches/S2_5/translations/nations/ru.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/ru.po?rev=35529=35528=35529=diff


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

[Freeciv-commits] r35466 - in /trunk/translations/core: ca.po de.po es.po fi.po fr.po gd.po pl.po ru.po uk.po

2017-05-09 Thread 0jacobnk . gna

Author: jtn
Date: Wed May 10 02:16:38 2017
New Revision: 35466

URL: http://svn.gna.org/viewcvs/freeciv?rev=35466=rev
Log:
Manually adjust po-files after hrm feature #637953.

Only touched those translations which already had a non-fuzzy
translation of the affected string.

Modified:
trunk/translations/core/ca.po
trunk/translations/core/de.po
trunk/translations/core/es.po
trunk/translations/core/fi.po
trunk/translations/core/fr.po
trunk/translations/core/gd.po
trunk/translations/core/pl.po
trunk/translations/core/ru.po
trunk/translations/core/uk.po

Modified: trunk/translations/core/ca.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/ca.po?rev=35466=35465=35466=diff
==
--- trunk/translations/core/ca.po   (original)
+++ trunk/translations/core/ca.po   Wed May 10 02:16:38 2017
@@ -35892,15 +35892,17 @@
 
 #: data/helpdata.txt:2314
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org - llista pÃºblica de correu de "
+"freeciv-...@freelists.org   - llista pÃºblica de correu de "
 "desenvolupament\n"
 "  (els arxius sÃ³n pÃºblics)\n"
-"freeciv-maintain...@gna.org - llista privada d'administraciÃ³\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- llista privada d'administraciÃ³\n"
 "  del projecte (per problemes de seguretat, "
 "etc)"
 

Modified: trunk/translations/core/de.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/de.po?rev=35466=35465=35466=diff
==
--- trunk/translations/core/de.po   (original)
+++ trunk/translations/core/de.po   Wed May 10 02:16:38 2017
@@ -35045,14 +35045,16 @@
 
 #: data/helpdata.txt:2314
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org â Ã¶ffentliche Entwicklungsmailingliste\n"
+"freeciv-...@freelists.org   â Ã¶ffentliche Entwicklungsmailingliste\n"
 "  (Das Archiv ist frei zugÃ¤nglich)\n"
-"freeciv-maintain...@gna.org â private Projektadministrationsliste\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"â private Projektadministrationsliste\n"
 "  (fÃ¼r Sicherheitsprobleme u.Ã¤.)"
 
 #: data/helpdata.txt:2319

Modified: trunk/translations/core/es.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/es.po?rev=35466=35465=35466=diff
==
--- trunk/translations/core/es.po   (original)
+++ trunk/translations/core/es.po   Wed May 10 02:16:38 2017
@@ -35054,14 +35054,16 @@
 
 #: data/helpdata.txt:2314
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org - lista de correo pÃºblica de desarrollo\n"
-"   (los correos son pÃºblicos)\n"
-"freeciv-maintain...@gna.org - lista de correo privada de 
administraciÃ³n\n"
+"freeciv-...@freelists.org   - lista de correo pÃºblica de desarrollo\n"
+"  (los correos son pÃºblicos)\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- lista de correo privada de 
administraciÃ³n\n"
 "  del proyecto (para cuestiones de "
 "seguridad, etc)"
 

Modified: trunk/translations/core/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/fi.po?rev=35466=35465=35466=diff

[Freeciv-commits] r35465 - in /branches/S3_0/translations/core: ca.po de.po es.po fi.po fr.po gd.po pl.po ru.po uk.po

2017-05-09 Thread 0jacobnk . gna

Author: jtn
Date: Wed May 10 02:06:46 2017
New Revision: 35465

URL: http://svn.gna.org/viewcvs/freeciv?rev=35465=rev
Log:
Manually adjust po-files after hrm feature #637953.

Only touched those translations which already had a non-fuzzy
translation of the affected string.

Modified:
branches/S3_0/translations/core/ca.po
branches/S3_0/translations/core/de.po
branches/S3_0/translations/core/es.po
branches/S3_0/translations/core/fi.po
branches/S3_0/translations/core/fr.po
branches/S3_0/translations/core/gd.po
branches/S3_0/translations/core/pl.po
branches/S3_0/translations/core/ru.po
branches/S3_0/translations/core/uk.po

Modified: branches/S3_0/translations/core/ca.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/translations/core/ca.po?rev=35465=35464=35465=diff
==
--- branches/S3_0/translations/core/ca.po   (original)
+++ branches/S3_0/translations/core/ca.po   Wed May 10 02:06:46 2017
@@ -35892,15 +35892,17 @@
 
 #: data/helpdata.txt:2314
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org - llista pÃºblica de correu de "
+"freeciv-...@freelists.org   - llista pÃºblica de correu de "
 "desenvolupament\n"
 "  (els arxius sÃ³n pÃºblics)\n"
-"freeciv-maintain...@gna.org - llista privada d'administraciÃ³\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- llista privada d'administraciÃ³\n"
 "  del projecte (per problemes de seguretat, "
 "etc)"
 

Modified: branches/S3_0/translations/core/de.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/translations/core/de.po?rev=35465=35464=35465=diff
==
--- branches/S3_0/translations/core/de.po   (original)
+++ branches/S3_0/translations/core/de.po   Wed May 10 02:06:46 2017
@@ -35045,14 +35045,16 @@
 
 #: data/helpdata.txt:2314
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org â Ã¶ffentliche Entwicklungsmailingliste\n"
+"freeciv-...@freelists.org   â Ã¶ffentliche Entwicklungsmailingliste\n"
 "  (Das Archiv ist frei zugÃ¤nglich)\n"
-"freeciv-maintain...@gna.org â private Projektadministrationsliste\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"â private Projektadministrationsliste\n"
 "  (fÃ¼r Sicherheitsprobleme u.Ã¤.)"
 
 #: data/helpdata.txt:2319

Modified: branches/S3_0/translations/core/es.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/translations/core/es.po?rev=35465=35464=35465=diff
==
--- branches/S3_0/translations/core/es.po   (original)
+++ branches/S3_0/translations/core/es.po   Wed May 10 02:06:46 2017
@@ -35054,14 +35054,16 @@
 
 #: data/helpdata.txt:2314
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org - lista de correo pÃºblica de desarrollo\n"
-"   (los correos son pÃºblicos)\n"
-"freeciv-maintain...@gna.org - lista de correo privada de 
administraciÃ³n\n"
+"freeciv-...@freelists.org   - lista de correo pÃºblica de desarrollo\n"
+"  (los correos son pÃºblicos)\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- lista de correo privada de 
administraciÃ³n\n"
 "  del proyecto (para cuestiones de "
 "seguridad,

[Freeciv-commits] r35464 - in /branches/S2_6/translations/freeciv: ca.po de.po es.po fi.po fr.po gd.po pl.po ru.po uk.po

2017-05-09 Thread 0jacobnk . gna

Author: jtn
Date: Wed May 10 01:56:07 2017
New Revision: 35464

URL: http://svn.gna.org/viewcvs/freeciv?rev=35464=rev
Log:
Manually adjust po-files after hrm feature #637953.

Only touched those translations which already had a non-fuzzy
translation of the affected string.

Modified:
branches/S2_6/translations/freeciv/ca.po
branches/S2_6/translations/freeciv/de.po
branches/S2_6/translations/freeciv/es.po
branches/S2_6/translations/freeciv/fi.po
branches/S2_6/translations/freeciv/fr.po
branches/S2_6/translations/freeciv/gd.po
branches/S2_6/translations/freeciv/pl.po
branches/S2_6/translations/freeciv/ru.po
branches/S2_6/translations/freeciv/uk.po

Modified: branches/S2_6/translations/freeciv/ca.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/ca.po?rev=35464=35463=35464=diff
==
--- branches/S2_6/translations/freeciv/ca.po(original)
+++ branches/S2_6/translations/freeciv/ca.poWed May 10 01:56:07 2017
@@ -30696,15 +30696,17 @@
 
 #: data/helpdata.txt:2282
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org - llista pÃºblica de correu de "
+"freeciv-...@freelists.org   - llista pÃºblica de correu de "
 "desenvolupament\n"
 "  (els arxius sÃ³n pÃºblics)\n"
-"freeciv-maintain...@gna.org - llista privada d'administraciÃ³\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- llista privada d'administraciÃ³\n"
 "  del projecte (per problemes de seguretat, "
 "etc)"
 

Modified: branches/S2_6/translations/freeciv/de.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/de.po?rev=35464=35463=35464=diff
==
--- branches/S2_6/translations/freeciv/de.po(original)
+++ branches/S2_6/translations/freeciv/de.poWed May 10 01:56:07 2017
@@ -32979,14 +32979,16 @@
 
 #: data/helpdata.txt:2293
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org â Ã¶ffentliche Entwicklungsmailingliste\n"
+"freeciv-...@freelists.org   â Ã¶ffentliche Entwicklungsmailingliste\n"
 "  (Das Archiv ist frei zugÃ¤nglich)\n"
-"freeciv-maintain...@gna.org â private Projektadministrationsliste\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"â private Projektadministrationsliste\n"
 "  (fÃ¼r Sicherheitsprobleme u.Ã¤.)"
 
 #: data/helpdata.txt:2298

Modified: branches/S2_6/translations/freeciv/es.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/es.po?rev=35464=35463=35464=diff
==
--- branches/S2_6/translations/freeciv/es.po(original)
+++ branches/S2_6/translations/freeciv/es.poWed May 10 01:56:07 2017
@@ -31495,14 +31495,16 @@
 
 #: data/helpdata.txt:2293
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org - lista de correo pÃºblica de desarrollo\n"
-"   (los correos son pÃºblicos)\n"
-"freeciv-maintain...@gna.org - lista de correo privada de 
administraciÃ³n\n"
+"freeciv-...@freelists.org   - lista de correo pÃºblica de desarrollo\n"
+"  (los correos son pÃºblicos)\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- lista de correo privada de 
administraciÃ³n\n"
 "  del

[Freeciv-commits] r35463 - in /branches/S2_5/translations/freeciv: ca.po de.po es.po fi.po fr.po gd.po pl.po ru.po uk.po

2017-05-09 Thread 0jacobnk . gna

Author: jtn
Date: Wed May 10 01:53:18 2017
New Revision: 35463

URL: http://svn.gna.org/viewcvs/freeciv?rev=35463=rev
Log:
Manually adjust po-files after hrm feature #637953.

Only touched those translations which already had a non-fuzzy
translation of the affected string.

Modified:
branches/S2_5/translations/freeciv/ca.po
branches/S2_5/translations/freeciv/de.po
branches/S2_5/translations/freeciv/es.po
branches/S2_5/translations/freeciv/fi.po
branches/S2_5/translations/freeciv/fr.po
branches/S2_5/translations/freeciv/gd.po
branches/S2_5/translations/freeciv/pl.po
branches/S2_5/translations/freeciv/ru.po
branches/S2_5/translations/freeciv/uk.po

Modified: branches/S2_5/translations/freeciv/ca.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ca.po?rev=35463=35462=35463=diff
==
--- branches/S2_5/translations/freeciv/ca.po(original)
+++ branches/S2_5/translations/freeciv/ca.poWed May 10 01:53:18 2017
@@ -28558,15 +28558,17 @@
 
 #: data/helpdata.txt:2307
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org - llista pÃºblica de correu de "
+"freeciv-...@freelists.org   - llista pÃºblica de correu de "
 "desenvolupament\n"
 "  (els arxius sÃ³n pÃºblics)\n"
-"freeciv-maintain...@gna.org - llista privada d'administraciÃ³\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- llista privada d'administraciÃ³\n"
 "  del projecte (per problemes de seguretat, "
 "etc)"
 

Modified: branches/S2_5/translations/freeciv/de.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/de.po?rev=35463=35462=35463=diff
==
--- branches/S2_5/translations/freeciv/de.po(original)
+++ branches/S2_5/translations/freeciv/de.poWed May 10 01:53:18 2017
@@ -28901,14 +28901,16 @@
 
 #: data/helpdata.txt:2307
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org â Ã¶ffentliche Entwicklungsmailingliste\n"
+"freeciv-...@freelists.org   â Ã¶ffentliche Entwicklungsmailingliste\n"
 "  (Das Archiv ist frei zugÃ¤nglich)\n"
-"freeciv-maintain...@gna.org â private Projektadministrationsliste\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"â private Projektadministrationsliste\n"
 "  (fÃ¼r Sicherheitsprobleme u.Ã¤.)"
 
 #: data/helpdata.txt:2312

Modified: branches/S2_5/translations/freeciv/es.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/es.po?rev=35463=35462=35463=diff
==
--- branches/S2_5/translations/freeciv/es.po(original)
+++ branches/S2_5/translations/freeciv/es.poWed May 10 01:53:18 2017
@@ -28667,14 +28667,16 @@
 
 #: data/helpdata.txt:2307
 msgid ""
-"freeciv-...@gna.org - public development mailing\n"
+"freeciv-...@freelists.org   - public development mailing\n"
 "  list (archives are public)\n"
-"freeciv-maintain...@gna.org - private project administration\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- private project administration\n"
 "  list (for security issues, etc)"
 msgstr ""
-"freeciv-...@gna.org - lista de correo pÃºblica de desarrollo\n"
-"   (los correos son pÃºblicos)\n"
-"freeciv-maintain...@gna.org - lista de correo privada de 
administraciÃ³n\n"
+"freeciv-...@freelists.org   - lista de correo pÃºblica de desarrollo\n"
+"  (los correos son pÃºblicos)\n"
+"freeciv-maintain...@lists.sourceforge.net\n"
+"- lista de correo privada de 
administraciÃ³n\n"
 "  del

[Freeciv-commits] r35355 - /trunk/translations/core/en_GB.po

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 18:34:57 2017
New Revision: 35355

URL: http://svn.gna.org/viewcvs/freeciv?rev=35355=rev
Log:
Update my email address in en_GB.po.

"0jacobnk.gna" is about to look dated (but will still reach me).

Modified:
trunk/translations/core/en_GB.po

Modified: trunk/translations/core/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/en_GB.po?rev=35355=35354=35355=diff
==
--- trunk/translations/core/en_GB.po(original)
+++ trunk/translations/core/en_GB.poMon May  1 18:34:57 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2017.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2017.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -66,8 +66,8 @@
 "Project-Id-Version: Freeciv 2.5.0\n"
 "Report-Msgid-Bugs-To: https://www.hostedredmine.com/projects/freeciv\n;
 "POT-Creation-Date: 2017-05-01 12:52+0100\n"
-"PO-Revision-Date: 2017-05-01 12:37+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"PO-Revision-Date: 2017-05-01 17:34+0100\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


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

[Freeciv-commits] r35354 - /branches/S3_0/translations/core/en_GB.po

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 18:33:56 2017
New Revision: 35354

URL: http://svn.gna.org/viewcvs/freeciv?rev=35354=rev
Log:
Update my email address in en_GB.po.

"0jacobnk.gna" is about to look dated (but will still reach me).

Modified:
branches/S3_0/translations/core/en_GB.po

Modified: branches/S3_0/translations/core/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/translations/core/en_GB.po?rev=35354=35353=35354=diff
==
--- branches/S3_0/translations/core/en_GB.po(original)
+++ branches/S3_0/translations/core/en_GB.poMon May  1 18:33:56 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2017.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2017.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -66,8 +66,8 @@
 "Project-Id-Version: Freeciv 2.5.0\n"
 "Report-Msgid-Bugs-To: https://www.hostedredmine.com/projects/freeciv\n;
 "POT-Creation-Date: 2017-05-01 12:48+0100\n"
-"PO-Revision-Date: 2017-05-01 12:37+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"PO-Revision-Date: 2017-05-01 17:33+0100\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


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

[Freeciv-commits] r35353 - /branches/S2_6/translations/freeciv/en_GB.po

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 18:32:18 2017
New Revision: 35353

URL: http://svn.gna.org/viewcvs/freeciv?rev=35353=rev
Log:
Update my email address in en_GB.po.

"0jacobnk.gna" is about to look dated (but will still reach me).

Modified:
branches/S2_6/translations/freeciv/en_GB.po

Modified: branches/S2_6/translations/freeciv/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/en_GB.po?rev=35353=35352=35353=diff
==
--- branches/S2_6/translations/freeciv/en_GB.po (original)
+++ branches/S2_6/translations/freeciv/en_GB.po Mon May  1 18:32:18 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2017.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2017.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -66,8 +66,8 @@
 "Project-Id-Version: Freeciv 2.5.0\n"
 "Report-Msgid-Bugs-To: https://www.hostedredmine.com/projects/freeciv\n;
 "POT-Creation-Date: 2017-05-01 12:41+0100\n"
-"PO-Revision-Date: 2017-05-01 12:37+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"PO-Revision-Date: 2017-05-01 17:31+0100\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


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

[Freeciv-commits] r35352 - /branches/S2_5/translations/freeciv/en_GB.po

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 18:30:52 2017
New Revision: 35352

URL: http://svn.gna.org/viewcvs/freeciv?rev=35352=rev
Log:
Update my email address in en_GB.po.

"0jacobnk.gna" is about to look dated (but will still reach me).

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

Modified: branches/S2_5/translations/freeciv/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/en_GB.po?rev=35352=35351=35352=diff
==
--- branches/S2_5/translations/freeciv/en_GB.po (original)
+++ branches/S2_5/translations/freeciv/en_GB.po Mon May  1 18:30:52 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2017.
+# Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>, 2010-2017.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -66,8 +66,8 @@
 "Project-Id-Version: Freeciv 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-05-01 12:35+0100\n"
-"PO-Revision-Date: 2017-05-01 12:37+0100\n"
-"Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
+"PO-Revision-Date: 2017-05-01 17:29+0100\n"
+"Last-Translator: Jacob Nevins <0jacobnk.fc...@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"


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

[Freeciv-commits] r35345 - /trunk/translations/core/en_GB.po

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 13:53:58 2017
New Revision: 35345

URL: http://svn.gna.org/viewcvs/freeciv?rev=35345=rev
Log:
Merge current S2_5 en_GB translation for core strings (r35342). trunk stats:
76%: 5514 translated, 1088 fuzzy, 648 untranslated.

Modified:
trunk/translations/core/en_GB.po

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

Modified: trunk/translations/core/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/en_GB.po?rev=35345=35344=35345=diff


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

[Freeciv-commits] r35344 - /branches/S3_0/translations/core/en_GB.po

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 13:51:24 2017
New Revision: 35344

URL: http://svn.gna.org/viewcvs/freeciv?rev=35344=rev
Log:
Merge current S2_5 en_GB translation for core strings (r35342). S3_0 stats:
76%: 5646 translated, 1095 fuzzy, 656 untranslated.

Modified:
branches/S3_0/translations/core/en_GB.po

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

Modified: branches/S3_0/translations/core/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/translations/core/en_GB.po?rev=35344=35343=35344=diff


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

[Freeciv-commits] r35343 - /branches/S2_6/translations/freeciv/en_GB.po

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 13:47:17 2017
New Revision: 35343

URL: http://svn.gna.org/viewcvs/freeciv?rev=35343=rev
Log:
Merge current S2_5 en_GB translation for core strings (r35342). S2_6 stats:
86%: 6012 translated, 659 fuzzy, 311 untranslated.

Modified:
branches/S2_6/translations/freeciv/en_GB.po

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

Modified: branches/S2_6/translations/freeciv/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/en_GB.po?rev=35343=35342=35343=diff


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

[Freeciv-commits] r35342 - /branches/S2_5/translations/freeciv/en_GB.po

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 13:39:12 2017
New Revision: 35342

URL: http://svn.gna.org/viewcvs/freeciv?rev=35342=rev
Log:
Updated en_GB translation of core strings for S2_5.
freeciv: 100%: 6293 translated.

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

Modified: branches/S2_5/translations/freeciv/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/en_GB.po?rev=35342=35341=35342=diff
==
--- branches/S2_5/translations/freeciv/en_GB.po (original)
+++ branches/S2_5/translations/freeciv/en_GB.po Mon May  1 13:39:12 2017
@@ -5,7 +5,7 @@
 # ...
 # Daniel Markstedt , 2009.
 # "TimR" (timr@gna), 2010.
-# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2016.
+# Jacob Nevins <0jacobnk@chiark.greenend.org.uk>, 2010-2017.
 #
 # This file aims to provide a translation for every string, even those that
 # are identical (previously it only included msgstrs that were different).
@@ -65,8 +65,8 @@
 msgstr ""
 "Project-Id-Version: Freeciv 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-19 11:38+\n"
-"PO-Revision-Date: 2016-07-19 10:16+0100\n"
+"POT-Creation-Date: 2017-05-01 12:35+0100\n"
+"PO-Revision-Date: 2017-05-01 12:37+0100\n"
 "Last-Translator: Jacob Nevins <0jacobnk@chiark.greenend.org.uk>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
@@ -443,7 +443,7 @@
 #. TRANS: No full stop after the URL, could cause confusion.
 #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158
 #: server/console.c:71 server/srv_main.c:2784 utility/log.c:516
-#: utility/netintf.c:97 utility/registry_ini.c:745
+#: utility/netintf.c:97 utility/registry_ini.c:747
 #, c-format
 msgid "Please report this message at %s"
 msgstr "Please report this message at %s"
@@ -688,7 +688,7 @@
 #. TRANS: "unknown" location
 #. TRANS: unrecognized command
 #: client/citydlg_common.c:477 client/gui-gtk-2.0/inteldlg.c:388
-#: client/gui-gtk-3.0/inteldlg.c:382 client/gui-qt/plrdlg.cpp:450
+#: client/gui-gtk-3.0/inteldlg.c:382 client/gui-qt/plrdlg.cpp:455
 #: client/gui-sdl/inteldlg.c:314 client/gui-sdl/inteldlg.c:327
 #: client/gui-xaw/inteldlg.c:281 server/stdinhand.c:326
 msgid "(unknown)"
@@ -841,7 +841,7 @@
 #: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409
 #: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767
 #: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283
-#: client/gui-qt/pages.cpp:552 client/gui-qt/plrdlg.cpp:442
+#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447
 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079
 #: client/plrdlg_common.c:307
 msgid "Nation"
@@ -1948,7 +1948,7 @@
 #: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707
 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547
 #: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774
-#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:552
+#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554
 #: client/plrdlg_common.c:306
 msgid "Flag"
 msgstr "Flag"
@@ -1978,19 +1978,19 @@
 #: client/gui-gtk-3.0/citydlg.c:718 client/gui-gtk-3.0/diplodlg.c:761
 #: client/gui-gtk-3.0/diplodlg.c:846 client/gui-gtk-3.0/inteldlg.c:51
 #: client/gui-qt/citydlg.cpp:710 client/gui-qt/diplodlg.cpp:135
-#: client/gui-qt/diplodlg.cpp:137 client/gui-qt/plrdlg.cpp:451
+#: client/gui-qt/diplodlg.cpp:137 client/gui-qt/plrdlg.cpp:456
 msgid "Gold:"
 msgstr "Gold:"
 
 #: client/gui-gtk-2.0/citydlg.c:685 client/gui-gtk-2.0/inteldlg.c:55
 #: client/gui-gtk-3.0/citydlg.c:719 client/gui-gtk-3.0/inteldlg.c:55
-#: client/gui-qt/citydlg.cpp:711 client/gui-qt/plrdlg.cpp:457
+#: client/gui-qt/citydlg.cpp:711 client/gui-qt/plrdlg.cpp:462
 msgid "Luxury:"
 msgstr "Luxury:"
 
 #: client/gui-gtk-2.0/citydlg.c:686 client/gui-gtk-2.0/inteldlg.c:54
 #: client/gui-gtk-3.0/citydlg.c:720 client/gui-gtk-3.0/inteldlg.c:54
-#: client/gui-qt/citydlg.cpp:711 client/gui-qt/plrdlg.cpp:455
+#: client/gui-qt/citydlg.cpp:711 client/gui-qt/plrdlg.cpp:460
 msgid "Science:"
 msgstr "Science:"
 
@@ -2670,7 +2670,7 @@
 msgstr "What Nation Will You Be?"
 
 #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895
-#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:574
+#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576
 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428
 msgid "Pick Nation"
 msgstr "Pick Nation"
@@ -3336,7 +3336,7 @@
 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274
 #: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406
 #: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001
-#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:551 data/Freeciv.in:97
+#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97
 #: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468
 #: tools/mpgui_qt.cpp:217
 msgid "Name"
@@

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

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 13:23:07 2017
New Revision: 35341

URL: http://svn.gna.org/viewcvs/freeciv?rev=35341=rev
Log:
Fix truncated help string in freeciv.pot.

An edit made to data/helpdata.txt for hrm feature #637953 for mailing
list changes was malformed.

See hrm bug #656595.

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=35341=35340=35341=diff
==
--- branches/S2_5/data/helpdata.txt (original)
+++ branches/S2_5/data/helpdata.txt Mon May  1 13:23:07 2017
@@ -2307,7 +2307,7 @@
 "), _("\
 freeciv-...@freelists.org   - public development mailing\n\
   list (archives are public)\n\
-freeciv-maintain...@lists.sourceforge.net
+freeciv-maintain...@lists.sourceforge.net\n\
 - private project administration\n\
   list (for security issues, etc)\
 "), _("\


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

[Freeciv-commits] r35340 - /branches/S2_6/data/helpdata.txt

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 13:22:48 2017
New Revision: 35340

URL: http://svn.gna.org/viewcvs/freeciv?rev=35340=rev
Log:
Fix truncated help string in freeciv.pot.

An edit made to data/helpdata.txt for hrm feature #637953 for mailing
list changes was malformed.

See hrm bug #656595.

Modified:
branches/S2_6/data/helpdata.txt

Modified: branches/S2_6/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/helpdata.txt?rev=35340=35339=35340=diff
==
--- branches/S2_6/data/helpdata.txt (original)
+++ branches/S2_6/data/helpdata.txt Mon May  1 13:22:48 2017
@@ -2293,7 +2293,7 @@
 "), _("\
 freeciv-...@freelists.org   - public development mailing\n\
   list (archives are public)\n\
-freeciv-maintain...@lists.sourceforge.net
+freeciv-maintain...@lists.sourceforge.net\n\
 - private project administration\n\
   list (for security issues, etc)\
 "), _("\


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

[Freeciv-commits] r35339 - /branches/S3_0/data/helpdata.txt

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 13:22:25 2017
New Revision: 35339

URL: http://svn.gna.org/viewcvs/freeciv?rev=35339=rev
Log:
Fix truncated help string in freeciv.pot.

An edit made to data/helpdata.txt for hrm feature #637953 for mailing
list changes was malformed.

See hrm bug #656595.

Modified:
branches/S3_0/data/helpdata.txt

Modified: branches/S3_0/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/helpdata.txt?rev=35339=35338=35339=diff
==
--- branches/S3_0/data/helpdata.txt (original)
+++ branches/S3_0/data/helpdata.txt Mon May  1 13:22:25 2017
@@ -2314,7 +2314,7 @@
 "), _("\
 freeciv-...@freelists.org   - public development mailing\n\
   list (archives are public)\n\
-freeciv-maintain...@lists.sourceforge.net
+freeciv-maintain...@lists.sourceforge.net\n\
 - private project administration\n\
   list (for security issues, etc)\
 "), _("\


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

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

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 13:22:01 2017
New Revision: 35338

URL: http://svn.gna.org/viewcvs/freeciv?rev=35338=rev
Log:
Fix truncated help string in freeciv.pot.

An edit made to data/helpdata.txt for hrm feature #637953 for mailing
list changes was malformed.

See hrm bug #656595.

Modified:
trunk/data/helpdata.txt

Modified: trunk/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/helpdata.txt?rev=35338=35337=35338=diff
==
--- trunk/data/helpdata.txt (original)
+++ trunk/data/helpdata.txt Mon May  1 13:22:01 2017
@@ -2314,7 +2314,7 @@
 "), _("\
 freeciv-...@freelists.org   - public development mailing\n\
   list (archives are public)\n\
-freeciv-maintain...@lists.sourceforge.net
+freeciv-maintain...@lists.sourceforge.net\n\
 - private project administration\n\
   list (for security issues, etc)\
 "), _("\


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

[Freeciv-commits] r35333 - /website/index.html

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 12:14:06 2017
New Revision: 35333

URL: http://svn.gna.org/viewcvs/freeciv?rev=35333=rev
Log:
Bug tracker: gna.org -> hostedredmine.com

Modified:
website/index.html

Modified: website/index.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/index.html?rev=35333=35332=35333=diff
==
--- website/index.html  (original)
+++ website/index.html  Mon May  1 12:14:06 2017
@@ -80,7 +80,7 @@
   http://www.freeciv.org/wiki/Interface_Language;>Languages |
   http://www.freeciv.org/wiki/People;>Authors |
   Donate | 
-  http://gna.org/bugs/?group=freeciv;>Bug tracker | 
+  https://www.hostedredmine.com/projects/freeciv;>Bug 
tracker | 
   http://gna.org/projects/freeciv/;>Code | 
   https://github.com/freeciv/freeciv-web;>Freeciv-web 
Github | 
   https://gna.org/mail/?group=freeciv;>Mailing lists  


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

[Freeciv-commits] r35331 - in /branches/S2_5: ./ bootstrap/ data/ doc/

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 11:28:33 2017
New Revision: 35331

URL: http://svn.gna.org/viewcvs/freeciv?rev=35331=rev
Log:
Update mailing list details.

freeciv-dev and freeciv-i18n are confirmed to be moving to
freelists.org.
freeciv-announce and freeciv-commits are not sorted out yet.
Committing early, to get string change in place.

See hrm feature #637953.

Modified:
branches/S2_5/bootstrap/freeciv-gtk2.appdata.xml.in
branches/S2_5/bootstrap/freeciv-gtk3.appdata.xml.in
branches/S2_5/bootstrap/freeciv-mp-gtk2.appdata.xml.in
branches/S2_5/bootstrap/freeciv-mp-gtk3.appdata.xml.in
branches/S2_5/bootstrap/freeciv-mp-qt.appdata.xml.in
branches/S2_5/bootstrap/freeciv-qt.appdata.xml.in
branches/S2_5/bootstrap/freeciv-sdl.appdata.xml.in
branches/S2_5/bootstrap/freeciv-server.appdata.xml.in
branches/S2_5/configure.ac
branches/S2_5/data/helpdata.txt
branches/S2_5/doc/FAQ
branches/S2_5/doc/README
branches/S2_5/doc/README.AI

Modified: branches/S2_5/bootstrap/freeciv-gtk2.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/bootstrap/freeciv-gtk2.appdata.xml.in?rev=35331=35330=35331=diff
==
--- branches/S2_5/bootstrap/freeciv-gtk2.appdata.xml.in (original)
+++ branches/S2_5/bootstrap/freeciv-gtk2.appdata.xml.in Mon May  1 11:28:33 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_5/bootstrap/freeciv-gtk3.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/bootstrap/freeciv-gtk3.appdata.xml.in?rev=35331=35330=35331=diff
==
--- branches/S2_5/bootstrap/freeciv-gtk3.appdata.xml.in (original)
+++ branches/S2_5/bootstrap/freeciv-gtk3.appdata.xml.in Mon May  1 11:28:33 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_5/bootstrap/freeciv-mp-gtk2.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/bootstrap/freeciv-mp-gtk2.appdata.xml.in?rev=35331=35330=35331=diff
==
--- branches/S2_5/bootstrap/freeciv-mp-gtk2.appdata.xml.in  (original)
+++ branches/S2_5/bootstrap/freeciv-mp-gtk2.appdata.xml.in  Mon May  1 
11:28:33 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_5/bootstrap/freeciv-mp-gtk3.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/bootstrap/freeciv-mp-gtk3.appdata.xml.in?rev=35331=35330=35331=diff
==
--- branches/S2_5/bootstrap/freeciv-mp-gtk3.appdata.xml.in  (original)
+++ branches/S2_5/bootstrap/freeciv-mp-gtk3.appdata.xml.in  Mon May  1 
11:28:33 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_5/bootstrap/freeciv-mp-qt.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/bootstrap/freeciv-mp-qt.appdata.xml.in?rev=35331=35330=35331=diff
==
--- branches/S2_5/bootstrap/freeciv-mp-qt.appdata.xml.in(original)
+++ branches/S2_5/bootstrap/freeciv-mp-qt.appdata.xml.inMon May  1 
11:28:33 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_5/bootstrap/freeciv-qt.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/bootstrap/freeciv-qt.appdata.xml.in?rev=35331=35330=35331=diff
==
--- branches/S2_5/bootstrap/freeciv-qt.appdata.xml.in   (original)
+++ branches/S2_5/bootstrap/freeciv-qt.appdata.xml.in   Mon May  1 11:28:33 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_5/bootstrap/freeciv-sdl.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/bootstrap/freeciv-sdl.appdata.xml.in?rev=35331=35330=35331=diff
==
---

[Freeciv-commits] r35332 - /branches/S2_5/server/report.c

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 11:28:36 2017
New Revision: 35332

URL: http://svn.gna.org/viewcvs/freeciv?rev=35332=rev
Log:
Fixed dead player scores not revealed on game over.
Reported by Daniel Markstedt (dmarks@gna).
Patch by mir3x@gna.

See gna bug #17248

Modified:
branches/S2_5/server/report.c

Modified: branches/S2_5/server/report.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/report.c?rev=35332=35331=35332=diff
==
--- branches/S2_5/server/report.c   (original)
+++ branches/S2_5/server/report.c   Mon May  1 11:28:36 2017
@@ -1504,7 +1504,7 @@
 
   i = 0;
   players_iterate(pplayer) {
-if (GOOD_PLAYER(pplayer)) {
+if (is_barbarian(pplayer) == FALSE) {
   size[i].value = pplayer->score.game;
   size[i].player = pplayer;
   i++;


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

[Freeciv-commits] r35330 - in /branches/S2_6: ./ bootstrap/ data/ doc/

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 11:28:02 2017
New Revision: 35330

URL: http://svn.gna.org/viewcvs/freeciv?rev=35330=rev
Log:
Update mailing list details.

freeciv-dev and freeciv-i18n are confirmed to be moving to
freelists.org.
freeciv-announce and freeciv-commits are not sorted out yet.
Committing early, to get string change in place.

See hrm feature #637953.

Modified:
branches/S2_6/bootstrap/freeciv-gtk2.appdata.xml.in
branches/S2_6/bootstrap/freeciv-gtk3.22.appdata.xml.in
branches/S2_6/bootstrap/freeciv-gtk3.appdata.xml.in
branches/S2_6/bootstrap/freeciv-mp-gtk2.appdata.xml.in
branches/S2_6/bootstrap/freeciv-mp-gtk3.appdata.xml.in
branches/S2_6/bootstrap/freeciv-mp-qt.appdata.xml.in
branches/S2_6/bootstrap/freeciv-qt.appdata.xml.in
branches/S2_6/bootstrap/freeciv-ruledit.appdata.xml.in
branches/S2_6/bootstrap/freeciv-sdl.appdata.xml.in
branches/S2_6/bootstrap/freeciv-sdl2.appdata.xml.in
branches/S2_6/bootstrap/freeciv-server.appdata.xml.in
branches/S2_6/configure.ac
branches/S2_6/data/helpdata.txt
branches/S2_6/doc/FAQ
branches/S2_6/doc/README
branches/S2_6/doc/README.AI

Modified: branches/S2_6/bootstrap/freeciv-gtk2.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/bootstrap/freeciv-gtk2.appdata.xml.in?rev=35330=35329=35330=diff
==
--- branches/S2_6/bootstrap/freeciv-gtk2.appdata.xml.in (original)
+++ branches/S2_6/bootstrap/freeciv-gtk2.appdata.xml.in Mon May  1 11:28:02 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_6/bootstrap/freeciv-gtk3.22.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/bootstrap/freeciv-gtk3.22.appdata.xml.in?rev=35330=35329=35330=diff
==
--- branches/S2_6/bootstrap/freeciv-gtk3.22.appdata.xml.in  (original)
+++ branches/S2_6/bootstrap/freeciv-gtk3.22.appdata.xml.in  Mon May  1 
11:28:02 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_6/bootstrap/freeciv-gtk3.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/bootstrap/freeciv-gtk3.appdata.xml.in?rev=35330=35329=35330=diff
==
--- branches/S2_6/bootstrap/freeciv-gtk3.appdata.xml.in (original)
+++ branches/S2_6/bootstrap/freeciv-gtk3.appdata.xml.in Mon May  1 11:28:02 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_6/bootstrap/freeciv-mp-gtk2.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/bootstrap/freeciv-mp-gtk2.appdata.xml.in?rev=35330=35329=35330=diff
==
--- branches/S2_6/bootstrap/freeciv-mp-gtk2.appdata.xml.in  (original)
+++ branches/S2_6/bootstrap/freeciv-mp-gtk2.appdata.xml.in  Mon May  1 
11:28:02 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_6/bootstrap/freeciv-mp-gtk3.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/bootstrap/freeciv-mp-gtk3.appdata.xml.in?rev=35330=35329=35330=diff
==
--- branches/S2_6/bootstrap/freeciv-mp-gtk3.appdata.xml.in  (original)
+++ branches/S2_6/bootstrap/freeciv-mp-gtk3.appdata.xml.in  Mon May  1 
11:28:02 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_6/bootstrap/freeciv-mp-qt.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/bootstrap/freeciv-mp-qt.appdata.xml.in?rev=35330=35329=35330=diff
==
--- branches/S2_6/bootstrap/freeciv-mp-qt.appdata.xml.in(original)
+++ branches/S2_6/bootstrap/freeciv-mp-qt.appdata.xml.inMon May  1 
11:28:02 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S2_6/bootstrap/freeciv-qt.appdata.xml.in

[Freeciv-commits] r35329 - in /branches/S3_0: ./ bootstrap/ data/ doc/

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 11:27:31 2017
New Revision: 35329

URL: http://svn.gna.org/viewcvs/freeciv?rev=35329=rev
Log:
Update mailing list details.

freeciv-dev and freeciv-i18n are confirmed to be moving to
freelists.org.
freeciv-announce and freeciv-commits are not sorted out yet.
Committing early, to get string change in place.

See hrm feature #637953.

Modified:
branches/S3_0/bootstrap/freeciv-gtk2.appdata.xml.in
branches/S3_0/bootstrap/freeciv-gtk3.22.appdata.xml.in
branches/S3_0/bootstrap/freeciv-gtk3.appdata.xml.in
branches/S3_0/bootstrap/freeciv-mp-gtk2.appdata.xml.in
branches/S3_0/bootstrap/freeciv-mp-gtk3.appdata.xml.in
branches/S3_0/bootstrap/freeciv-mp-qt.appdata.xml.in
branches/S3_0/bootstrap/freeciv-qt.appdata.xml.in
branches/S3_0/bootstrap/freeciv-ruledit.appdata.xml.in
branches/S3_0/bootstrap/freeciv-sdl2.appdata.xml.in
branches/S3_0/bootstrap/freeciv-server.appdata.xml.in
branches/S3_0/configure.ac
branches/S3_0/data/helpdata.txt
branches/S3_0/doc/FAQ
branches/S3_0/doc/README
branches/S3_0/doc/README.AI

Modified: branches/S3_0/bootstrap/freeciv-gtk2.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/bootstrap/freeciv-gtk2.appdata.xml.in?rev=35329=35328=35329=diff
==
--- branches/S3_0/bootstrap/freeciv-gtk2.appdata.xml.in (original)
+++ branches/S3_0/bootstrap/freeciv-gtk2.appdata.xml.in Mon May  1 11:27:31 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S3_0/bootstrap/freeciv-gtk3.22.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/bootstrap/freeciv-gtk3.22.appdata.xml.in?rev=35329=35328=35329=diff
==
--- branches/S3_0/bootstrap/freeciv-gtk3.22.appdata.xml.in  (original)
+++ branches/S3_0/bootstrap/freeciv-gtk3.22.appdata.xml.in  Mon May  1 
11:27:31 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S3_0/bootstrap/freeciv-gtk3.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/bootstrap/freeciv-gtk3.appdata.xml.in?rev=35329=35328=35329=diff
==
--- branches/S3_0/bootstrap/freeciv-gtk3.appdata.xml.in (original)
+++ branches/S3_0/bootstrap/freeciv-gtk3.appdata.xml.in Mon May  1 11:27:31 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S3_0/bootstrap/freeciv-mp-gtk2.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/bootstrap/freeciv-mp-gtk2.appdata.xml.in?rev=35329=35328=35329=diff
==
--- branches/S3_0/bootstrap/freeciv-mp-gtk2.appdata.xml.in  (original)
+++ branches/S3_0/bootstrap/freeciv-mp-gtk2.appdata.xml.in  Mon May  1 
11:27:31 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S3_0/bootstrap/freeciv-mp-gtk3.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/bootstrap/freeciv-mp-gtk3.appdata.xml.in?rev=35329=35328=35329=diff
==
--- branches/S3_0/bootstrap/freeciv-mp-gtk3.appdata.xml.in  (original)
+++ branches/S3_0/bootstrap/freeciv-mp-gtk3.appdata.xml.in  Mon May  1 
11:27:31 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S3_0/bootstrap/freeciv-mp-qt.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/bootstrap/freeciv-mp-qt.appdata.xml.in?rev=35329=35328=35329=diff
==
--- branches/S3_0/bootstrap/freeciv-mp-qt.appdata.xml.in(original)
+++ branches/S3_0/bootstrap/freeciv-mp-qt.appdata.xml.inMon May  1 
11:27:31 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: branches/S3_0/bootstrap/freeciv-qt.appdata.xml.in
URL:

[Freeciv-commits] r35328 - in /trunk: ./ bootstrap/ data/ doc/

2017-05-01 Thread 0jacobnk . gna

Author: jtn
Date: Mon May  1 11:26:25 2017
New Revision: 35328

URL: http://svn.gna.org/viewcvs/freeciv?rev=35328=rev
Log:
Update mailing list details.

freeciv-dev and freeciv-i18n are confirmed to be moving to
freelists.org.
freeciv-announce and freeciv-commits are not sorted out yet.
Committing early, to get string change in place.

See hrm feature #637953.

Modified:
trunk/bootstrap/freeciv-gtk3.22.appdata.xml.in
trunk/bootstrap/freeciv-gtk3.appdata.xml.in
trunk/bootstrap/freeciv-mp-gtk3.appdata.xml.in
trunk/bootstrap/freeciv-mp-qt.appdata.xml.in
trunk/bootstrap/freeciv-qt.appdata.xml.in
trunk/bootstrap/freeciv-ruledit.appdata.xml.in
trunk/bootstrap/freeciv-sdl2.appdata.xml.in
trunk/bootstrap/freeciv-server.appdata.xml.in
trunk/configure.ac
trunk/data/helpdata.txt
trunk/doc/FAQ
trunk/doc/README
trunk/doc/README.AI

Modified: trunk/bootstrap/freeciv-gtk3.22.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/freeciv-gtk3.22.appdata.xml.in?rev=35328=35327=35328=diff
==
--- trunk/bootstrap/freeciv-gtk3.22.appdata.xml.in  (original)
+++ trunk/bootstrap/freeciv-gtk3.22.appdata.xml.in  Mon May  1 11:26:25 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: trunk/bootstrap/freeciv-gtk3.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/freeciv-gtk3.appdata.xml.in?rev=35328=35327=35328=diff
==
--- trunk/bootstrap/freeciv-gtk3.appdata.xml.in (original)
+++ trunk/bootstrap/freeciv-gtk3.appdata.xml.in Mon May  1 11:26:25 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: trunk/bootstrap/freeciv-mp-gtk3.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/freeciv-mp-gtk3.appdata.xml.in?rev=35328=35327=35328=diff
==
--- trunk/bootstrap/freeciv-mp-gtk3.appdata.xml.in  (original)
+++ trunk/bootstrap/freeciv-mp-gtk3.appdata.xml.in  Mon May  1 11:26:25 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: trunk/bootstrap/freeciv-mp-qt.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/freeciv-mp-qt.appdata.xml.in?rev=35328=35327=35328=diff
==
--- trunk/bootstrap/freeciv-mp-qt.appdata.xml.in(original)
+++ trunk/bootstrap/freeciv-mp-qt.appdata.xml.inMon May  1 11:26:25 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: trunk/bootstrap/freeciv-qt.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/freeciv-qt.appdata.xml.in?rev=35328=35327=35328=diff
==
--- trunk/bootstrap/freeciv-qt.appdata.xml.in   (original)
+++ trunk/bootstrap/freeciv-qt.appdata.xml.in   Mon May  1 11:26:25 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: trunk/bootstrap/freeciv-ruledit.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/freeciv-ruledit.appdata.xml.in?rev=35328=35327=35328=diff
==
--- trunk/bootstrap/freeciv-ruledit.appdata.xml.in  (original)
+++ trunk/bootstrap/freeciv-ruledit.appdata.xml.in  Mon May  1 11:26:25 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-freeciv-...@gna.org
+freeciv-...@freelists.org
 

Modified: trunk/bootstrap/freeciv-sdl2.appdata.xml.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/freeciv-sdl2.appdata.xml.in?rev=35328=35327=35328=diff
==
--- trunk/bootstrap/freeciv-sdl2.appdata.xml.in (original)
+++ trunk/bootstrap/freeciv-sdl2.appdata.xml.in Mon May  1 11:26:25 2017
@@ -15,5 +15,5 @@
 
 http://images1.wikia.nocookie.net/__cb20120308234702/freeciv/images/thumb/4/43/Hex2.3.png/1000px-Hex2.3.png
 
-

[Freeciv-commits] r35315 - in /branches/S2_5: ./ data/ doc/ doc/ca/ doc/de/ doc/fr/ doc/ja/ doc/nl/ doc/sv/

2017-04-27 Thread 0jacobnk . gna

Author: jtn
Date: Fri Apr 28 01:51:05 2017
New Revision: 35315

URL: http://svn.gna.org/viewcvs/freeciv?rev=35315=rev
Log:
Update bug tracker URL to hostedredmine.

See hrm feature #655380.

Modified:
branches/S2_5/configure.ac
branches/S2_5/data/helpdata.txt
branches/S2_5/doc/BUGS
branches/S2_5/doc/FAQ
branches/S2_5/doc/TODO
branches/S2_5/doc/ca/BUGS.ca
branches/S2_5/doc/de/BUGS.de
branches/S2_5/doc/fr/BUGS.fr
branches/S2_5/doc/ja/BUGS.ja
branches/S2_5/doc/nl/BUGS.nl
branches/S2_5/doc/sv/BUGS.sv

Modified: branches/S2_5/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/configure.ac?rev=35315=35314=35315=diff
==
--- branches/S2_5/configure.ac  (original)
+++ branches/S2_5/configure.ac  Fri Apr 28 01:51:05 2017
@@ -2,7 +2,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([Freeciv], m4_esyscmd([./fc_version | tr -d '\n']),
-[http://www.hostedredmine.com/projects/freeciv],
+[https://www.hostedredmine.com/projects/freeciv],
 [freeciv])
 AC_PREREQ(2.61)
 

Modified: branches/S2_5/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/helpdata.txt?rev=35315=35314=35315=diff
==
--- branches/S2_5/data/helpdata.txt (original)
+++ branches/S2_5/data/helpdata.txt Fri Apr 28 01:51:05 2017
@@ -2296,7 +2296,7 @@
 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/\
+  https://www.hostedredmine.com/projects/freeciv\
 ", _("\
 Please quote the above version information. \
 For more information about submitting bug reports see the file BUGS \

Modified: branches/S2_5/doc/BUGS
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/BUGS?rev=35315=35314=35315=diff
==
--- branches/S2_5/doc/BUGS  (original)
+++ branches/S2_5/doc/BUGS  Fri Apr 28 01:51:05 2017
@@ -3,7 +3,7 @@
 
 
 Freeciv 2.5 certainly contains some bugs. Please report all
-you find to http://gna.org/bugs/?func=additem=freeciv.
+you find to https://www.hostedredmine.com/projects/freeciv.
 
 
 REPORTING A BUG:
@@ -21,7 +21,7 @@
 
  - Check the Freeciv Bug Tracking System at:
 
-http://gna.org/bugs/?group=freeciv
+https://www.hostedredmine.com/projects/freeciv
 
to see if the bug has already been reported.
 

Modified: branches/S2_5/doc/FAQ
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/FAQ?rev=35315=35314=35315=diff
==
--- branches/S2_5/doc/FAQ   (original)
+++ branches/S2_5/doc/FAQ   Fri Apr 28 01:51:05 2017
@@ -618,11 +618,7 @@
this site at the Freeciv Forums.
 
Patches and bug reports are best reported to the Freeciv bug tracking
-   system at http://gna.org/bugs/?group=freeciv.
-
-   Copies of submissions to the bug tracker at gna.org are automatically
-   sent to the development mailing list, with a bug ID in the subject.
-   Please use the bug tracker web interface for replies.
+   system at https://www.hostedredmine.com/projects/freeciv.
 
 ---
 

Modified: branches/S2_5/doc/TODO
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/TODO?rev=35315=35314=35315=diff
==
--- branches/S2_5/doc/TODO  (original)
+++ branches/S2_5/doc/TODO  Fri Apr 28 01:51:05 2017
@@ -4,5 +4,6 @@
 
 Freeciv is quite mature, and we think its already a great game, but
 there are always things to add or improve.  Check out the TODO page on
-http://www.freeciv.org or wish list items on
-http://gna.org/projects/freeciv/ for things that need to be done.
+http://www.freeciv.org/ or wish list items on
+https://www.hostedredmine.com/projects/freeciv for things that need to
+be done.

Modified: branches/S2_5/doc/ca/BUGS.ca
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/ca/BUGS.ca?rev=35315=35314=35315=diff
==
--- branches/S2_5/doc/ca/BUGS.ca(original)
+++ branches/S2_5/doc/ca/BUGS.caFri Apr 28 01:51:05 2017
@@ -22,7 +22,7 @@
 
  - Mirar el Sistema de Seguiment d'Errors de Freeciv a:
 
-http://gna.org/bugs/?group=freeciv
+https://www.hostedredmine.com/projects/freeciv
 
per veure si ja s'ha informat del problema.
 

Modified: branches/S2_5/doc/de/BUGS.de
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/de/BUGS.de?rev=35315=35314=35315=diff
==
--- branches/S2_5/doc/de/BUGS.de(original)
+++ branches/S2_5/doc/de/BUGS.deFri Apr 28 01:51:05 2017
@@ -12,7

[Freeciv-commits] r35314 - in /branches/S2_6: ./ data/ doc/ doc/ca/ doc/de/ doc/fr/ doc/ja/ doc/nl/ doc/sv/

2017-04-27 Thread 0jacobnk . gna

Author: jtn
Date: Fri Apr 28 01:44:20 2017
New Revision: 35314

URL: http://svn.gna.org/viewcvs/freeciv?rev=35314=rev
Log:
Update bug tracker URL to hostedredmine.

See hrm feature #655380.

Modified:
branches/S2_6/configure.ac
branches/S2_6/data/helpdata.txt
branches/S2_6/doc/BUGS
branches/S2_6/doc/FAQ
branches/S2_6/doc/TODO
branches/S2_6/doc/ca/BUGS.ca
branches/S2_6/doc/de/BUGS.de
branches/S2_6/doc/fr/BUGS.fr
branches/S2_6/doc/ja/BUGS.ja
branches/S2_6/doc/nl/BUGS.nl
branches/S2_6/doc/sv/BUGS.sv

Modified: branches/S2_6/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=35314=35313=35314=diff
==
--- branches/S2_6/configure.ac  (original)
+++ branches/S2_6/configure.ac  Fri Apr 28 01:44:20 2017
@@ -2,7 +2,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([Freeciv], m4_esyscmd([./fc_version | tr -d '\n']),
-[http://www.hostedredmine.com/projects/freeciv],
+[https://www.hostedredmine.com/projects/freeciv],
 [freeciv])
 AC_PREREQ(2.61)
 

Modified: branches/S2_6/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/helpdata.txt?rev=35314=35313=35314=diff
==
--- branches/S2_6/data/helpdata.txt (original)
+++ branches/S2_6/data/helpdata.txt Fri Apr 28 01:44:20 2017
@@ -2282,7 +2282,7 @@
 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/\
+  https://www.hostedredmine.com/projects/freeciv\
 ", _("\
 Please quote the above version information. \
 For more information about submitting bug reports see the file BUGS \

Modified: branches/S2_6/doc/BUGS
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/BUGS?rev=35314=35313=35314=diff
==
--- branches/S2_6/doc/BUGS  (original)
+++ branches/S2_6/doc/BUGS  Fri Apr 28 01:44:20 2017
@@ -3,7 +3,7 @@
 
 
 Freeciv 2.6 certainly contains some bugs. Please report all
-you find to http://gna.org/bugs/?func=additem=freeciv.
+you find to https://www.hostedredmine.com/projects/freeciv.
 
 
 REPORTING A BUG:
@@ -21,7 +21,7 @@
 
  - Check the Freeciv Bug Tracking System at:
 
-http://gna.org/bugs/?group=freeciv
+https://www.hostedredmine.com/projects/freeciv
 
to see if the bug has already been reported.
 

Modified: branches/S2_6/doc/FAQ
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/FAQ?rev=35314=35313=35314=diff
==
--- branches/S2_6/doc/FAQ   (original)
+++ branches/S2_6/doc/FAQ   Fri Apr 28 01:44:20 2017
@@ -618,11 +618,7 @@
this site at the Freeciv Forums.
 
Patches and bug reports are best reported to the Freeciv bug tracking
-   system at http://gna.org/bugs/?group=freeciv.
-
-   Copies of submissions to the bug tracker at gna.org are automatically
-   sent to the development mailing list, with a bug ID in the subject.
-   Please use the bug tracker web interface for replies.
+   system at https://www.hostedredmine.com/projects/freeciv.
 
 ---
 

Modified: branches/S2_6/doc/TODO
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/TODO?rev=35314=35313=35314=diff
==
--- branches/S2_6/doc/TODO  (original)
+++ branches/S2_6/doc/TODO  Fri Apr 28 01:44:20 2017
@@ -4,5 +4,6 @@
 
 Freeciv is quite mature, and we think its already a great game, but
 there are always things to add or improve.  Check out the TODO page on
-http://www.freeciv.org or wish list items on
-http://gna.org/projects/freeciv/ for things that need to be done.
+http://www.freeciv.org/ or wish list items on
+https://www.hostedredmine.com/projects/freeciv for things that need to
+be done.

Modified: branches/S2_6/doc/ca/BUGS.ca
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/ca/BUGS.ca?rev=35314=35313=35314=diff
==
--- branches/S2_6/doc/ca/BUGS.ca(original)
+++ branches/S2_6/doc/ca/BUGS.caFri Apr 28 01:44:20 2017
@@ -22,7 +22,7 @@
 
  - Mirar el Sistema de Seguiment d'Errors de Freeciv a:
 
-http://gna.org/bugs/?group=freeciv
+https://www.hostedredmine.com/projects/freeciv
 
per veure si ja s'ha informat del problema.
 

Modified: branches/S2_6/doc/de/BUGS.de
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/de/BUGS.de?rev=35314=35313=35314=diff
==
--- branches/S2_6/doc/de/BUGS.de(original)
+++ branches/S2_6/doc/de/BUGS.deFri Apr 28 01:44:20 2017
@@ -12,7

[Freeciv-commits] r35313 - in /branches/S3_0: ./ data/ doc/ doc/ca/ doc/de/ doc/fr/ doc/ja/ doc/nl/ doc/sv/

2017-04-27 Thread 0jacobnk . gna

Author: jtn
Date: Fri Apr 28 01:38:19 2017
New Revision: 35313

URL: http://svn.gna.org/viewcvs/freeciv?rev=35313=rev
Log:
Update bug tracker URL to hostedredmine.

See hrm feature #655380.

Modified:
branches/S3_0/configure.ac
branches/S3_0/data/helpdata.txt
branches/S3_0/doc/BUGS
branches/S3_0/doc/FAQ
branches/S3_0/doc/TODO
branches/S3_0/doc/ca/BUGS.ca
branches/S3_0/doc/de/BUGS.de
branches/S3_0/doc/fr/BUGS.fr
branches/S3_0/doc/ja/BUGS.ja
branches/S3_0/doc/nl/BUGS.nl
branches/S3_0/doc/sv/BUGS.sv

Modified: branches/S3_0/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/configure.ac?rev=35313=35312=35313=diff
==
--- branches/S3_0/configure.ac  (original)
+++ branches/S3_0/configure.ac  Fri Apr 28 01:38:19 2017
@@ -2,7 +2,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([Freeciv], m4_esyscmd([./fc_version | tr -d '\n']),
-[http://www.hostedredmine.com/projects/freeciv],
+[https://www.hostedredmine.com/projects/freeciv],
 [freeciv], [http://www.freeciv.org/])
 AC_PREREQ(2.65)
 

Modified: branches/S3_0/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/helpdata.txt?rev=35313=35312=35313=diff
==
--- branches/S3_0/data/helpdata.txt (original)
+++ branches/S3_0/data/helpdata.txt Fri Apr 28 01:38:19 2017
@@ -2303,7 +2303,7 @@
 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/\
+  https://www.hostedredmine.com/projects/freeciv\
 ", _("\
 Please quote the above version information. \
 For more information about submitting bug reports see the file BUGS \

Modified: branches/S3_0/doc/BUGS
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/BUGS?rev=35313=35312=35313=diff
==
--- branches/S3_0/doc/BUGS  (original)
+++ branches/S3_0/doc/BUGS  Fri Apr 28 01:38:19 2017
@@ -3,7 +3,7 @@
 
 
 Freeciv 3.0 certainly contains some bugs. Please report all
-you find to http://gna.org/bugs/?func=additem=freeciv.
+you find to https://www.hostedredmine.com/projects/freeciv.
 
 
 REPORTING A BUG:
@@ -21,7 +21,7 @@
 
  - Check the Freeciv Bug Tracking System at:
 
-http://gna.org/bugs/?group=freeciv
+https://www.hostedredmine.com/projects/freeciv
 
to see if the bug has already been reported.
 

Modified: branches/S3_0/doc/FAQ
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/FAQ?rev=35313=35312=35313=diff
==
--- branches/S3_0/doc/FAQ   (original)
+++ branches/S3_0/doc/FAQ   Fri Apr 28 01:38:19 2017
@@ -618,11 +618,7 @@
this site at the Freeciv Forums.
 
Patches and bug reports are best reported to the Freeciv bug tracking
-   system at http://gna.org/bugs/?group=freeciv.
-
-   Copies of submissions to the bug tracker at gna.org are automatically
-   sent to the development mailing list, with a bug ID in the subject.
-   Please use the bug tracker web interface for replies.
+   system at https://www.hostedredmine.com/projects/freeciv.
 
 ---
 

Modified: branches/S3_0/doc/TODO
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/TODO?rev=35313=35312=35313=diff
==
--- branches/S3_0/doc/TODO  (original)
+++ branches/S3_0/doc/TODO  Fri Apr 28 01:38:19 2017
@@ -4,5 +4,6 @@
 
 Freeciv is quite mature, and we think its already a great game, but
 there are always things to add or improve.  Check out the TODO page on
-http://www.freeciv.org or wish list items on
-http://gna.org/projects/freeciv/ for things that need to be done.
+http://www.freeciv.org/ or wish list items on
+https://www.hostedredmine.com/projects/freeciv for things that need to
+be done.

Modified: branches/S3_0/doc/ca/BUGS.ca
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/ca/BUGS.ca?rev=35313=35312=35313=diff
==
--- branches/S3_0/doc/ca/BUGS.ca(original)
+++ branches/S3_0/doc/ca/BUGS.caFri Apr 28 01:38:19 2017
@@ -22,7 +22,7 @@
 
  - Mirar el Sistema de Seguiment d'Errors de Freeciv a:
 
-http://gna.org/bugs/?group=freeciv
+https://www.hostedredmine.com/projects/freeciv
 
per veure si ja s'ha informat del problema.
 

Modified: branches/S3_0/doc/de/BUGS.de
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/de/BUGS.de?rev=35313=35312=35313=diff
==
--- branches/S3_0/doc/de/BUGS.de(original)
+++ branches/S3_0/doc/de/BUGS.deFri Apr

[Freeciv-commits] r35312 - in /trunk: ./ data/ doc/ doc/ca/ doc/de/ doc/fr/ doc/ja/ doc/nl/ doc/sv/

2017-04-27 Thread 0jacobnk . gna

Author: jtn
Date: Fri Apr 28 01:26:24 2017
New Revision: 35312

URL: http://svn.gna.org/viewcvs/freeciv?rev=35312=rev
Log:
Update bug tracker URL to hostedredmine.

See hrm feature #655380.

Modified:
trunk/configure.ac
trunk/data/helpdata.txt
trunk/doc/BUGS
trunk/doc/FAQ
trunk/doc/TODO
trunk/doc/ca/BUGS.ca
trunk/doc/de/BUGS.de
trunk/doc/fr/BUGS.fr
trunk/doc/ja/BUGS.ja
trunk/doc/nl/BUGS.nl
trunk/doc/sv/BUGS.sv

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=35312=35311=35312=diff
==
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Fri Apr 28 01:26:24 2017
@@ -2,7 +2,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([Freeciv], m4_esyscmd([./fc_version | tr -d '\n']),
-[http://www.hostedredmine.com/projects/freeciv],
+[https://www.hostedredmine.com/projects/freeciv],
 [freeciv], [http://www.freeciv.org/])
 AC_PREREQ(2.65)
 

Modified: trunk/data/helpdata.txt
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/helpdata.txt?rev=35312=35311=35312=diff
==
--- trunk/data/helpdata.txt (original)
+++ trunk/data/helpdata.txt Fri Apr 28 01:26:24 2017
@@ -2303,7 +2303,7 @@
 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/\
+  https://www.hostedredmine.com/projects/freeciv\
 ", _("\
 Please quote the above version information. \
 For more information about submitting bug reports see the file BUGS \

Modified: trunk/doc/BUGS
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/BUGS?rev=35312=35311=35312=diff
==
--- trunk/doc/BUGS  (original)
+++ trunk/doc/BUGS  Fri Apr 28 01:26:24 2017
@@ -3,7 +3,7 @@
 
 
 Freeciv 3.1 certainly contains some bugs. Please report all
-you find to http://gna.org/bugs/?func=additem=freeciv.
+you find to https://www.hostedredmine.com/projects/freeciv.
 
 
 REPORTING A BUG:
@@ -21,7 +21,7 @@
 
  - Check the Freeciv Bug Tracking System at:
 
-http://gna.org/bugs/?group=freeciv
+https://www.hostedredmine.com/projects/freeciv
 
to see if the bug has already been reported.
 

Modified: trunk/doc/FAQ
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/FAQ?rev=35312=35311=35312=diff
==
--- trunk/doc/FAQ   (original)
+++ trunk/doc/FAQ   Fri Apr 28 01:26:24 2017
@@ -618,11 +618,7 @@
this site at the Freeciv Forums.
 
Patches and bug reports are best reported to the Freeciv bug tracking
-   system at http://gna.org/bugs/?group=freeciv.
-
-   Copies of submissions to the bug tracker at gna.org are automatically
-   sent to the development mailing list, with a bug ID in the subject.
-   Please use the bug tracker web interface for replies.
+   system at https://www.hostedredmine.com/projects/freeciv.
 
 ---
 

Modified: trunk/doc/TODO
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/TODO?rev=35312=35311=35312=diff
==
--- trunk/doc/TODO  (original)
+++ trunk/doc/TODO  Fri Apr 28 01:26:24 2017
@@ -4,5 +4,6 @@
 
 Freeciv is quite mature, and we think its already a great game, but
 there are always things to add or improve.  Check out the TODO page on
-http://www.freeciv.org or wish list items on
-http://gna.org/projects/freeciv/ for things that need to be done.
+http://www.freeciv.org/ or wish list items on
+https://www.hostedredmine.com/projects/freeciv for things that need to
+be done.

Modified: trunk/doc/ca/BUGS.ca
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/ca/BUGS.ca?rev=35312=35311=35312=diff
==
--- trunk/doc/ca/BUGS.ca(original)
+++ trunk/doc/ca/BUGS.caFri Apr 28 01:26:24 2017
@@ -22,7 +22,7 @@
 
  - Mirar el Sistema de Seguiment d'Errors de Freeciv a:
 
-http://gna.org/bugs/?group=freeciv
+https://www.hostedredmine.com/projects/freeciv
 
per veure si ja s'ha informat del problema.
 

Modified: trunk/doc/de/BUGS.de
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/de/BUGS.de?rev=35312=35311=35312=diff
==
--- trunk/doc/de/BUGS.de(original)
+++ trunk/doc/de/BUGS.deFri Apr 28 01:26:24 2017
@@ -12,7 +12,7 @@
 Hier sind nur die offensichtlichsten Fehler aufgefÃ¼hrt. Eine vollstÃ¤ndige
 Liste findet man unter:

-   http://gna.org/bugs/?group=freeciv
+   https://www.hostedredmine.com/projects/freeciv
 
 
 BEKANNTE FEHLER:
@@ -117,7 +117,7 @@
  - Schauen Sie im

[Freeciv-commits] r35246 - /website/index.html

2017-04-16 Thread 0jacobnk . gna

Author: jtn
Date: Sun Apr 16 13:42:24 2017
New Revision: 35246

URL: http://svn.gna.org/viewcvs/freeciv?rev=35246=rev
Log:
Acknowledge gna.org shutdown.

Modified:
website/index.html

Modified: website/index.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/index.html?rev=35246=35245=35246=diff
==
--- website/index.html  (original)
+++ website/index.html  Sun Apr 16 13:42:24 2017
@@ -92,6 +92,7 @@
 
   Project news

+16th Apr 2017 - https://gna.org/;>Gna!, which has been faithfully hosting the Freeciv 
code for nearly 12 years, is https://gna.org/forum/forum.php?forum_id=2545;>expected to shut down 
soon. This website is unaffected and we have already moved downloads to new 
hosting, but we expect some interruption to some other project infrastructure 
(code version control, bug tracking, and mailing lists). We are in the process 
of making alternative arrangements; all important project data is already 
safely backed up. Watch this space for more detail.
 19th Nov 2016 - http://www.freeciv.org/wiki/NEWS-2.5.6;>Freeciv 2.5.6 is a bugfix 
release in the stable 2.5 series.
 30th Jul 2016 - http://www.freeciv.org/wiki/NEWS-2.5.5;>Freeciv 2.5.5 is a bugfix 
release in the stable 2.5 series.
 14th May 2016 - http://www.freeciv.org/wiki/NEWS-2.5.4;>Freeciv 2.5.4 is a bugfix 
release in the stable 2.5 series.


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

[Freeciv-commits] r35242 - in /trunk: doc/ doc/de/ doc/fr/ doc/it/ doc/ja/ doc/nl/ doc/sv/ tools/

2017-04-16 Thread 0jacobnk . gna

Author: jtn
Date: Sun Apr 16 11:17:18 2017
New Revision: 35242

URL: http://svn.gna.org/viewcvs/freeciv?rev=35242=rev
Log:
Replace download.gna.org with files.freeciv.org.

See hrm bug #652494.

Modified:
trunk/doc/README.sound
trunk/doc/de/BUGS.de
trunk/doc/de/HOWTOPLAY.de
trunk/doc/de/INSTALL.de
trunk/doc/fr/BUGS.fr
trunk/doc/fr/HOWTOPLAY.fr
trunk/doc/it/HOWTOPLAY.it
trunk/doc/it/INSTALL.it
trunk/doc/ja/BUGS.ja
trunk/doc/ja/HOWTOPLAY.ja
trunk/doc/nl/BUGS.nl
trunk/doc/nl/HOWTOPLAY.nl
trunk/doc/sv/HOWTOPLAY.sv
trunk/tools/modinst.h

Modified: trunk/doc/README.sound
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.sound?rev=35242=35241=35242=diff
==
--- trunk/doc/README.sound  (original)
+++ trunk/doc/README.sound  Sun Apr 16 11:17:18 2017
@@ -24,7 +24,7 @@
 put the files in the data directory mentioned above.
 
 You can get additional soundsets (sound files and a spec file)
-from . At this
+from . At this
 address you find also extra sound files to change an existing soundset or
 create a new one.
 

Modified: trunk/doc/de/BUGS.de
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/de/BUGS.de?rev=35242=35241=35242=diff
==
--- trunk/doc/de/BUGS.de(original)
+++ trunk/doc/de/BUGS.deSun Apr 16 11:17:18 2017
@@ -109,7 +109,7 @@
Insbesondere kÃ¶nnten Sie die neueste Entwicklerversion ausprobieren. Sie
kÃ¶nnen Ã¼ber FTP bekommen, unter:
 
-http://download.gna.org/freeciv/latest/
+http://files.freeciv.org/latest/
 
  - PrÃ¼fen Sie die FAQ auf der Freeciv Website, ob dort steht, wie Sie den
Fehler umgehen kÃ¶nnen.

Modified: trunk/doc/de/HOWTOPLAY.de
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/de/HOWTOPLAY.de?rev=35242=35241=35242=diff
==
--- trunk/doc/de/HOWTOPLAY.de   (original)
+++ trunk/doc/de/HOWTOPLAY.de   Sun Apr 16 11:17:18 2017
@@ -8,7 +8,7 @@
 werfen:
 
  http://www.freeciv.org/wiki-de/Handbuch
- http://download.gna.org/freeciv/contrib/manual/
+ http://files.freeciv.org/contrib/manual/
 
 ***
 *  Wenn Sie wissen wollen, wie man Freeciv spielt, sind Sie hier richtig! *
@@ -239,7 +239,7 @@
 Als Alternative kÃ¶nnen Sie David Pfitzner's "techtree"-Ãbersicht
 downloaden:
 
-http://download.gna.org/freeciv/contrib/charts/
+http://files.freeciv.org/contrib/charts/
 
 
 AuÃerdem kÃ¶nnen Sie sich die Datei '../data/default/techs.ruleset' ansehen.

Modified: trunk/doc/de/INSTALL.de
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/de/INSTALL.de?rev=35242=35241=35242=diff
==
--- trunk/doc/de/INSTALL.de (original)
+++ trunk/doc/de/INSTALL.de Sun Apr 16 11:17:18 2017
@@ -623,7 +623,7 @@
 
 BenÃ¶tigt werden:
- eine Unix-Umgebung mit gcc und den binutils fÃ¼r Windows (mingw32)
-   - libz und libpng (unter http://download.gna.org/freeciv/requirements)
+   - libz und libpng (unter http://files.freeciv.org/requirements)
 
 Diese funktionieren mit den Standard-Makefiles des gcc, allerdings mÃ¼ssen CC
 und RANLIB entsprechend gesetzt werden. Werden libpng/libz benutzt, die bei

Modified: trunk/doc/fr/BUGS.fr
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/fr/BUGS.fr?rev=35242=35241=35242=diff
==
--- trunk/doc/fr/BUGS.fr(original)
+++ trunk/doc/fr/BUGS.frSun Apr 16 11:17:18 2017
@@ -102,7 +102,7 @@
En particulier, vous pouvez essayer une version de dÃ©veloppement depuis 
 notre CVS. Vous pouvez la rÃ©cupÃ©rer Ã  :
 
-http://download.gna.org/freeciv/latest/
+http://files.freeciv.org/latest/
 
  - VÃ©rifiez la FAQ Freeciv dans le site web pour voir si un moyen de 
contourner
le bug n'a pas Ã©tÃ© publiÃ©.

Modified: trunk/doc/fr/HOWTOPLAY.fr
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/fr/HOWTOPLAY.fr?rev=35242=35241=35242=diff
==
--- trunk/doc/fr/HOWTOPLAY.fr   (original)
+++ trunk/doc/fr/HOWTOPLAY.fr   Sun Apr 16 11:17:18 2017
@@ -11,7 +11,7 @@
 endroits suivants :
 
  http://www.freeciv.org/wiki-fr/Manuel
- http://download.gna.org/freeciv/contrib/manual/
+ http://files.freeciv.org/contrib/manual/
 
 Si vous cherchez des idÃ©es pour jouer Ã  Freeciv, continuez Ã  lire !
 
@@ -259,7 +259,7 @@
 technologie.
 
 Sinon, vous pouvez tÃ©lÃ©charger le "techtree" de David Pfitzner :
-http://download.gna.org/freeciv/contrib/charts/.
+http://files.freeciv.org/contrib/charts/.
 
 En

[Freeciv-commits] r35241 - in /branches/S3_0: doc/ doc/de/ doc/fr/ doc/it/ doc/ja/ doc/nl/ doc/sv/ tools/

2017-04-16 Thread 0jacobnk . gna

Author: jtn
Date: Sun Apr 16 11:16:52 2017
New Revision: 35241

URL: http://svn.gna.org/viewcvs/freeciv?rev=35241=rev
Log:
Replace download.gna.org with files.freeciv.org.

See hrm bug #652494.

Modified:
branches/S3_0/doc/README.sound
branches/S3_0/doc/de/BUGS.de
branches/S3_0/doc/de/HOWTOPLAY.de
branches/S3_0/doc/de/INSTALL.de
branches/S3_0/doc/fr/BUGS.fr
branches/S3_0/doc/fr/HOWTOPLAY.fr
branches/S3_0/doc/it/HOWTOPLAY.it
branches/S3_0/doc/it/INSTALL.it
branches/S3_0/doc/ja/BUGS.ja
branches/S3_0/doc/ja/HOWTOPLAY.ja
branches/S3_0/doc/nl/BUGS.nl
branches/S3_0/doc/nl/HOWTOPLAY.nl
branches/S3_0/doc/sv/HOWTOPLAY.sv
branches/S3_0/tools/modinst.h

Modified: branches/S3_0/doc/README.sound
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/README.sound?rev=35241=35240=35241=diff
==
--- branches/S3_0/doc/README.sound  (original)
+++ branches/S3_0/doc/README.sound  Sun Apr 16 11:16:52 2017
@@ -24,7 +24,7 @@
 put the files in the data directory mentioned above.
 
 You can get additional soundsets (sound files and a spec file)
-from . At this
+from . At this
 address you find also extra sound files to change an existing soundset or
 create a new one.
 

Modified: branches/S3_0/doc/de/BUGS.de
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/de/BUGS.de?rev=35241=35240=35241=diff
==
--- branches/S3_0/doc/de/BUGS.de(original)
+++ branches/S3_0/doc/de/BUGS.deSun Apr 16 11:16:52 2017
@@ -109,7 +109,7 @@
Insbesondere kÃ¶nnten Sie die neueste Entwicklerversion ausprobieren. Sie
kÃ¶nnen Ã¼ber FTP bekommen, unter:
 
-http://download.gna.org/freeciv/latest/
+http://files.freeciv.org/latest/
 
  - PrÃ¼fen Sie die FAQ auf der Freeciv Website, ob dort steht, wie Sie den
Fehler umgehen kÃ¶nnen.

Modified: branches/S3_0/doc/de/HOWTOPLAY.de
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/de/HOWTOPLAY.de?rev=35241=35240=35241=diff
==
--- branches/S3_0/doc/de/HOWTOPLAY.de   (original)
+++ branches/S3_0/doc/de/HOWTOPLAY.de   Sun Apr 16 11:16:52 2017
@@ -8,7 +8,7 @@
 werfen:
 
  http://www.freeciv.org/wiki-de/Handbuch
- http://download.gna.org/freeciv/contrib/manual/
+ http://files.freeciv.org/contrib/manual/
 
 ***
 *  Wenn Sie wissen wollen, wie man Freeciv spielt, sind Sie hier richtig! *
@@ -239,7 +239,7 @@
 Als Alternative kÃ¶nnen Sie David Pfitzner's "techtree"-Ãbersicht
 downloaden:
 
-http://download.gna.org/freeciv/contrib/charts/
+http://files.freeciv.org/contrib/charts/
 
 
 AuÃerdem kÃ¶nnen Sie sich die Datei '../data/default/techs.ruleset' ansehen.

Modified: branches/S3_0/doc/de/INSTALL.de
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/de/INSTALL.de?rev=35241=35240=35241=diff
==
--- branches/S3_0/doc/de/INSTALL.de (original)
+++ branches/S3_0/doc/de/INSTALL.de Sun Apr 16 11:16:52 2017
@@ -623,7 +623,7 @@
 
 BenÃ¶tigt werden:
- eine Unix-Umgebung mit gcc und den binutils fÃ¼r Windows (mingw32)
-   - libz und libpng (unter http://download.gna.org/freeciv/requirements)
+   - libz und libpng (unter http://files.freeciv.org/requirements)
 
 Diese funktionieren mit den Standard-Makefiles des gcc, allerdings mÃ¼ssen CC
 und RANLIB entsprechend gesetzt werden. Werden libpng/libz benutzt, die bei

Modified: branches/S3_0/doc/fr/BUGS.fr
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/fr/BUGS.fr?rev=35241=35240=35241=diff
==
--- branches/S3_0/doc/fr/BUGS.fr(original)
+++ branches/S3_0/doc/fr/BUGS.frSun Apr 16 11:16:52 2017
@@ -102,7 +102,7 @@
En particulier, vous pouvez essayer une version de dÃ©veloppement depuis 
 notre CVS. Vous pouvez la rÃ©cupÃ©rer Ã  :
 
-http://download.gna.org/freeciv/latest/
+http://files.freeciv.org/latest/
 
  - VÃ©rifiez la FAQ Freeciv dans le site web pour voir si un moyen de 
contourner
le bug n'a pas Ã©tÃ© publiÃ©.

Modified: branches/S3_0/doc/fr/HOWTOPLAY.fr
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/fr/HOWTOPLAY.fr?rev=35241=35240=35241=diff
==
--- branches/S3_0/doc/fr/HOWTOPLAY.fr   (original)
+++ branches/S3_0/doc/fr/HOWTOPLAY.fr   Sun Apr 16 11:16:52 2017
@@ -11,7 +11,7 @@
 endroits suivants :
 
  http://www.freeciv.org/wiki-fr/Manuel
- http://download.gna.org/freeciv/contrib/manual/
+

[Freeciv-commits] r35240 - in /branches/S2_6: doc/ doc/de/ doc/fr/ doc/it/ doc/ja/ doc/nl/ doc/sv/ vms/

2017-04-16 Thread 0jacobnk . gna

Author: jtn
Date: Sun Apr 16 11:16:24 2017
New Revision: 35240

URL: http://svn.gna.org/viewcvs/freeciv?rev=35240=rev
Log:
Replace download.gna.org with files.freeciv.org.

See hrm bug #652494.

Modified:
branches/S2_6/doc/README.sound
branches/S2_6/doc/de/BUGS.de
branches/S2_6/doc/de/HOWTOPLAY.de
branches/S2_6/doc/de/INSTALL.de
branches/S2_6/doc/fr/HOWTOPLAY.fr
branches/S2_6/doc/it/HOWTOPLAY.it
branches/S2_6/doc/it/INSTALL.it
branches/S2_6/doc/ja/BUGS.ja
branches/S2_6/doc/ja/HOWTOPLAY.ja
branches/S2_6/doc/nl/BUGS.nl
branches/S2_6/doc/nl/HOWTOPLAY.nl
branches/S2_6/doc/sv/HOWTOPLAY.sv
branches/S2_6/vms/readme.vms

Modified: branches/S2_6/doc/README.sound
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.sound?rev=35240=35239=35240=diff
==
--- branches/S2_6/doc/README.sound  (original)
+++ branches/S2_6/doc/README.sound  Sun Apr 16 11:16:24 2017
@@ -24,7 +24,7 @@
 put the files in the data directory mentioned above.
 
 You can get additional soundsets (sound files and a spec file)
-from . At this
+from . At this
 address you find also extra sound files to change an existing soundset or
 create a new one.
 

Modified: branches/S2_6/doc/de/BUGS.de
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/de/BUGS.de?rev=35240=35239=35240=diff
==
--- branches/S2_6/doc/de/BUGS.de(original)
+++ branches/S2_6/doc/de/BUGS.deSun Apr 16 11:16:24 2017
@@ -109,7 +109,7 @@
Insbesondere kÃ¶nnten Sie die neueste Entwicklerversion ausprobieren. Sie
kÃ¶nnen Ã¼ber FTP bekommen, unter:
 
-http://download.gna.org/freeciv/latest/
+http://files.freeciv.org/latest/
 
  - PrÃ¼fen Sie die FAQ auf der Freeciv Website, ob dort steht, wie Sie den
Fehler umgehen kÃ¶nnen.

Modified: branches/S2_6/doc/de/HOWTOPLAY.de
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/de/HOWTOPLAY.de?rev=35240=35239=35240=diff
==
--- branches/S2_6/doc/de/HOWTOPLAY.de   (original)
+++ branches/S2_6/doc/de/HOWTOPLAY.de   Sun Apr 16 11:16:24 2017
@@ -8,7 +8,7 @@
 werfen:
 
  http://www.freeciv.org/wiki-de/Handbuch
- http://download.gna.org/freeciv/contrib/manual/
+ http://files.freeciv.org/contrib/manual/
 
 ***
 *  Wenn Sie wissen wollen, wie man Freeciv spielt, sind Sie hier richtig! *
@@ -239,7 +239,7 @@
 Als Alternative kÃ¶nnen Sie David Pfitzner's "techtree"-Ãbersicht
 downloaden:
 
-http://download.gna.org/freeciv/contrib/charts/
+http://files.freeciv.org/contrib/charts/
 
 
 AuÃerdem kÃ¶nnen Sie sich die Datei '../data/default/techs.ruleset' ansehen.

Modified: branches/S2_6/doc/de/INSTALL.de
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/de/INSTALL.de?rev=35240=35239=35240=diff
==
--- branches/S2_6/doc/de/INSTALL.de (original)
+++ branches/S2_6/doc/de/INSTALL.de Sun Apr 16 11:16:24 2017
@@ -623,7 +623,7 @@
 
 BenÃ¶tigt werden:
- eine Unix-Umgebung mit gcc und den binutils fÃ¼r Windows (mingw32)
-   - libz und libpng (unter http://download.gna.org/freeciv/requirements)
+   - libz und libpng (unter http://files.freeciv.org/requirements)
 
 Diese funktionieren mit den Standard-Makefiles des gcc, allerdings mÃ¼ssen CC
 und RANLIB entsprechend gesetzt werden. Werden libpng/libz benutzt, die bei

Modified: branches/S2_6/doc/fr/HOWTOPLAY.fr
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/fr/HOWTOPLAY.fr?rev=35240=35239=35240=diff
==
--- branches/S2_6/doc/fr/HOWTOPLAY.fr   (original)
+++ branches/S2_6/doc/fr/HOWTOPLAY.fr   Sun Apr 16 11:16:24 2017
@@ -16,7 +16,7 @@
 En anglais
 http://www.freeciv.org/wiki-fr/Manuel
 En franÃ§ais, pas forcÃ©ment Ã  jour
-http://download.gna.org/freeciv/contrib/manual/
+http://files.freeciv.org/contrib/manual/
 Manuels en anglais, assez anciens
 
 Si vous cherchez des idÃ©es pour jouer Ã  Freeciv, continuez Ã  lire !

Modified: branches/S2_6/doc/it/HOWTOPLAY.it
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/it/HOWTOPLAY.it?rev=35240=35239=35240=diff
==
--- branches/S2_6/doc/it/HOWTOPLAY.it   (original)
+++ branches/S2_6/doc/it/HOWTOPLAY.it   Sun Apr 16 11:16:24 2017
@@ -242,7 +242,7 @@
 Cercala nella guida in linea. Mostra le tecnologie di cui hai bisogno prima.
 
 In alternativa puoi scaricare il grafico "techtree" di David Pfitzner da
-http://download.gna.org/freeciv/contrib/charts/
+

[Freeciv-commits] r34955 - /branches/S3_0/client/gui-qt/fonts.h

2017-02-04 Thread 0jacobnk . gna

Author: jtn
Date: Sat Feb  4 12:17:36 2017
New Revision: 34955

URL: http://svn.gna.org/viewcvs/freeciv?rev=34955=rev
Log:
Add declaration of QStringList to fonts.h, which uses it, to fix
compilation failure on some systems.

See gna bug #25491.

Modified:
branches/S3_0/client/gui-qt/fonts.h

Modified: branches/S3_0/client/gui-qt/fonts.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/fonts.h?rev=34955=34954=34955=diff
==
--- branches/S3_0/client/gui-qt/fonts.h (original)
+++ branches/S3_0/client/gui-qt/fonts.h Sat Feb  4 12:17:36 2017
@@ -21,6 +21,7 @@
 #include "listener.h"
 
 class QFont;
+class QStringList;
 
 namespace fonts
 {


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

[Freeciv-commits] r34956 - /branches/S2_6/client/gui-qt/fonts.h

2017-02-04 Thread 0jacobnk . gna

Author: jtn
Date: Sat Feb  4 12:17:54 2017
New Revision: 34956

URL: http://svn.gna.org/viewcvs/freeciv?rev=34956=rev
Log:
Add declaration of QStringList to fonts.h, which uses it, to fix
compilation failure on some systems.

See gna bug #25491.

Modified:
branches/S2_6/client/gui-qt/fonts.h

Modified: branches/S2_6/client/gui-qt/fonts.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/fonts.h?rev=34956=34955=34956=diff
==
--- branches/S2_6/client/gui-qt/fonts.h (original)
+++ branches/S2_6/client/gui-qt/fonts.h Sat Feb  4 12:17:54 2017
@@ -21,6 +21,7 @@
 #include "listener.h"
 
 class QFont;
+class QStringList;
 
 namespace fonts
 {


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

[Freeciv-commits] r34954 - /trunk/client/gui-qt/fonts.h

2017-02-04 Thread 0jacobnk . gna

Author: jtn
Date: Sat Feb  4 12:17:03 2017
New Revision: 34954

URL: http://svn.gna.org/viewcvs/freeciv?rev=34954=rev
Log:
Add declaration of QStringList to fonts.h, which uses it, to fix
compilation failure on some systems.

See gna bug #25491.

Modified:
trunk/client/gui-qt/fonts.h

Modified: trunk/client/gui-qt/fonts.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/fonts.h?rev=34954=34953=34954=diff
==
--- trunk/client/gui-qt/fonts.h (original)
+++ trunk/client/gui-qt/fonts.h Sat Feb  4 12:17:03 2017
@@ -21,6 +21,7 @@
 #include "listener.h"
 
 class QFont;
+class QStringList;
 
 namespace fonts
 {


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

[Freeciv-commits] r34645 - /branches/S2_6/client/gui-qt/citydlg.cpp

2016-11-27 Thread 0jacobnk . gna

Author: jtn
Date: Mon Nov 28 01:27:22 2016
New Revision: 34645

URL: http://svn.gna.org/viewcvs/freeciv?rev=34645=rev
Log:
Stop requiring QWheelEvent::source() (new in Qt 5.5) to compile.

See bug #25341.

Modified:
branches/S2_6/client/gui-qt/citydlg.cpp

Modified: branches/S2_6/client/gui-qt/citydlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/citydlg.cpp?rev=34645=34644=34645=diff
==
--- branches/S2_6/client/gui-qt/citydlg.cpp (original)
+++ branches/S2_6/client/gui-qt/citydlg.cpp Mon Nov 28 01:27:22 2016
@@ -446,7 +446,7 @@
 event->angleDelta(),
 event->angleDelta().y(),
 Qt::Horizontal,  event->buttons(),
-event->modifiers(), event->phase(), event->source());
+event->modifiers(), event->phase());
   QApplication::sendEvent(parentWidget(), _event);
 }
 
@@ -495,7 +495,7 @@
 event->angleDelta(),
 event->angleDelta().y(),
 Qt::Horizontal,  event->buttons(),
-event->modifiers(), event->phase(), event->source());
+event->modifiers(), event->phase());
   QApplication::sendEvent(parentWidget()->parentWidget(),
   _event);
 }
@@ -882,7 +882,7 @@
 event->angleDelta(),
 event->angleDelta().y(),
 Qt::Horizontal,  event->buttons(),
-event->modifiers(), event->phase(), event->source());
+event->modifiers(), event->phase());
   QApplication::sendEvent(parentWidget()->parentWidget(),
   _event);
 }
@@ -963,7 +963,7 @@
 event->angleDelta(),
 event->angleDelta().y(),
 Qt::Horizontal,  event->buttons(),
-event->modifiers(), event->phase(), event->source());
+event->modifiers(), event->phase());
   QApplication::sendEvent(parentWidget(), _event);
 }
 


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

[Freeciv-commits] r34644 - /trunk/client/gui-qt/citydlg.cpp

2016-11-27 Thread 0jacobnk . gna

Author: jtn
Date: Mon Nov 28 01:27:06 2016
New Revision: 34644

URL: http://svn.gna.org/viewcvs/freeciv?rev=34644=rev
Log:
Stop requiring QWheelEvent::source() (new in Qt 5.5) to compile.

See bug #25341.

Modified:
trunk/client/gui-qt/citydlg.cpp

Modified: trunk/client/gui-qt/citydlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=34644=34643=34644=diff
==
--- trunk/client/gui-qt/citydlg.cpp (original)
+++ trunk/client/gui-qt/citydlg.cpp Mon Nov 28 01:27:06 2016
@@ -446,7 +446,7 @@
 event->angleDelta(),
 event->angleDelta().y(),
 Qt::Horizontal,  event->buttons(),
-event->modifiers(), event->phase(), event->source());
+event->modifiers(), event->phase());
   QApplication::sendEvent(parentWidget(), _event);
 }
 
@@ -495,7 +495,7 @@
 event->angleDelta(),
 event->angleDelta().y(),
 Qt::Horizontal,  event->buttons(),
-event->modifiers(), event->phase(), event->source());
+event->modifiers(), event->phase());
   QApplication::sendEvent(parentWidget()->parentWidget(),
   _event);
 }
@@ -882,7 +882,7 @@
 event->angleDelta(),
 event->angleDelta().y(),
 Qt::Horizontal,  event->buttons(),
-event->modifiers(), event->phase(), event->source());
+event->modifiers(), event->phase());
   QApplication::sendEvent(parentWidget()->parentWidget(),
   _event);
 }
@@ -963,7 +963,7 @@
 event->angleDelta(),
 event->angleDelta().y(),
 Qt::Horizontal,  event->buttons(),
-event->modifiers(), event->phase(), event->source());
+event->modifiers(), event->phase());
   QApplication::sendEvent(parentWidget(), _event);
 }
 


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

[Freeciv-commits] r34573 - in /website: download.html index.html js/freeciv.js

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 14:27:51 2016
New Revision: 34573

URL: http://svn.gna.org/viewcvs/freeciv?rev=34573=rev
Log:
Announce 2.5.6.

Modified:
website/download.html
website/index.html
website/js/freeciv.js

Modified: website/download.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/download.html?rev=34573=34572=34573=diff
==
--- website/download.html   (original)
+++ website/download.html   Sat Nov 19 14:27:51 2016
@@ -63,26 +63,26 @@
 
 
 
-Here you can download the latest version of Freeciv: 2.5.5. To learn what's 
changed between releases, see the http://www.freeciv.org/wiki/NEWS;>NEWS page. For more download 
distributions, see the http://www.freeciv.org/wiki/More_distributions;>wiki. 
+Here you can download the latest version of Freeciv: 2.5.6. To learn what's 
changed between releases, see the http://www.freeciv.org/wiki/NEWS;>NEWS page. For more download 
distributions, see the http://www.freeciv.org/wiki/More_distributions;>wiki. 
 
 Stable 2.5
-See the http://www.freeciv.org/wiki/NEWS-2.5.5;>list of changes 
in the most recent release.
+See the http://www.freeciv.org/wiki/NEWS-2.5.6;>list of changes 
in the most recent release.
 
 Source Code
 To compile Freeciv yourself, download the source code:
 
 
-freeciv-2.5.5.tar.bz2 
-http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.5.tar.bz2?download;>Mirror
 1 (sourceforge.net)
-http://download.gna.org/freeciv/stable/freeciv-2.5.5.tar.bz2;>Mirror 
2 (gna.org)
-freeciv-2.5.5.zip 
-http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.5.zip?download;>Mirror
 1 (sourceforge.net)
-http://download.gna.org/freeciv/stable/freeciv-2.5.5.zip;>Mirror 2 
(gna.org)
+freeciv-2.5.6.tar.bz2 
+http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.6.tar.bz2?download;>Mirror
 1 (sourceforge.net)
+http://download.gna.org/freeciv/stable/freeciv-2.5.6.tar.bz2;>Mirror 
2 (gna.org)
+freeciv-2.5.6.zip 
+http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.6.zip?download;>Mirror
 1 (sourceforge.net)
+http://download.gna.org/freeciv/stable/freeciv-2.5.6.zip;>Mirror 2 
(gna.org)
 
 
 Windows Packages
 
-
+Windows packages for the latest release are not 
available yet.
 
 Windows binaries are available at:
 

Modified: website/index.html
URL: 
http://svn.gna.org/viewcvs/freeciv/website/index.html?rev=34573=34572=34573=diff
==
--- website/index.html  (original)
+++ website/index.html  Sat Nov 19 14:27:51 2016
@@ -62,7 +62,7 @@


Download Freeciv 
-   Stable Version 2.5.5 released on 30th July 
2016
+   Stable Version 2.5.6 released on 19th 
November 2016
https://play.freeciv.org/;>Play Freeciv-web 
The online browser version of Freeciv using 
HTML5
http://forum.freeciv.org/;>Community Forum 
@@ -92,6 +92,7 @@
 
   Project news

+19th Nov 2016 - http://www.freeciv.org/wiki/NEWS-2.5.6;>Freeciv 2.5.6 is a bugfix 
release in the stable 2.5 series.
 30th Jul 2016 - http://www.freeciv.org/wiki/NEWS-2.5.5;>Freeciv 2.5.5 is a bugfix 
release in the stable 2.5 series.
 14th May 2016 - http://www.freeciv.org/wiki/NEWS-2.5.4;>Freeciv 2.5.4 is a bugfix 
release in the stable 2.5 series.
 7th Feb 2016 - http://www.freeciv.org/wiki/NEWS-2.5.3;>Freeciv 2.5.3 is a bugfix 
release in the stable 2.5 series (mainly for distribution maintainers).

Modified: website/js/freeciv.js
URL: 
http://svn.gna.org/viewcvs/freeciv/website/js/freeciv.js?rev=34573=34572=34573=diff
==
--- website/js/freeciv.js   (original)
+++ website/js/freeciv.js   Sat Nov 19 14:27:51 2016
@@ -22,9 +22,9 @@
* place.
   
   if (window.ui.os=="Windows") {
-$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.5-win32-gtk2-setup.exe?download;);
+$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.6-win32-gtk2-setup.exe?download;);
   } else if (window.ui.os=="Linux") {
-$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.5.tar.bz2?download;);
+$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.6.tar.bz2?download;);
   } else if (window.ui.os=="Mac OS X") {
 $("#download_button").attr("href", 
"http://www.freeciv.org/wiki/Install-MacOSX;);
   } else {


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

[Freeciv-commits] r34572 - /tags/R2_5_6/fc_version

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 13:23:22 2016
New Revision: 34572

URL: http://svn.gna.org/viewcvs/freeciv?rev=34572=rev
Log:
Strip '+' from version string for release.

Modified:
tags/R2_5_6/fc_version

Modified: tags/R2_5_6/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/tags/R2_5_6/fc_version?rev=34572=34571=34572=diff
==
--- tags/R2_5_6/fc_version  (original)
+++ tags/R2_5_6/fc_version  Sat Nov 19 13:23:22 2016
@@ -7,7 +7,7 @@
 MAJOR_VERSION="2"
 MINOR_VERSION="5"
 PATCH_VERSION="6"
-VERSION_LABEL="+"
+VERSION_LABEL=""
 
 # 1) Development until MAJOR and MINOR version numbers are
 #set to new release series:


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

[Freeciv-commits] r34571 - /tags/R2_5_6/

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 13:14:42 2016
New Revision: 34571

URL: http://svn.gna.org/viewcvs/freeciv?rev=34571=rev
Log:
Tag 2.5.6 release.

Added:
tags/R2_5_6/
  - copied from r34570, branches/S2_5/


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

[Freeciv-commits] r34570 - /branches/S2_5/ChangeLog

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 13:11:53 2016
New Revision: 34570

URL: http://svn.gna.org/viewcvs/freeciv?rev=34570=rev
Log:
Update ChangeLog as of S2_5 r34569.

Modified:
branches/S2_5/ChangeLog

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

Modified: branches/S2_5/ChangeLog
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/ChangeLog?rev=34570=34569=34570=diff


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

[Freeciv-commits] r34567 - in /branches/S2_5/translations: freeciv/ nations/

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 13:00:08 2016
New Revision: 34567

URL: http://svn.gna.org/viewcvs/freeciv?rev=34567=rev
Log:
Results of running "make update-po"
in translations/freeciv/ and translations/nations/

Modified:
branches/S2_5/translations/freeciv/ar.po
branches/S2_5/translations/freeciv/bg.po
branches/S2_5/translations/freeciv/ca.po
branches/S2_5/translations/freeciv/cs.po
branches/S2_5/translations/freeciv/da.po
branches/S2_5/translations/freeciv/de.po
branches/S2_5/translations/freeciv/el.po
branches/S2_5/translations/freeciv/en_GB.po
branches/S2_5/translations/freeciv/eo.po
branches/S2_5/translations/freeciv/es.po
branches/S2_5/translations/freeciv/et.po
branches/S2_5/translations/freeciv/fa.po
branches/S2_5/translations/freeciv/fi.po
branches/S2_5/translations/freeciv/fr.po
branches/S2_5/translations/freeciv/ga.po
branches/S2_5/translations/freeciv/gd.po
branches/S2_5/translations/freeciv/he.po
branches/S2_5/translations/freeciv/hu.po
branches/S2_5/translations/freeciv/id.po
branches/S2_5/translations/freeciv/it.po
branches/S2_5/translations/freeciv/ja.po
branches/S2_5/translations/freeciv/ko.po
branches/S2_5/translations/freeciv/lt.po
branches/S2_5/translations/freeciv/nb.po
branches/S2_5/translations/freeciv/nl.po
branches/S2_5/translations/freeciv/pl.po
branches/S2_5/translations/freeciv/pt.po
branches/S2_5/translations/freeciv/pt_BR.po
branches/S2_5/translations/freeciv/ro.po
branches/S2_5/translations/freeciv/ru.po
branches/S2_5/translations/freeciv/sr.po
branches/S2_5/translations/freeciv/sv.po
branches/S2_5/translations/freeciv/tr.po
branches/S2_5/translations/freeciv/uk.po
branches/S2_5/translations/freeciv/zh_CN.po
branches/S2_5/translations/freeciv/zh_TW.po
branches/S2_5/translations/nations/ar.po
branches/S2_5/translations/nations/bg.po
branches/S2_5/translations/nations/ca.po
branches/S2_5/translations/nations/cs.po
branches/S2_5/translations/nations/da.po
branches/S2_5/translations/nations/de.po
branches/S2_5/translations/nations/el.po
branches/S2_5/translations/nations/en_GB.po
branches/S2_5/translations/nations/eo.po
branches/S2_5/translations/nations/es.po
branches/S2_5/translations/nations/et.po
branches/S2_5/translations/nations/fa.po
branches/S2_5/translations/nations/fi.po
branches/S2_5/translations/nations/fr.po
branches/S2_5/translations/nations/ga.po
branches/S2_5/translations/nations/gd.po
branches/S2_5/translations/nations/he.po
branches/S2_5/translations/nations/hu.po
branches/S2_5/translations/nations/id.po
branches/S2_5/translations/nations/it.po
branches/S2_5/translations/nations/ja.po
branches/S2_5/translations/nations/ko.po
branches/S2_5/translations/nations/lt.po
branches/S2_5/translations/nations/nb.po
branches/S2_5/translations/nations/nl.po
branches/S2_5/translations/nations/pl.po
branches/S2_5/translations/nations/pt.po
branches/S2_5/translations/nations/pt_BR.po
branches/S2_5/translations/nations/ro.po
branches/S2_5/translations/nations/ru.po
branches/S2_5/translations/nations/sr.po
branches/S2_5/translations/nations/sv.po
branches/S2_5/translations/nations/tr.po
branches/S2_5/translations/nations/uk.po
branches/S2_5/translations/nations/zh_CN.po
branches/S2_5/translations/nations/zh_TW.po

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

Modified: branches/S2_5/translations/freeciv/ar.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ar.po?rev=34567=34566=34567=diff

Modified: branches/S2_5/translations/freeciv/bg.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/bg.po?rev=34567=34566=34567=diff

Modified: branches/S2_5/translations/freeciv/ca.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ca.po?rev=34567=34566=34567=diff

Modified: branches/S2_5/translations/freeciv/cs.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/cs.po?rev=34567=34566=34567=diff

Modified: branches/S2_5/translations/freeciv/da.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/da.po?rev=34567=34566=34567=diff

Modified: branches/S2_5/translations/freeciv/de.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/de.po?rev=34567=34566=34567=diff

Modified: branches/S2_5/translations/freeciv/el.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/el.po?rev=34567=34566=34567=diff

Modified: branches/S2_5/translations/freeciv/en_GB.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/en_GB.po?rev=34567=34566=34567=diff

Modified: branches/S2_5/translations/freeciv/eo.po
URL:

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

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 13:01:00 2016
New Revision: 34569

URL: http://svn.gna.org/viewcvs/freeciv?rev=34569=rev
Log:
Bump version number to '2.5.6'.

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=34569=34568=34569=diff
==
--- branches/S2_5/fc_version(original)
+++ branches/S2_5/fc_versionSat Nov 19 13:01:00 2016
@@ -6,7 +6,7 @@
 
 MAJOR_VERSION="2"
 MINOR_VERSION="5"
-PATCH_VERSION="5"
+PATCH_VERSION="6"
 VERSION_LABEL="+"
 
 # 1) Development until MAJOR and MINOR version numbers are


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

[Freeciv-commits] r34568 - /branches/S2_5/NEWS-2.5

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 13:00:57 2016
New Revision: 34568

URL: http://svn.gna.org/viewcvs/freeciv?rev=34568=rev
Log:
Refresh NEWS-2.5 for 2.5.6, from wiki.

Modified:
branches/S2_5/NEWS-2.5

Modified: branches/S2_5/NEWS-2.5
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/NEWS-2.5?rev=34568=34567=34568=diff
==
--- branches/S2_5/NEWS-2.5  (original)
+++ branches/S2_5/NEWS-2.5  Sat Nov 19 13:00:57 2016
@@ -1,10 +1,168 @@
 
-Welcome to Freeciv 2.5.5
+Welcome to Freeciv 2.5.6
 
 
 The changes in the 2.5.x series are summarised below.
 For changes prior to 2.5, see NEWS. For more detailed changes,
 see the ChangeLog file.
+
+
+CHANGES FROM 2.5.5 to 2.5.6
+---
+
+   (from )
+
+   2.5.6 is a bugfix release.
+
+Server / General
+
+Changes affecting players (supplied rulesets)
+
+ * Disbanding a caravan-type unit with the "Disband" action (Shift-D)
+   in a city that's building a wonder no longer contributes 100% of
+   that unit's production cost towards the wonder. You must explicitly
+   use the "Help Build Wonder" action (B). This change was made
+   because this allowed rules to be bypassed -- it allowed adding
+   shields to foreign cities' wonders. GNA#23911
+ * If autoattack is enabled, cargo now preferentially attacks before
+   its transport. GNA#25259 GNAPATCH#7985
+ * Air units could fail to return to refuel automatically and be lost,
+   despite having enough movement points. GNA#25294
+ * A spurious enemy land unit could be shown in the middle of the sea
+   on the client if the client's player saw its transporter being
+   sunk, in games with 'killstack' disabled. GNA#24921
+ * Borders were sometimes not adjusted after tiles changed from land
+   to water. GNA#23179
+ * It was possible to launch a spaceship that was not entirely
+   connected (in a specific way). GNA#24979
+ * The server could emit assertion failures when a barbarian leader
+   could not or did not want to move. GNA#24929
+ * The server could emit assertion failures shortly after creating a
+   new barbarian player. GNA#24545
+ * The server now gives a clear error message if it fails to parse a
+   saved game file. GNA#24972
+ * After selecting a specific nation to play and then reverting to
+   random selection, it was possible to end up with previously
+   selected nation anyway, due to the leader name persisting.
+   GNA#24170
+ * Removed duplicate city 'Orange' from Texan ruleset. (This was
+   harmless.) GNA#25003
+
+Changes affecting other rulesets / modders
+
+ * Remove init_government from the Lycian nation. This prevented using
+   the standard nation set nationlist.ruleset in a ruleset not
+   containing a 'Despotism' government type. GNA#24904
+ * Extra sanity checking when loading rulesets. GNA#24905 GNA#25137
+
+Changes affecting server operators
+
+ * When reducing command permissions (cmdlevel) on game start to
+   'basic' for connected players, new connections after game start
+   still got 'ctrl' permissions. GNA#24774
+
+General
+
+ * A tiny optimization for speed. GNAPATCH#7567
+ * Various internal changes which should only affect developers.
+   GNA#25007 GNA#25301
+
+AI
+
+ * The building advisor will no longer automatically build (and hence
+   move) 'small wonder' buildings of any kind. (Previously it only
+   refused to move the Palace.) GNA#7598
+ * The AI could send caravans toward foreign cities in the mistaken
+   belief that (a) they could help build a wonder there, (b) this
+   would be somehow useful. GNA#24662
+
+Clients
+
+ * Sound is no longer disabled by default for fresh installations,
+   unless it was not compiled in. GNA#24280
+ * If a sound set with menu music was in use, a brief snatch of it
+   would be played when quitting the client. GNA#24844
+ * The 'Turn Done' button is now disabled for dead players. (It did
+   not do anything useful.) GNA#24945
+ * (Gtk3) Fix misdrawing of the scenario choosing page. GNA#24882
+ * (Gtk3) Fix warnings about use of Pango font syntax seen with newer
+   versions of Gtk. GNAPATCH#7162 GNA#25226
+ * (Gtk3) Fix various other trouble when using the newest Gtk (3.22).
+   GNAPATCH#7845 GNA#25160
+ * (Qt) Fix constantly blinking research text the turn when the tech
+   tree is complete. GNA#25071
+ * (Qt) Added the option to show which tiles are native to a unit, as
+   in other clients. GNAPATCH#6445
+ * (Qt) Added the 'Default' option to theme selection. GNAPATCH#7666
+ * (Qt) Fix artifacts on minimap: a vertical line of bright (unfogged)
+   pixels was shown in hex topologies, and more unfogged pixels

[Freeciv-commits] r34566 - /trunk/translations/core/de.po

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 12:13:27 2016
New Revision: 34566

URL: http://svn.gna.org/viewcvs/freeciv?rev=34566=rev
Log:
Updated German translation from "Quintus" (Marvin Gülker)
msgmerged from S2_5 r34562. Stats on trunk:
core: 77%: 5651 translated, 1089 fuzzy, 631 untranslated.

(This is Marvin's final update as primary German translator.)

Modified:
trunk/translations/core/de.po

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

Modified: trunk/translations/core/de.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/de.po?rev=34566=34565=34566=diff


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

[Freeciv-commits] r34565 - in /branches/S2_6/translations: freeciv/ru.po nations/ru.po ruledit/ru.po

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 11:54:30 2016
New Revision: 34565

URL: http://svn.gna.org/viewcvs/freeciv?rev=34565=rev
Log:
Updated Russian translation from Konstantin Vedeneev.
freeciv: 99.4%: 6927 translated, 1 fuzzy, 40 untranslated.
nations: 100%: 1844 translated.
ruledit: 100%: 74 translated.

Modified:
branches/S2_6/translations/freeciv/ru.po
branches/S2_6/translations/nations/ru.po
branches/S2_6/translations/ruledit/ru.po

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

Modified: branches/S2_6/translations/freeciv/ru.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/ru.po?rev=34565=34564=34565=diff

Modified: branches/S2_6/translations/nations/ru.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/ru.po?rev=34565=34564=34565=diff

Modified: branches/S2_6/translations/ruledit/ru.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/ruledit/ru.po?rev=34565=34564=34565=diff


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

[Freeciv-commits] r34564 - /branches/S2_6/translations/freeciv/de.po

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 11:54:16 2016
New Revision: 34564

URL: http://svn.gna.org/viewcvs/freeciv?rev=34564=rev
Log:
Updated German translation from "Quintus" (Marvin Gülker)
msgmerged from S2_5 r34562. Stats on S2_6:
freeciv: 86%: 6016 translated, 649 fuzzy, 303 untranslated.

(This is Marvin's final update as primary German translator.)

Modified:
branches/S2_6/translations/freeciv/de.po

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

Modified: branches/S2_6/translations/freeciv/de.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/de.po?rev=34564=34563=34564=diff


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

[Freeciv-commits] r34562 - /branches/S2_5/translations/freeciv/de.po

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 11:25:24 2016
New Revision: 34562

URL: http://svn.gna.org/viewcvs/freeciv?rev=34562=rev
Log:
Updated German translation from "Quintus" (Marvin Gülker).
100%: 6293 translated.

(This is Marvin's final update as primary German translator.)

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

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

Modified: branches/S2_5/translations/freeciv/de.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/de.po?rev=34562=34561=34562=diff


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

[Freeciv-commits] r34563 - in /branches/S2_5/translations: freeciv/ru.po nations/ru.po

2016-11-19 Thread 0jacobnk . gna

Author: jtn
Date: Sat Nov 19 11:25:31 2016
New Revision: 34563

URL: http://svn.gna.org/viewcvs/freeciv?rev=34563=rev
Log:
Updated Russian translation from Konstantin Vedeneev.
freeciv: 100%: 6293 translated.
nations: 100%: 1844 translated.

Modified:
branches/S2_5/translations/freeciv/ru.po
branches/S2_5/translations/nations/ru.po

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

Modified: branches/S2_5/translations/freeciv/ru.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ru.po?rev=34563=34562=34563=diff

Modified: branches/S2_5/translations/nations/ru.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/ru.po?rev=34563=34562=34563=diff


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

[Freeciv-commits] r34514 - /branches/S2_5/server/unittools.c

2016-11-15 Thread 0jacobnk . gna

Author: jtn
Date: Tue Nov 15 11:22:17 2016
New Revision: 34514

URL: http://svn.gna.org/viewcvs/freeciv?rev=34514=rev
Log:
Small optimisation to autoattack transport depth check.

See gna patch #7985.

Modified:
branches/S2_5/server/unittools.c

Modified: branches/S2_5/server/unittools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/unittools.c?rev=34514=34513=34514=diff
==
--- branches/S2_5/server/unittools.c(original)
+++ branches/S2_5/server/unittools.cTue Nov 15 11:22:17 2016
@@ -3025,10 +3025,10 @@
 
 /**
   This function is passed to unit_list_sort() to sort a list of units
-  according to their win chance against autoattack_target modified by
+  according to their win chance against autoattack_target, modified by
   transportation relationships.
 
-  The reason for making sure that a cargo unit is ahead of it
+  The reason for making sure that a cargo unit is ahead of its
   transporter(s) is to leave transports out of combat if at all possible.
   (The transport could be destroyed during combat.)
 **/
@@ -3041,10 +3041,26 @@
   int q1uwc = unit_win_chance(*q1, q1def);
 
   /* Sort by transport depth first. This makes sure that no transport
-   * attacks before its cargo does. */
-  if (unit_transport_depth(*p1) != unit_transport_depth(*q1)) {
-/* The units have a different number of recursive transporters. */
-return unit_transport_depth(*q1) - unit_transport_depth(*p1);
+   * attacks before its cargo does -- cargo sorts earlier in the list. */
+  {
+const struct unit *p1trans = *p1, *q1trans = *q1;
+
+/* Walk the transport stacks in parallel, so as to bail out as soon as
+ * one of them is empty (avoid walking deep stacks more often than
+ * necessary). */
+while (p1trans && q1trans) {
+  p1trans = unit_transport_get(p1trans);
+  q1trans = unit_transport_get(q1trans);
+}
+if (!p1trans && q1trans) {
+  /* q1 is at greater depth (perhaps it's p1's cargo). It should sort
+   * earlier in the list (p1 > q1). */
+  return 1;
+} else if (p1trans && !q1trans) {
+  /* p1 is at greater depth, so should sort earlier (p1 < q1). */
+  return -1;
+}
+/* else same depth, so move on to checking win chance: */
   }
 
   if (p1uwc < q1uwc) {


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

[Freeciv-commits] r34512 - /trunk/server/unittools.c

2016-11-15 Thread 0jacobnk . gna

Author: jtn
Date: Tue Nov 15 11:21:02 2016
New Revision: 34512

URL: http://svn.gna.org/viewcvs/freeciv?rev=34512=rev
Log:
Small optimisation to autoattack transport depth check.

See gna patch #7985.

Modified:
trunk/server/unittools.c

Modified: trunk/server/unittools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/unittools.c?rev=34512=34511=34512=diff
==
--- trunk/server/unittools.c(original)
+++ trunk/server/unittools.cTue Nov 15 11:21:02 2016
@@ -3040,9 +3040,9 @@
 /**
   This function is passed to autoattack_prob_list_sort() to sort a list of
   units and action probabilities according to their win chance against the
-  autoattack target modified by transportation relationships.
-
-  The reason for making sure that a cargo unit is ahead of it
+  autoattack target, modified by transportation relationships.
+
+  The reason for making sure that a cargo unit is ahead of its
   transporter(s) is to leave transports out of combat if at all possible.
   (The transport could be destroyed during combat.)
 **/
@@ -3053,19 +3053,35 @@
   const struct unit *q1unit = game_unit_by_number((*q1)->unit_id);
 
   /* Sort by transport depth first. This makes sure that no transport
-   * attacks before its cargo does. */
-  if (unit_transport_depth(p1unit) != unit_transport_depth(q1unit)) {
-/* The units have a different number of recursive transporters. */
-return unit_transport_depth(q1unit) - unit_transport_depth(p1unit);
-  } else {
-/* Put the units with the highest probability of success first. The up
- * side of this is that units with bonuses against the victim attacks
- * before other units. The downside is that strong units can be lead
- * away by sacrificial units. */
-return (-1
-/* Assume the worst. */
-* action_prob_cmp_pessimist((*p1)->prob, (*q1)->prob));
-  }
+   * attacks before its cargo does -- cargo sorts earlier in the list. */
+  {
+const struct unit *p1trans = p1unit, *q1trans = q1unit;
+
+/* Walk the transport stacks in parallel, so as to bail out as soon as
+ * one of them is empty (avoid walking deep stacks more often than
+ * necessary). */
+while (p1trans && q1trans) {
+  p1trans = unit_transport_get(p1trans);
+  q1trans = unit_transport_get(q1trans);
+}
+if (!p1trans && q1trans) {
+  /* q1 is at greater depth (perhaps it's p1's cargo). It should sort
+   * earlier in the list (p1 > q1). */
+  return 1;
+} else if (p1trans && !q1trans) {
+  /* p1 is at greater depth, so should sort earlier (p1 < q1). */
+  return -1;
+}
+/* else same depth, so move on to checking win chance: */
+  }
+
+  /* Put the units with the highest probability of success first. The up
+   * side of this is that units with bonuses against the victim attacks
+   * before other units. The downside is that strong units can be led
+   * away by sacrificial units. */
+  return (-1
+  /* Assume the worst. */
+  * action_prob_cmp_pessimist((*p1)->prob, (*q1)->prob));
 }
 
 /*


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

[Freeciv-commits] r34513 - /branches/S2_6/server/unittools.c

2016-11-15 Thread 0jacobnk . gna

Author: jtn
Date: Tue Nov 15 11:21:54 2016
New Revision: 34513

URL: http://svn.gna.org/viewcvs/freeciv?rev=34513=rev
Log:
Small optimisation to autoattack transport depth check.

See gna patch #7985.

Modified:
branches/S2_6/server/unittools.c

Modified: branches/S2_6/server/unittools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/unittools.c?rev=34513=34512=34513=diff
==
--- branches/S2_6/server/unittools.c(original)
+++ branches/S2_6/server/unittools.cTue Nov 15 11:21:54 2016
@@ -2939,10 +2939,10 @@
 
 /**
   This function is passed to unit_list_sort() to sort a list of units
-  according to their win chance against autoattack_target modified by
+  according to their win chance against autoattack_target, modified by
   transportation relationships.
 
-  The reason for making sure that a cargo unit is ahead of it
+  The reason for making sure that a cargo unit is ahead of its
   transporter(s) is to leave transports out of combat if at all possible.
   (The transport could be destroyed during combat.)
 **/
@@ -2955,10 +2955,26 @@
   int q1uwc = unit_win_chance(*q1, q1def);
 
   /* Sort by transport depth first. This makes sure that no transport
-   * attacks before its cargo does. */
-  if (unit_transport_depth(*p1) != unit_transport_depth(*q1)) {
-/* The units have a different number of recursive transporters. */
-return unit_transport_depth(*q1) - unit_transport_depth(*p1);
+   * attacks before its cargo does -- cargo sorts earlier in the list. */
+  {
+const struct unit *p1trans = *p1, *q1trans = *q1;
+
+/* Walk the transport stacks in parallel, so as to bail out as soon as
+ * one of them is empty (avoid walking deep stacks more often than
+ * necessary). */
+while (p1trans && q1trans) {
+  p1trans = unit_transport_get(p1trans);
+  q1trans = unit_transport_get(q1trans);
+}
+if (!p1trans && q1trans) {
+  /* q1 is at greater depth (perhaps it's p1's cargo). It should sort
+   * earlier in the list (p1 > q1). */
+  return 1;
+} else if (p1trans && !q1trans) {
+  /* p1 is at greater depth, so should sort earlier (p1 < q1). */
+  return -1;
+}
+/* else same depth, so move on to checking win chance: */
   }
 
   /* Put the units with the highest probability of success first. The up


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

[Freeciv-commits] r34447 - in /branches/S2_6: doc/README.effects server/unittools.c

2016-11-08 Thread 0jacobnk . gna

Author: jtn
Date: Tue Nov  8 23:08:31 2016
New Revision: 34447

URL: http://svn.gna.org/viewcvs/freeciv?rev=34447=rev
Log:
Fully document Retire_Pct behaviour.

See bug #25265.

Modified:
branches/S2_6/doc/README.effects
branches/S2_6/server/unittools.c

Modified: branches/S2_6/doc/README.effects
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.effects?rev=34447=34446=34447=diff
==
--- branches/S2_6/doc/README.effects(original)
+++ branches/S2_6/doc/README.effectsTue Nov  8 23:08:31 2016
@@ -420,7 +420,9 @@
 for units upgraded in certain city.
 
 Retire_Pct
-The chance that unit gets retired when turn changes
+The chance that unit gets retired (removed) when turn changes.
+Retirement only happens if there are no enemy units or cities within
+a few tiles. (This exists mainly to implement barbarian behavior.)
 
 Visible_Wall
 Instruct client to show specific buildings version of the city graphics.

Modified: branches/S2_6/server/unittools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/unittools.c?rev=34447=34446=34447=diff
==
--- branches/S2_6/server/unittools.c(original)
+++ branches/S2_6/server/unittools.cTue Nov  8 23:08:31 2016
@@ -4386,10 +4386,9 @@
 }
 
 /**
-  Barbarian units may disband spontaneously if their age is more than
-  BARBARIAN_MIN_LIFESPAN, they are not in cities, and they are far from
-  any enemy units. It is to remove barbarians that do not engage into any
-  activity for a long time.
+  Units (usually barbarian units) may disband spontaneously if they are
+  far from any enemy units or cities. It is to remove barbarians that do
+  not engage into any activity for a long time.
 **/
 bool unit_can_be_retired(struct unit *punit)
 {


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

[Freeciv-commits] r34446 - in /trunk: doc/README.effects server/unittools.c

2016-11-08 Thread 0jacobnk . gna

Author: jtn
Date: Tue Nov  8 23:05:56 2016
New Revision: 34446

URL: http://svn.gna.org/viewcvs/freeciv?rev=34446=rev
Log:
Fully document Retire_Pct behaviour.

See bug #25265.

Modified:
trunk/doc/README.effects
trunk/server/unittools.c

Modified: trunk/doc/README.effects
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.effects?rev=34446=34445=34446=diff
==
--- trunk/doc/README.effects(original)
+++ trunk/doc/README.effectsTue Nov  8 23:05:56 2016
@@ -483,7 +483,9 @@
 for units upgraded in certain city.
 
 Retire_Pct
-The chance that unit gets retired when turn changes
+The chance that unit gets retired (removed) when turn changes.
+Retirement only happens if there are no enemy units or cities within
+a few tiles. (This exists mainly to implement barbarian behavior.)
 
 Visible_Wall
 Instruct client to show specific buildings version of the city graphics.

Modified: trunk/server/unittools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/unittools.c?rev=34446=34445=34446=diff
==
--- trunk/server/unittools.c(original)
+++ trunk/server/unittools.cTue Nov  8 23:05:56 2016
@@ -4528,10 +4528,9 @@
 }
 
 /**
-  Barbarian units may disband spontaneously if their age is more than
-  BARBARIAN_MIN_LIFESPAN, they are not in cities, and they are far from
-  any enemy units. It is to remove barbarians that do not engage into any
-  activity for a long time.
+  Units (usually barbarian units) may disband spontaneously if they are
+  far from any enemy units or cities. It is to remove barbarians that do
+  not engage into any activity for a long time.
 **/
 bool unit_can_be_retired(struct unit *punit)
 {


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

[Freeciv-commits] r34376 - /branches/S2_5/doc/man/freeciv-client.6.in

2016-11-03 Thread 0jacobnk . gna

Author: jtn
Date: Fri Nov  4 01:00:22 2016
New Revision: 34376

URL: http://svn.gna.org/viewcvs/freeciv?rev=34376=rev
Log:
Document the FREECIV_OPT environment variable.

See gna bug #25165.

Modified:
branches/S2_5/doc/man/freeciv-client.6.in

Modified: branches/S2_5/doc/man/freeciv-client.6.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/man/freeciv-client.6.in?rev=34376=34375=34376=diff
==
--- branches/S2_5/doc/man/freeciv-client.6.in   (original)
+++ branches/S2_5/doc/man/freeciv-client.6.in   Fri Nov  4 01:00:22 2016
@@ -9,7 +9,7 @@
 .\"   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 .\"   GNU General Public License for more details.
 .\"
-.TH FREECIV 6 "June 25th 2016"
+.TH FREECIV 6 "November 2nd 2016"
 .SH NAME
 freeciv-gtk2, freeciv-gtk3, freeciv-sdl, freeciv-qt, freeciv-xaw \
 \- The clients for the Freeciv game
@@ -324,6 +324,10 @@
 of Freeciv. The precise search path depends on the type of file being
 searched for.
 .TP
+.BI FREECIV_OPT
+Specifies a file to contain local settings, instead of
+~/.freeciv-client-rc-\fI[version-number]\fP.
+.TP
 .BI HOME
 Specifies the user's home directory.
 .TP


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

[Freeciv-commits] r34373 - in /branches/S2_6: client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-gtk-3.22/ common/ server/

2016-11-03 Thread 0jacobnk . gna

Author: jtn
Date: Fri Nov  4 00:51:26 2016
New Revision: 34373

URL: http://svn.gna.org/viewcvs/freeciv?rev=34373=rev
Log:
Prevent untargeted revolution for the RANDQUICK revolentype, the same as
QUICKENING.

See gna bug #25256.

Modified:
branches/S2_6/client/gui-gtk-2.0/menu.c
branches/S2_6/client/gui-gtk-3.0/menu.c
branches/S2_6/client/gui-gtk-3.22/menu.c
branches/S2_6/common/government.c
branches/S2_6/common/government.h
branches/S2_6/server/plrhand.c

Modified: branches/S2_6/client/gui-gtk-2.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/menu.c?rev=34373=34372=34373=diff
==
--- branches/S2_6/client/gui-gtk-2.0/menu.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/menu.c Fri Nov  4 00:51:26 2016
@@ -2155,7 +2155,7 @@
   } else {
 /* Revolution without target government */
 gtk_widget_set_sensitive(GTK_WIDGET(iter->data),
- game.info.revolentype != REVOLEN_QUICKENING);
+ untargeted_revolution_allowed());
   }
 }
 g_list_free(list);

Modified: branches/S2_6/client/gui-gtk-3.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/menu.c?rev=34373=34372=34373=diff
==
--- branches/S2_6/client/gui-gtk-3.0/menu.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/menu.c Fri Nov  4 00:51:26 2016
@@ -2143,7 +2143,7 @@
   } else {
 /* Revolution without target government */
 gtk_widget_set_sensitive(GTK_WIDGET(iter->data),
- game.info.revolentype != REVOLEN_QUICKENING);
+ untargeted_revolution_allowed());
   }
 }
 g_list_free(list);

Modified: branches/S2_6/client/gui-gtk-3.22/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/menu.c?rev=34373=34372=34373=diff
==
--- branches/S2_6/client/gui-gtk-3.22/menu.c(original)
+++ branches/S2_6/client/gui-gtk-3.22/menu.cFri Nov  4 00:51:26 2016
@@ -2150,7 +2150,7 @@
   } else {
 /* Revolution without target government */
 gtk_widget_set_sensitive(GTK_WIDGET(iter->data),
- game.info.revolentype != REVOLEN_QUICKENING);
+ untargeted_revolution_allowed());
   }
 }
 g_list_free(list);

Modified: branches/S2_6/common/government.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/government.c?rev=34373=34372=34373=diff
==
--- branches/S2_6/common/government.c   (original)
+++ branches/S2_6/common/government.c   Fri Nov  4 00:51:26 2016
@@ -546,3 +546,18 @@
   governments = NULL;
   game.control.government_count = 0;
 }
+
+/
+  Is it possible to start a revolution without specifying the target
+  government in the current game?
+/
+bool untargeted_revolution_allowed(void)
+{
+  if (game.info.revolentype == REVOLEN_QUICKENING
+  || game.info.revolentype == REVOLEN_RANDQUICK) {
+/* We need to know the target government at the onset of the revolution
+ * in order to know how long anarchy will last. */
+return FALSE;
+  }
+  return TRUE;
+}

Modified: branches/S2_6/common/government.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/government.h?rev=34373=34372=34373=diff
==
--- branches/S2_6/common/government.h   (original)
+++ branches/S2_6/common/government.h   Fri Nov  4 00:51:26 2016
@@ -123,4 +123,6 @@
 }
 #endif /* __cplusplus */
 
+bool untargeted_revolution_allowed(void);
+
 #endif  /* FC__GOVERNMENT_H */

Modified: branches/S2_6/server/plrhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/plrhand.c?rev=34373=34372=34373=diff
==
--- branches/S2_6/server/plrhand.c  (original)
+++ branches/S2_6/server/plrhand.c  Fri Nov  4 00:51:26 2016
@@ -393,6 +393,14 @@
 {
   int turns;
 
+  if (!untargeted_revolution_allowed()
+  && gov == game.government_during_revolution) {
+/* Targetless revolution not acceptable */
+notify_player(plr, NULL, E_REVOLT_DONE, ftc_server,
+  _("You can't revolt without selecting target government."));
+return -1;
+  }
+
   turns = GAME_DEFAULT_REVOLUTION_LENGTH; /* To avoid compiler warning */
   switch (game.info.revolentype) {
   case REVOLEN_FIXED:
@@ -403,12 +411,6 @@
 break;
   case REVOLEN_QUICKENING:
   case REVOLEN_RANDQUICK:
-

[Freeciv-commits] r34374 - /branches/S2_6/server/cityturn.c

2016-11-03 Thread 0jacobnk . gna

Author: jtn
Date: Fri Nov  4 00:51:29 2016
New Revision: 34374

URL: http://svn.gna.org/viewcvs/freeciv?rev=34374=rev
Log:
Warn the turn before a city in disorder provokes a national revolution.

See gna patch #7920.

Modified:
branches/S2_6/server/cityturn.c

Modified: branches/S2_6/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityturn.c?rev=34374=34373=34374=diff
==
--- branches/S2_6/server/cityturn.c (original)
+++ branches/S2_6/server/cityturn.c Fri Nov  4 00:51:29 2016
@@ -2997,16 +2997,29 @@
   }
 }
 
+revolution_turns = get_city_bonus(pcity, EFT_REVOLUTION_UNHAPPINESS);
 if (city_unhappy(pcity)) {
+  const char *revomsg;
+
   pcity->anarchy++;
+  if (pcity->anarchy == revolution_turns) {
+/* Revolution next turn if not dealt with */
+/* TRANS: preserve leading space; this string will be appended to
+ * another sentence */
+revomsg = _(" Unrest threatens to spread beyond the city.");
+  } else {
+revomsg = "";
+  }
   if (pcity->anarchy == 1) {
 notify_player(pplayer, city_tile(pcity), E_CITY_DISORDER, ftc_server,
-  _("Civil disorder in %s."),
-  city_link(pcity));
+  /* TRANS: second %s is an optional extra sentence */
+  _("Civil disorder in %s.%s"),
+  city_link(pcity), revomsg);
   } else {
 notify_player(pplayer, city_tile(pcity), E_CITY_DISORDER, ftc_server,
-  _("CIVIL DISORDER CONTINUES in %s."),
-  city_link(pcity));
+  /* TRANS: second %s is an optional extra sentence */
+  _("CIVIL DISORDER CONTINUES in %s.%s"),
+  city_link(pcity), revomsg);
   }
 } else {
   if (pcity->anarchy != 0) {
@@ -3020,7 +3033,6 @@
 
 send_city_info(NULL, pcity);
 
-revolution_turns = get_city_bonus(pcity, EFT_REVOLUTION_UNHAPPINESS);
 if (revolution_turns > 0 && pcity->anarchy > revolution_turns) {
   notify_player(pplayer, city_tile(pcity), E_ANARCHY, ftc_server,
 _("The people have overthrown your %s, "


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

[Freeciv-commits] r34372 - /branches/S2_6/doc/man/freeciv-client.6.in

2016-11-03 Thread 0jacobnk . gna

Author: jtn
Date: Fri Nov  4 00:51:22 2016
New Revision: 34372

URL: http://svn.gna.org/viewcvs/freeciv?rev=34372=rev
Log:
Document the FREECIV_OPT environment variable.

See gna bug #25165.

Modified:
branches/S2_6/doc/man/freeciv-client.6.in

Modified: branches/S2_6/doc/man/freeciv-client.6.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/man/freeciv-client.6.in?rev=34372=34371=34372=diff
==
--- branches/S2_6/doc/man/freeciv-client.6.in   (original)
+++ branches/S2_6/doc/man/freeciv-client.6.in   Fri Nov  4 00:51:22 2016
@@ -344,6 +344,10 @@
 of Freeciv. The precise search path depends on the type of file being
 searched for.
 .TP
+.BI FREECIV_OPT
+Specifies a file to contain local settings, instead of
+~/.freeciv/freeciv-client-rc-\fI[version-number]\fP.
+.TP
 .BI HOME
 Specifies the user's home directory.
 .TP


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

[Freeciv-commits] r34375 - /branches/S2_6/server/settings.c

2016-11-03 Thread 0jacobnk . gna

Author: jtn
Date: Fri Nov  4 00:51:32 2016
New Revision: 34375

URL: http://svn.gna.org/viewcvs/freeciv?rev=34375=rev
Log:
Explain the 'quickening' revolentypes.

See gna patch #7921.

Modified:
branches/S2_6/server/settings.c

Modified: branches/S2_6/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/settings.c?rev=34375=34374=34375=diff
==
--- branches/S2_6/server/settings.c (original)
+++ branches/S2_6/server/settings.c Fri Nov  4 00:51:32 2016
@@ -2172,7 +2172,10 @@
N_("Way to determine revolution length"),
N_("Which method is used in determining how long period of anarchy "
   "lasts when changing government. The actual value is set with "
-  "'revolen' setting."),
+  "'revolen' setting. The 'quickening' methods depend on how "
+  "many times any player has changed to this type of government "
+  "before, so it becomes easier to establish a new system of "
+  "government if it has been done before."),
NULL, NULL, NULL, revolentype_name, GAME_DEFAULT_REVOLENTYPE)
 
   GEN_INT("revolen", game.server.revolution_length,


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

[Freeciv-commits] r34370 - /trunk/server/settings.c

2016-11-03 Thread 0jacobnk . gna

Author: jtn
Date: Fri Nov  4 00:40:24 2016
New Revision: 34370

URL: http://svn.gna.org/viewcvs/freeciv?rev=34370=rev
Log:
Explain the 'quickening' revolentypes.

See gna patch #7921.

Modified:
trunk/server/settings.c

Modified: trunk/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/settings.c?rev=34370=34369=34370=diff
==
--- trunk/server/settings.c (original)
+++ trunk/server/settings.c Fri Nov  4 00:40:24 2016
@@ -2263,7 +2263,10 @@
N_("Way to determine revolution length"),
N_("Which method is used in determining how long period of anarchy "
   "lasts when changing government. The actual value is set with "
-  "'revolen' setting."),
+  "'revolen' setting. The 'quickening' methods depend on how "
+  "many times any player has changed to this type of government "
+  "before, so it becomes easier to establish a new system of "
+  "government if it has been done before."),
NULL, NULL, NULL, revolentype_name, GAME_DEFAULT_REVOLENTYPE)
 
   GEN_INT("revolen", game.server.revolution_length,


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

[Freeciv-commits] r34369 - /trunk/server/cityturn.c

2016-11-03 Thread 0jacobnk . gna

Author: jtn
Date: Fri Nov  4 00:40:20 2016
New Revision: 34369

URL: http://svn.gna.org/viewcvs/freeciv?rev=34369=rev
Log:
Warn the turn before a city in disorder provokes a national revolution.

See gna patch #7920.

Modified:
trunk/server/cityturn.c

Modified: trunk/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/cityturn.c?rev=34369=34368=34369=diff
==
--- trunk/server/cityturn.c (original)
+++ trunk/server/cityturn.c Fri Nov  4 00:40:20 2016
@@ -3200,16 +3200,29 @@
   }
 }
 
+revolution_turns = get_city_bonus(pcity, EFT_REVOLUTION_UNHAPPINESS);
 if (city_unhappy(pcity)) {
+  const char *revomsg;
+
   pcity->anarchy++;
+  if (pcity->anarchy == revolution_turns) {
+/* Revolution next turn if not dealt with */
+/* TRANS: preserve leading space; this string will be appended to
+ * another sentence */
+revomsg = _(" Unrest threatens to spread beyond the city.");
+  } else {
+revomsg = "";
+  }
   if (pcity->anarchy == 1) {
 notify_player(pplayer, city_tile(pcity), E_CITY_DISORDER, ftc_server,
-  _("Civil disorder in %s."),
-  city_link(pcity));
+  /* TRANS: second %s is an optional extra sentence */
+  _("Civil disorder in %s.%s"),
+  city_link(pcity), revomsg);
   } else {
 notify_player(pplayer, city_tile(pcity), E_CITY_DISORDER, ftc_server,
-  _("CIVIL DISORDER CONTINUES in %s."),
-  city_link(pcity));
+  /* TRANS: second %s is an optional extra sentence */
+  _("CIVIL DISORDER CONTINUES in %s.%s"),
+  city_link(pcity), revomsg);
   }
 } else {
   if (pcity->anarchy != 0) {
@@ -3223,7 +3236,6 @@
 
 send_city_info(NULL, pcity);
 
-revolution_turns = get_city_bonus(pcity, EFT_REVOLUTION_UNHAPPINESS);
 if (revolution_turns > 0 && pcity->anarchy > revolution_turns) {
   notify_player(pplayer, city_tile(pcity), E_ANARCHY, ftc_server,
 _("The people have overthrown your %s, "


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

[Freeciv-commits] r34367 - /trunk/doc/man/freeciv-client.6.in

2016-11-03 Thread 0jacobnk . gna

Author: jtn
Date: Fri Nov  4 00:40:13 2016
New Revision: 34367

URL: http://svn.gna.org/viewcvs/freeciv?rev=34367=rev
Log:
Document the FREECIV_OPT environment variable.

See gna bug #25165.

Modified:
trunk/doc/man/freeciv-client.6.in

Modified: trunk/doc/man/freeciv-client.6.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/man/freeciv-client.6.in?rev=34367=34366=34367=diff
==
--- trunk/doc/man/freeciv-client.6.in   (original)
+++ trunk/doc/man/freeciv-client.6.in   Fri Nov  4 00:40:13 2016
@@ -310,6 +310,10 @@
 files; these are always created in ".freeciv/scenarios" in the user's
 home directory.)
 .TP
+.BI FREECIV_OPT
+Specifies a file to contain local settings, instead of
+~/.freeciv/freeciv-client-rc-\fI[version-number]\fP.
+.TP
 .BI HOME
 Specifies the user's home directory.
 .TP


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

[Freeciv-commits] r34368 - in /trunk: client/gui-gtk-2.0/ client/gui-gtk-3.0/ client/gui-gtk-3.22/ common/ server/

2016-11-03 Thread 0jacobnk . gna

Author: jtn
Date: Fri Nov  4 00:40:17 2016
New Revision: 34368

URL: http://svn.gna.org/viewcvs/freeciv?rev=34368=rev
Log:
Prevent untargeted revolution for the RANDQUICK revolentype, the same as
QUICKENING.

See gna bug #25256.

Modified:
trunk/client/gui-gtk-2.0/menu.c
trunk/client/gui-gtk-3.0/menu.c
trunk/client/gui-gtk-3.22/menu.c
trunk/common/government.c
trunk/common/government.h
trunk/server/plrhand.c

Modified: trunk/client/gui-gtk-2.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/menu.c?rev=34368=34367=34368=diff
==
--- trunk/client/gui-gtk-2.0/menu.c (original)
+++ trunk/client/gui-gtk-2.0/menu.c Fri Nov  4 00:40:17 2016
@@ -2167,7 +2167,7 @@
   } else {
 /* Revolution without target government */
 gtk_widget_set_sensitive(GTK_WIDGET(iter->data),
- game.info.revolentype != REVOLEN_QUICKENING);
+ untargeted_revolution_allowed());
   }
 }
 g_list_free(list);

Modified: trunk/client/gui-gtk-3.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/menu.c?rev=34368=34367=34368=diff
==
--- trunk/client/gui-gtk-3.0/menu.c (original)
+++ trunk/client/gui-gtk-3.0/menu.c Fri Nov  4 00:40:17 2016
@@ -2183,7 +2183,7 @@
   } else {
 /* Revolution without target government */
 gtk_widget_set_sensitive(GTK_WIDGET(iter->data),
- game.info.revolentype != REVOLEN_QUICKENING);
+ untargeted_revolution_allowed());
   }
 }
 g_list_free(list);

Modified: trunk/client/gui-gtk-3.22/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/menu.c?rev=34368=34367=34368=diff
==
--- trunk/client/gui-gtk-3.22/menu.c(original)
+++ trunk/client/gui-gtk-3.22/menu.cFri Nov  4 00:40:17 2016
@@ -2182,7 +2182,7 @@
   } else {
 /* Revolution without target government */
 gtk_widget_set_sensitive(GTK_WIDGET(iter->data),
- game.info.revolentype != REVOLEN_QUICKENING);
+ untargeted_revolution_allowed());
   }
 }
 g_list_free(list);

Modified: trunk/common/government.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/government.c?rev=34368=34367=34368=diff
==
--- trunk/common/government.c   (original)
+++ trunk/common/government.c   Fri Nov  4 00:40:17 2016
@@ -547,3 +547,18 @@
   governments = NULL;
   game.control.government_count = 0;
 }
+
+/
+  Is it possible to start a revolution without specifying the target
+  government in the current game?
+/
+bool untargeted_revolution_allowed(void)
+{
+  if (game.info.revolentype == REVOLEN_QUICKENING
+  || game.info.revolentype == REVOLEN_RANDQUICK) {
+/* We need to know the target government at the onset of the revolution
+ * in order to know how long anarchy will last. */
+return FALSE;
+  }
+  return TRUE;
+}

Modified: trunk/common/government.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/government.h?rev=34368=34367=34368=diff
==
--- trunk/common/government.h   (original)
+++ trunk/common/government.h   Fri Nov  4 00:40:17 2016
@@ -132,4 +132,6 @@
 }
 #endif /* __cplusplus */
 
+bool untargeted_revolution_allowed(void);
+
 #endif  /* FC__GOVERNMENT_H */

Modified: trunk/server/plrhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/plrhand.c?rev=34368=34367=34368=diff
==
--- trunk/server/plrhand.c  (original)
+++ trunk/server/plrhand.c  Fri Nov  4 00:40:17 2016
@@ -394,6 +394,14 @@
 {
   int turns;
 
+  if (!untargeted_revolution_allowed()
+  && gov == game.government_during_revolution) {
+/* Targetless revolution not acceptable */
+notify_player(plr, NULL, E_REVOLT_DONE, ftc_server,
+  _("You can't revolt without selecting target government."));
+return -1;
+  }
+
   turns = GAME_DEFAULT_REVOLUTION_LENGTH; /* To avoid compiler warning */
   switch (game.info.revolentype) {
   case REVOLEN_FIXED:
@@ -404,12 +412,6 @@
 break;
   case REVOLEN_QUICKENING:
   case REVOLEN_RANDQUICK:
-if (gov == game.government_during_revolution) {
-  /* Targetless revolution not acceptable */
-  notify_player(plr, NULL, E_REVOLT_DONE, ftc_server,
-_("You can't revolt without selecting target 
government."));

[Freeciv-commits] r34366 - /trunk/doc/man/freeciv-client.6.in

2016-11-03 Thread 0jacobnk . gna

Author: jtn
Date: Fri Nov  4 00:40:10 2016
New Revision: 34366

URL: http://svn.gna.org/viewcvs/freeciv?rev=34366=rev
Log:
Update freeciv-client man page to refer to ~/.freeciv/freeciv-client-rc* file.

See gna bug #25255.

Modified:
trunk/doc/man/freeciv-client.6.in

Modified: trunk/doc/man/freeciv-client.6.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/man/freeciv-client.6.in?rev=34366=34365=34366=diff
==
--- trunk/doc/man/freeciv-client.6.in   (original)
+++ trunk/doc/man/freeciv-client.6.in   Fri Nov  4 00:40:10 2016
@@ -9,7 +9,7 @@
 .\"   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 .\"   GNU General Public License for more details.
 .\"
-.TH FREECIV 6 "June 25th 2016"
+.TH FREECIV 6 "November 2nd 2016"
 .SH NAME
 freeciv-gtk2, freeciv-gtk3, freeciv-gtk3x, freeciv-sdl2, freeciv-qt \
 \- The clients for the Freeciv game
@@ -233,7 +233,7 @@
 \fIlocalhost\fP.
 .SH FILES
 .TP
-.BI ~/.freeciv-client-rc-\fI[version-number]\fP
+.BI ~/.freeciv/freeciv-client-rc-\fI[version-number]\fP
 This is where your local settings will be stored.
 .TP
 .BI tilespecs


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

[Freeciv-commits] r33986 - /branches/S2_5/common/requirements.c

2016-10-04 Thread 0jacobnk . gna

Author: jtn
Date: Tue Oct  4 11:12:00 2016
New Revision: 33986

URL: http://svn.gna.org/viewcvs/freeciv?rev=33986=rev
Log:
Give more useful diagnostic for invalid requirement type/value in ruleset.

See bug #25137.

Modified:
branches/S2_5/common/requirements.c

Modified: branches/S2_5/common/requirements.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/requirements.c?rev=33986=33985=33986=diff
==
--- branches/S2_5/common/requirements.c (original)
+++ branches/S2_5/common/requirements.c Tue Oct  4 11:12:00 2016
@@ -423,122 +423,128 @@
const char *value)
 {
   struct requirement req;
-  bool invalid = TRUE;
+  bool invalid;
   const char *error = NULL;
 
   req.source = universal_by_rule_name(type, value);
 
-  /* Scan the range string to find the range.  If no range is given a
-   * default fallback is used rather than giving an error. */
-  req.range = req_range_by_name(range, fc_strcasecmp);
-  if (!req_range_is_valid(req.range)) {
+  invalid = !universals_n_is_valid(req.source.kind);
+  if (invalid) {
+error = "bad type or name";
+  } else {
+/* Scan the range string to find the range.  If no range is given a
+ * default fallback is used rather than giving an error. */
+req.range = req_range_by_name(range, fc_strcasecmp);
+if (!req_range_is_valid(req.range)) {
+  switch (req.source.kind) {
+  case VUT_NONE:
+  case VUT_COUNT:
+break;
+  case VUT_IMPROVEMENT:
+  case VUT_SPECIAL:
+  case VUT_TERRAIN:
+  case VUT_TERRFLAG:
+  case VUT_RESOURCE:
+  case VUT_UTYPE:
+  case VUT_UTFLAG:
+  case VUT_UCLASS:
+  case VUT_UCFLAG:
+  case VUT_OTYPE:
+  case VUT_SPECIALIST:
+  case VUT_TERRAINCLASS:
+  case VUT_BASE:
+  case VUT_ROAD:
+  case VUT_TERRAINALTER:
+  case VUT_CITYTILE:
+req.range = REQ_RANGE_LOCAL;
+break;
+  case VUT_MINSIZE:
+  case VUT_NATIONALITY:
+req.range = REQ_RANGE_CITY;
+break;
+  case VUT_GOVERNMENT:
+  case VUT_ADVANCE:
+  case VUT_TECHFLAG:
+  case VUT_NATION:
+  case VUT_AI_LEVEL:
+req.range = REQ_RANGE_PLAYER;
+break;
+  case VUT_MINYEAR:
+req.range = REQ_RANGE_WORLD;
+break;
+  }
+}
+
+req.survives = survives;
+req.negated = negated;
+
+/* These checks match what combinations are supported inside
+ * is_req_active(). However, it's only possible to do basic checks,
+ * not anything that might depend on the rest of the ruleset which
+ * might not have been lodaed yet. */
 switch (req.source.kind) {
-case VUT_NONE:
-case VUT_COUNT:
+case VUT_TERRAIN:
+case VUT_SPECIAL:
+case VUT_RESOURCE:
+case VUT_TERRAINCLASS:
+case VUT_TERRFLAG:
+case VUT_BASE:
+case VUT_ROAD:
+  invalid = (req.range != REQ_RANGE_LOCAL
+ && req.range != REQ_RANGE_CADJACENT
+ && req.range != REQ_RANGE_ADJACENT
+ && req.range != REQ_RANGE_CITY);
   break;
-case VUT_IMPROVEMENT:
-case VUT_SPECIAL:
-case VUT_TERRAIN:
-case VUT_TERRFLAG:
-case VUT_RESOURCE:
+case VUT_ADVANCE:
+case VUT_TECHFLAG:
+  invalid = (req.range < REQ_RANGE_PLAYER);
+  break;
+case VUT_GOVERNMENT:
+case VUT_AI_LEVEL:
+  invalid = (req.range != REQ_RANGE_PLAYER);
+  break;
+case VUT_MINSIZE:
+case VUT_NATIONALITY:
+  invalid = (req.range != REQ_RANGE_CITY);
+  break;
+case VUT_NATION:
+  invalid = (req.range != REQ_RANGE_PLAYER
+ && req.range != REQ_RANGE_WORLD);
+  break;
 case VUT_UTYPE:
 case VUT_UTFLAG:
 case VUT_UCLASS:
 case VUT_UCFLAG:
 case VUT_OTYPE:
 case VUT_SPECIALIST:
-case VUT_TERRAINCLASS:
-case VUT_BASE:
-case VUT_ROAD:
-case VUT_TERRAINALTER:
+case VUT_TERRAINALTER: /* XXX could in principle support C/ADJACENT */
+  invalid = (req.range != REQ_RANGE_LOCAL);
+  break;
 case VUT_CITYTILE:
-  req.range = REQ_RANGE_LOCAL;
-  break;
-case VUT_MINSIZE:
-case VUT_NATIONALITY:
-  req.range = REQ_RANGE_CITY;
-  break;
-case VUT_GOVERNMENT:
-case VUT_ADVANCE:
-case VUT_TECHFLAG:
-case VUT_NATION:
-case VUT_AI_LEVEL:
-  req.range = REQ_RANGE_PLAYER;
+  invalid = (req.range != REQ_RANGE_LOCAL
+ && req.range != REQ_RANGE_CADJACENT
+ && req.range != REQ_RANGE_ADJACENT);
   break;
 case VUT_MINYEAR:
-  req.range = REQ_RANGE_WORLD;
+  invalid = (req.range != REQ_RANGE_WORLD);
   break;
-}
-  }
-
-  req.survives = survives;
-  req.negated = negated;
-
-  /* These checks match what combinations are supported inside
-   * is_req_active(). However, it's only possible to do basic checks,
-   * not anything that might depend on the rest of the ruleset

[Freeciv-commits] r33985 - /branches/S2_6/common/requirements.c

2016-10-04 Thread 0jacobnk . gna

Author: jtn
Date: Tue Oct  4 11:11:25 2016
New Revision: 33985

URL: http://svn.gna.org/viewcvs/freeciv?rev=33985=rev
Log:
Give more useful diagnostic for invalid requirement type/value in ruleset.

See bug #25137.

Modified:
branches/S2_6/common/requirements.c

Modified: branches/S2_6/common/requirements.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/requirements.c?rev=33985=33984=33985=diff
==
--- branches/S2_6/common/requirements.c (original)
+++ branches/S2_6/common/requirements.c Tue Oct  4 11:11:25 2016
@@ -615,24 +615,134 @@
const char *value)
 {
   struct requirement req;
-  bool invalid = TRUE;
+  bool invalid;
   const char *error = NULL;
 
   req.source = universal_by_rule_name(type, value);
 
-  /* Scan the range string to find the range.  If no range is given a
-   * default fallback is used rather than giving an error. */
-  req.range = req_range_by_name(range, fc_strcasecmp);
-  if (!req_range_is_valid(req.range)) {
+  invalid = !universals_n_is_valid(req.source.kind);
+  if (invalid) {
+error = "bad type or name";
+  } else {
+/* Scan the range string to find the range.  If no range is given a
+ * default fallback is used rather than giving an error. */
+req.range = req_range_by_name(range, fc_strcasecmp);
+if (!req_range_is_valid(req.range)) {
+  switch (req.source.kind) {
+  case VUT_NONE:
+  case VUT_COUNT:
+break;
+  case VUT_IMPROVEMENT:
+  case VUT_EXTRA:
+  case VUT_TERRAIN:
+  case VUT_TERRFLAG:
+  case VUT_RESOURCE:
+  case VUT_UTYPE:
+  case VUT_UTFLAG:
+  case VUT_UCLASS:
+  case VUT_UCFLAG:
+  case VUT_MINVETERAN:
+  case VUT_UNITSTATE:
+  case VUT_MINMOVES:
+  case VUT_MINHP:
+  case VUT_AGE:
+  case VUT_OTYPE:
+  case VUT_SPECIALIST:
+  case VUT_TERRAINCLASS:
+  case VUT_BASEFLAG:
+  case VUT_ROADFLAG:
+  case VUT_EXTRAFLAG:
+  case VUT_TERRAINALTER:
+  case VUT_CITYTILE:
+  case VUT_MAXTILEUNITS:
+req.range = REQ_RANGE_LOCAL;
+break;
+  case VUT_MINSIZE:
+  case VUT_MINCULTURE:
+  case VUT_NATIONALITY:
+req.range = REQ_RANGE_CITY;
+break;
+  case VUT_GOVERNMENT:
+  case VUT_ACHIEVEMENT:
+  case VUT_STYLE:
+  case VUT_ADVANCE:
+  case VUT_TECHFLAG:
+  case VUT_NATION:
+  case VUT_NATIONGROUP:
+  case VUT_DIPLREL:
+  case VUT_AI_LEVEL:
+req.range = REQ_RANGE_PLAYER;
+break;
+  case VUT_MINYEAR:
+  case VUT_TOPO:
+req.range = REQ_RANGE_WORLD;
+break;
+  }
+}
+
+req.survives = survives;
+req.present = present;
+req.quiet = quiet;
+
+/* These checks match what combinations are supported inside
+ * is_req_active(). However, it's only possible to do basic checks,
+ * not anything that might depend on the rest of the ruleset which
+ * might not have been lodaed yet. */
 switch (req.source.kind) {
-case VUT_NONE:
-case VUT_COUNT:
+case VUT_TERRAIN:
+case VUT_EXTRA:
+case VUT_RESOURCE:
+case VUT_TERRAINCLASS:
+case VUT_TERRFLAG:
+case VUT_BASEFLAG:
+case VUT_ROADFLAG:
+case VUT_EXTRAFLAG:
+  invalid = (req.range != REQ_RANGE_LOCAL
+ && req.range != REQ_RANGE_CADJACENT
+ && req.range != REQ_RANGE_ADJACENT
+ && req.range != REQ_RANGE_CITY
+ && req.range != REQ_RANGE_TRADEROUTE);
   break;
-case VUT_IMPROVEMENT:
-case VUT_EXTRA:
-case VUT_TERRAIN:
-case VUT_TERRFLAG:
-case VUT_RESOURCE:
+case VUT_ADVANCE:
+case VUT_TECHFLAG:
+case VUT_ACHIEVEMENT:
+  invalid = (req.range < REQ_RANGE_PLAYER);
+  break;
+case VUT_GOVERNMENT:
+case VUT_AI_LEVEL:
+case VUT_STYLE:
+  invalid = (req.range != REQ_RANGE_PLAYER);
+  break;
+case VUT_MINSIZE:
+case VUT_NATIONALITY:
+  invalid = (req.range != REQ_RANGE_CITY
+ && req.range != REQ_RANGE_TRADEROUTE);
+  break;
+case VUT_MINCULTURE:
+  invalid = (req.range != REQ_RANGE_CITY
+ && req.range != REQ_RANGE_TRADEROUTE
+ && req.range != REQ_RANGE_PLAYER
+ && req.range != REQ_RANGE_TEAM
+ && req.range != REQ_RANGE_ALLIANCE
+ && req.range != REQ_RANGE_WORLD);
+  break;
+case VUT_DIPLREL:
+  invalid = (req.range != REQ_RANGE_LOCAL
+ && req.range != REQ_RANGE_PLAYER
+ && req.range != REQ_RANGE_TEAM
+ && req.range != REQ_RANGE_ALLIANCE
+ && req.range != REQ_RANGE_WORLD)
+/* Non local foreign makes no sense. */
+|| (req.source.value.diplrel == DRO_FOREIGN
+&& req.range != REQ_RANGE_LOCAL);
+  break;
+case VUT_NATION:
+case

[Freeciv-commits] r33984 - in /trunk: ai/default/ common/ doc/ server/ tools/ruledit/

2016-10-04 Thread 0jacobnk . gna

Author: jtn
Date: Tue Oct  4 11:06:35 2016
New Revision: 33984

URL: http://svn.gna.org/viewcvs/freeciv?rev=33984=rev
Log:
Add MinCalFrag requirement, matching on calendar fragments.

See patch #7751.

Modified:
trunk/ai/default/daieffects.c
trunk/common/calendar.c
trunk/common/calendar.h
trunk/common/fc_types.h
trunk/common/reqtext.c
trunk/common/requirements.c
trunk/doc/README.effects
trunk/server/cityturn.c
trunk/server/rssanity.c
trunk/tools/ruledit/univ_value.c

Modified: trunk/ai/default/daieffects.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/daieffects.c?rev=33984=33983=33984=diff
==
--- trunk/ai/default/daieffects.c   (original)
+++ trunk/ai/default/daieffects.c   Tue Oct  4 11:06:35 2016
@@ -738,6 +738,7 @@
   case VUT_MINHP:
   case VUT_ACTION:
   case VUT_GOOD:
+  case VUT_MINCALFRAG:
   case VUT_COUNT:
 /* No sensible implementation possible with data available. */
 break;

Modified: trunk/common/calendar.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/calendar.c?rev=33984=33983=33984=diff
==
--- trunk/common/calendar.c (original)
+++ trunk/common/calendar.c Tue Oct  4 11:06:35 2016
@@ -95,6 +95,25 @@
 
 /
   Produce a statically allocated textual representation of the given
+  calendar fragment.
+/
+const char *textcalfrag(int frag)
+{
+  static char buf[MAX_LEN_NAME];
+
+  fc_assert_ret_val(game.calendar.calendar_fragments > 0, "");
+  if (game.calendar.calendar_fragment_name[frag][0] != '\0') {
+fc_snprintf(buf, sizeof(buf), "%s",
+_(game.calendar.calendar_fragment_name[frag]));
+  } else {
+/* Human readable fragment count starts from 1, not 0 */
+fc_snprintf(buf, sizeof(buf), "%d", frag + 1);
+  }
+  return buf;
+}
+
+/
+  Produce a statically allocated textual representation of the given
   year.
 /
 const char *textyear(int year)
@@ -123,15 +142,8 @@
   if (game.calendar.calendar_fragments) {
 static char buffer[128];
 
-if (game.calendar.calendar_fragment_name[game.info.fragment_count][0] != 
'\0') {
-  fc_snprintf(buffer, sizeof(buffer), "%s/%s", textyear(game.info.year),
-  
_(game.calendar.calendar_fragment_name[game.info.fragment_count]));
-} else {
-  /* Human readable fragment count starts from 1, not 0 */
-  fc_snprintf(buffer, sizeof(buffer), "%s/%d", textyear(game.info.year),
-  game.info.fragment_count + 1);
-}
-
+fc_snprintf(buffer, sizeof(buffer), "%s/%s", textyear(game.info.year),
+textcalfrag(game.info.fragment_count));
 return buffer;
   } else {
 return textyear(game.info.year);

Modified: trunk/common/calendar.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/calendar.h?rev=33984=33983=33984=diff
==
--- trunk/common/calendar.h (original)
+++ trunk/common/calendar.h Tue Oct  4 11:06:35 2016
@@ -20,6 +20,7 @@
 int game_next_year(int);
 void game_advance_year(void);
 
+const char *textcalfrag(int frag);
 const char *textyear(int year);
 const char *calendar_text(void);
 

Modified: trunk/common/fc_types.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/fc_types.h?rev=33984=33983=33984=diff
==
--- trunk/common/fc_types.h (original)
+++ trunk/common/fc_types.h Tue Oct  4 11:06:35 2016
@@ -377,6 +377,7 @@
   int minsize;
   int minculture;
   int minyear;
+  int mincalfrag;
   Output_type_id outputtype;
   int terrainclass;/* enum terrain_class */
   int terrainalter; /* enum terrain_alteration */
@@ -491,6 +492,8 @@
 #define SPECENUM_VALUE39NAME "MinTechs"
 #define SPECENUM_VALUE40 VUT_EXTRAFLAG
 #define SPECENUM_VALUE40NAME "ExtraFlag"
+#define SPECENUM_VALUE41 VUT_MINCALFRAG
+#define SPECENUM_VALUE41NAME "MinCalFrag"
 /* Keep this last. */
 #define SPECENUM_COUNT VUT_COUNT
 #include "specenum_gen.h"

Modified: trunk/common/reqtext.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/reqtext.c?rev=33984=33983=33984=diff
==
--- trunk/common/reqtext.c  (original)
+++ trunk/common/reqtext.c  Tue Oct  4 11:06:35 2016
@@ -2277,6 +2277,25 @@
 }
 return TRUE;
 
+  case VUT_MINCALFRAG:
+if (preq->range != REQ_RANGE_WORLD) {
+  break;
+}
+if (preq->present) {
+  cat_snprintf(buf, bufsz,
+

[Freeciv-commits] r33983 - /trunk/common/requirements.c

2016-10-04 Thread 0jacobnk . gna

Author: jtn
Date: Tue Oct  4 11:06:30 2016
New Revision: 33983

URL: http://svn.gna.org/viewcvs/freeciv?rev=33983=rev
Log:
Give more useful diagnostic for invalid requirement type/value in ruleset.

See bug #25137.

Modified:
trunk/common/requirements.c

Modified: trunk/common/requirements.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/requirements.c?rev=33983=33982=33983=diff
==
--- trunk/common/requirements.c (original)
+++ trunk/common/requirements.c Tue Oct  4 11:06:30 2016
@@ -657,25 +657,138 @@
const char *value)
 {
   struct requirement req;
-  bool invalid = TRUE;
+  bool invalid;
   const char *error = NULL;
 
   req.source = universal_by_rule_name(type, value);
 
-  /* Scan the range string to find the range.  If no range is given a
-   * default fallback is used rather than giving an error. */
-  req.range = req_range_by_name(range, fc_strcasecmp);
-  if (!req_range_is_valid(req.range)) {
+  invalid = !universals_n_is_valid(req.source.kind);
+  if (invalid) {
+error = "bad type or name";
+  } else {
+/* Scan the range string to find the range.  If no range is given a
+ * default fallback is used rather than giving an error. */
+req.range = req_range_by_name(range, fc_strcasecmp);
+if (!req_range_is_valid(req.range)) {
+  switch (req.source.kind) {
+  case VUT_NONE:
+  case VUT_COUNT:
+break;
+  case VUT_IMPROVEMENT:
+  case VUT_IMPR_GENUS:
+  case VUT_EXTRA:
+  case VUT_GOOD:
+  case VUT_TERRAIN:
+  case VUT_TERRFLAG:
+  case VUT_UTYPE:
+  case VUT_UTFLAG:
+  case VUT_UCLASS:
+  case VUT_UCFLAG:
+  case VUT_MINVETERAN:
+  case VUT_UNITSTATE:
+  case VUT_MINMOVES:
+  case VUT_MINHP:
+  case VUT_AGE:
+  case VUT_ACTION:
+  case VUT_OTYPE:
+  case VUT_SPECIALIST:
+  case VUT_TERRAINCLASS:
+  case VUT_BASEFLAG:
+  case VUT_ROADFLAG:
+  case VUT_EXTRAFLAG:
+  case VUT_TERRAINALTER:
+  case VUT_CITYTILE:
+  case VUT_MAXTILEUNITS:
+req.range = REQ_RANGE_LOCAL;
+break;
+  case VUT_MINSIZE:
+  case VUT_MINCULTURE:
+  case VUT_NATIONALITY:
+req.range = REQ_RANGE_CITY;
+break;
+  case VUT_GOVERNMENT:
+  case VUT_ACHIEVEMENT:
+  case VUT_STYLE:
+  case VUT_ADVANCE:
+  case VUT_TECHFLAG:
+  case VUT_NATION:
+  case VUT_NATIONGROUP:
+  case VUT_DIPLREL:
+  case VUT_AI_LEVEL:
+req.range = REQ_RANGE_PLAYER;
+break;
+  case VUT_MINYEAR:
+  case VUT_TOPO:
+  case VUT_MINTECHS:
+req.range = REQ_RANGE_WORLD;
+break;
+  }
+}
+
+req.survives = survives;
+req.present = present;
+req.quiet = quiet;
+
+/* These checks match what combinations are supported inside
+ * is_req_active(). However, it's only possible to do basic checks,
+ * not anything that might depend on the rest of the ruleset which
+ * might not have been loaded yet. */
 switch (req.source.kind) {
-case VUT_NONE:
-case VUT_COUNT:
+case VUT_TERRAIN:
+case VUT_EXTRA:
+case VUT_TERRAINCLASS:
+case VUT_TERRFLAG:
+case VUT_BASEFLAG:
+case VUT_ROADFLAG:
+case VUT_EXTRAFLAG:
+  invalid = (req.range != REQ_RANGE_LOCAL
+ && req.range != REQ_RANGE_CADJACENT
+ && req.range != REQ_RANGE_ADJACENT
+ && req.range != REQ_RANGE_CITY
+ && req.range != REQ_RANGE_TRADEROUTE);
   break;
-case VUT_IMPROVEMENT:
-case VUT_IMPR_GENUS:
-case VUT_EXTRA:
+case VUT_ADVANCE:
+case VUT_TECHFLAG:
+case VUT_ACHIEVEMENT:
+case VUT_MINTECHS:
+  invalid = (req.range < REQ_RANGE_PLAYER);
+  break;
+case VUT_GOVERNMENT:
+case VUT_AI_LEVEL:
+case VUT_STYLE:
+  invalid = (req.range != REQ_RANGE_PLAYER);
+  break;
+case VUT_MINSIZE:
+case VUT_NATIONALITY:
 case VUT_GOOD:
-case VUT_TERRAIN:
-case VUT_TERRFLAG:
+  invalid = (req.range != REQ_RANGE_CITY
+ && req.range != REQ_RANGE_TRADEROUTE);
+  break;
+case VUT_MINCULTURE:
+  invalid = (req.range != REQ_RANGE_CITY
+ && req.range != REQ_RANGE_TRADEROUTE
+ && req.range != REQ_RANGE_PLAYER
+ && req.range != REQ_RANGE_TEAM
+ && req.range != REQ_RANGE_ALLIANCE
+ && req.range != REQ_RANGE_WORLD);
+  break;
+case VUT_DIPLREL:
+  invalid = (req.range != REQ_RANGE_LOCAL
+ && req.range != REQ_RANGE_PLAYER
+ && req.range != REQ_RANGE_TEAM
+ && req.range != REQ_RANGE_ALLIANCE
+ && req.range != REQ_RANGE_WORLD)
+/* Non local foreign makes no sense. */
+|| (req.source.value.diplrel == DRO_FOREIGN
+&& req.range !=

[Freeciv-commits] r33976 - /branches/S2_6/data/civ2civ3/terrain.ruleset

2016-10-03 Thread 0jacobnk . gna

Author: jtn
Date: Mon Oct  3 12:02:41 2016
New Revision: 33976

URL: http://svn.gna.org/viewcvs/freeciv?rev=33976=rev
Log:
Remove JumpFrom/To from civ2civ3 ruleset.

They have no effect after patch #7137 changed caravan movement rules.

See bug #25136.

Modified:
branches/S2_6/data/civ2civ3/terrain.ruleset

Modified: branches/S2_6/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/terrain.ruleset?rev=33976=33975=33976=diff
==
--- branches/S2_6/data/civ2civ3/terrain.ruleset (original)
+++ branches/S2_6/data/civ2civ3/terrain.ruleset Mon Oct  3 12:02:41 2016
@@ -1762,7 +1762,7 @@
 shield_bonus   = 0
 trade_bonus= 0
 compat_special = "Road"
-flags  = "RequiresBridge", "JumpFrom", "JumpTo"
+flags  = "RequiresBridge"
 
 [road_railroad]
 extra  = "Railroad"
@@ -1793,4 +1793,4 @@
 move_mode  = "Cardinal"
 trade_incr_const = 1
 compat_special = "River"
-flags  = "River", "PreventsOtherRoads", "JumpFrom", "JumpTo"
+flags  = "River", "PreventsOtherRoads"


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

[Freeciv-commits] r33975 - in /branches/S2_6/data/sandbox: README.sandbox game.ruleset

2016-10-03 Thread 0jacobnk . gna

Author: jtn
Date: Mon Oct  3 12:02:37 2016
New Revision: 33975

URL: http://svn.gna.org/viewcvs/freeciv?rev=33975=rev
Log:
sandbox: Allow a city's outer workable tiles to be stolen, but not inner tiles.

See patch #7745.

Modified:
branches/S2_6/data/sandbox/README.sandbox
branches/S2_6/data/sandbox/game.ruleset

Modified: branches/S2_6/data/sandbox/README.sandbox
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/README.sandbox?rev=33975=33974=33975=diff
==
--- branches/S2_6/data/sandbox/README.sandbox   (original)
+++ branches/S2_6/data/sandbox/README.sandbox   Mon Oct  3 12:02:37 2016
@@ -52,3 +52,8 @@
 Custom policy "Personal Freedom":
 You can trade off a science bonus against extra unhappiness from your
 aggressive military units.
+
+Border stealing:
+The workable tiles next to a city are permanently within the city
+owner's borders, once claimed. The outer workable tiles can be stolen
+by a city with greater influence.

Modified: branches/S2_6/data/sandbox/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/game.ruleset?rev=33975=33974=33975=diff
==
--- branches/S2_6/data/sandbox/game.ruleset (original)
+++ branches/S2_6/data/sandbox/game.ruleset Mon Oct  3 12:02:37 2016
@@ -450,7 +450,7 @@
 ; If City_Radius_Sq is variable, so is the set of locked tiles; this is
 ; a squared value, so the radius of the ring of tiles which are workable
 ; but not locked (or vice versa) varies but the area is constant.
-radius_sq_city_permanent = 0
+radius_sq_city_permanent = -3
 
 [research]
 ; Method of calculating technology costs


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

[Freeciv-commits] r33972 - in /branches/S2_6/data/civ2civ3: buildings.ruleset terrain.ruleset

2016-10-03 Thread 0jacobnk . gna

Author: jtn
Date: Mon Oct  3 12:02:26 2016
New Revision: 33972

URL: http://svn.gna.org/viewcvs/freeciv?rev=33972=rev
Log:
civ2civ3: Allow building Lighthouse and Magellan's Expedition next to
Deep Ocean.

See patch #7742.

Modified:
branches/S2_6/data/civ2civ3/buildings.ruleset
branches/S2_6/data/civ2civ3/terrain.ruleset

Modified: branches/S2_6/data/civ2civ3/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/buildings.ruleset?rev=33972=33971=33972=diff
==
--- branches/S2_6/data/civ2civ3/buildings.ruleset   (original)
+++ branches/S2_6/data/civ2civ3/buildings.ruleset   Mon Oct  3 12:02:26 2016
@@ -1682,7 +1682,7 @@
 reqs   =
 { "type", "name", "range"
   "Tech", "Map Making", "Player"
-  "Terrain", "Ocean", "Adjacent"
+  "TerrainFlag", "Sea", "Adjacent"
 }
 graphic= "b.lighthouse"
 graphic_alt= "-"
@@ -1707,7 +1707,7 @@
 reqs   =
 { "type", "name", "range"
   "Tech", "Magnetism", "Player"
-  "Terrain", "Ocean", "Adjacent"
+  "TerrainFlag", "Sea", "Adjacent"
 }
 graphic= "b.magellans_expedition"
 graphic_alt= "-"

Modified: branches/S2_6/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/terrain.ruleset?rev=33972=33971=33972=diff
==
--- branches/S2_6/data/civ2civ3/terrain.ruleset (original)
+++ branches/S2_6/data/civ2civ3/terrain.ruleset Mon Oct  3 12:02:26 2016
@@ -23,7 +23,7 @@
 flags =
   { "name", "helptxt"
 _("Oil"), _("Mine can be upgraded to Oil Well.")
-_("Sea"), _("Allows cities to build Harbors.")
+_("Sea"), _("Allows cities to build Harbors and coastal wonders.")
 _("NoPollution"), _("No Pollution nor Fallout appear here.")
   }
 


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

[Freeciv-commits] r33974 - in /branches/S2_6/data/sandbox: README.sandbox effects.ruleset game.ruleset governments.ruleset units.ruleset

2016-10-03 Thread 0jacobnk . gna

Author: jtn
Date: Mon Oct  3 12:02:34 2016
New Revision: 33974

URL: http://svn.gna.org/viewcvs/freeciv?rev=33974=rev
Log:
Import rules from experimental to sandbox ruleset:
 - Explorers establishing embassies once Writing is known
 - Spies can sabotage units in stacks
 - "Personal Freedom" custom policy

See patch #7744.

Modified:
branches/S2_6/data/sandbox/README.sandbox
branches/S2_6/data/sandbox/effects.ruleset
branches/S2_6/data/sandbox/game.ruleset
branches/S2_6/data/sandbox/governments.ruleset
branches/S2_6/data/sandbox/units.ruleset

Modified: branches/S2_6/data/sandbox/README.sandbox
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/README.sandbox?rev=33974=33973=33974=diff
==
--- branches/S2_6/data/sandbox/README.sandbox   (original)
+++ branches/S2_6/data/sandbox/README.sandbox   Mon Oct  3 12:02:34 2016
@@ -28,9 +28,16 @@
 Sea Units in port:
 Sea Units in cities defend with 1/4 of their usual defense value.
 
+Explorers establishing embassies:
+Explorers can establish embassies once Writing is known. The Explorer
+unit is used up by this.
+
 Establish Embassy from sea:
 Units can establish embassies directly from boats without
 disembarking.
+
+Units can be bribed/sabotaged if not along on their tile:
+Being part of a unit stack won't protect against spy actions.
 
 Merchant movement restrictions:
 Caravans and Freight can only moves on roads and rivers (as in older
@@ -41,3 +48,7 @@
 routes, and can get revenue even when a trade route exists
 ('Enter Marketplace'), as in older versions of civ2civ3; however,
 this latter action really requires a Marketplace building in the city.
+
+Custom policy "Personal Freedom":
+You can trade off a science bonus against extra unhappiness from your
+aggressive military units.

Modified: branches/S2_6/data/sandbox/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/effects.ruleset?rev=33974=33973=33974=diff
==
--- branches/S2_6/data/sandbox/effects.ruleset  (original)
+++ branches/S2_6/data/sandbox/effects.ruleset  Mon Oct  3 12:02:34 2016
@@ -840,6 +840,23 @@
   "Gov", "Democracy", "Player"
 }
 
+[effect_personal_freedom_unit_unhappiness]
+type= "Unhappy_Factor"
+value   = 1
+multiplier = "Personal Freedom"
+reqs   =
+{ "type", "name", "range"
+}
+
+[effect_personal_freedom_science_bonus]
+type= "Output_Bonus_2"
+value   = 10
+multiplier = "Personal Freedom"
+reqs   =
+{ "type", "name", "range"
+  "OutputType", "Science", "Local"
+}
+
 ; Govs with 1 free unit
 [effect_upkeep_free_mil_1]
 type= "Make_Content_Mil"

Modified: branches/S2_6/data/sandbox/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/game.ruleset?rev=33974=33973=33974=diff
==
--- branches/S2_6/data/sandbox/game.ruleset (original)
+++ branches/S2_6/data/sandbox/game.ruleset Mon Oct  3 12:02:34 2016
@@ -292,6 +292,19 @@
   "NationGroup", "Barbarian", "Player", FALSE
 }
 
+[actionenabler_explorer_establish_embassy]
+action   = "Establish Embassy"
+actor_reqs=
+{ "type",   "name", "range"
+  "UnitType", "Explorer", "Local"
+  "Tech", "Writing", "Player"
+  "MinMoveFrags", "1", "Local"
+}
+target_reqs  =
+{ "type",   "name", "range", "present"
+  "NationGroup", "Barbarian", "Player", FALSE
+}
+
 [actionenabler_investigate_city]
 action   = "Investigate City"
 actor_reqs=
@@ -376,7 +389,6 @@
   "CityTile", "Center", "Local", FALSE
   "Gov", "Republic", "Player", FALSE
   "Gov", "Democracy", "Player", FALSE
-  "MaxUnitsOnTile", "1", "Local", TRUE
 }
 
 [actionenabler_sabotage_unit]
@@ -392,7 +404,6 @@
 { "type",   "name", "range", "present"
   "CityTile", "Center", "Local", FALSE
   "MinHitPoints", "2", "Local", TRUE
-  "MaxUnitsOnTile", "1", "Local", TRUE
 }
 
 [actionenabler_traderoute]

Modified: branches/S2_6/data/sandbox/governments.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/governments.ruleset?rev=33974=33973=33974=diff
==
--- branches/S2_6/data/sandbox/governments.ruleset  (original)
+++ branches/S2_6/data/sandbox/governments.ruleset  Mon Oct  3 12:02:34 2016
@@ -394,3 +394,16 @@
 ;   newlines so that xgettext parsing works
 ;
 ; */ <-- avoid gettext warnings
+
+[multiplier_personal_freedom]
+name  = _("Personal Freedom")
+start = 0
+stop  = 5
+step  = 1
+default   = 0
+; /* xgettext:no-c-format */
+helptext  = _("\
+Each step of personal freedom you allow your citizens yields a 10% \
+increase in science output, but makes an additional citizen unhappy \
+for every

[Freeciv-commits] r33973 - /branches/S2_6/data/sandbox/

2016-10-03 Thread 0jacobnk . gna

Author: jtn
Date: Mon Oct  3 12:02:31 2016
New Revision: 33973

URL: http://svn.gna.org/viewcvs/freeciv?rev=33973=rev
Log:
Rebase sandbox ruleset against current 2.6 civ2civ3 ruleset.

See patch #7743.

Modified:
branches/S2_6/data/sandbox/README.sandbox
branches/S2_6/data/sandbox/buildings.ruleset
branches/S2_6/data/sandbox/effects.ruleset
branches/S2_6/data/sandbox/game.ruleset
branches/S2_6/data/sandbox/governments.ruleset
branches/S2_6/data/sandbox/techs.ruleset
branches/S2_6/data/sandbox/terrain.ruleset
branches/S2_6/data/sandbox/units.ruleset

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

Modified: branches/S2_6/data/sandbox/README.sandbox
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/README.sandbox?rev=33973=33972=33973=diff

Modified: branches/S2_6/data/sandbox/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/buildings.ruleset?rev=33973=33972=33973=diff

Modified: branches/S2_6/data/sandbox/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/effects.ruleset?rev=33973=33972=33973=diff

Modified: branches/S2_6/data/sandbox/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/game.ruleset?rev=33973=33972=33973=diff

Modified: branches/S2_6/data/sandbox/governments.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/governments.ruleset?rev=33973=33972=33973=diff

Modified: branches/S2_6/data/sandbox/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/techs.ruleset?rev=33973=33972=33973=diff

Modified: branches/S2_6/data/sandbox/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/terrain.ruleset?rev=33973=33972=33973=diff

Modified: branches/S2_6/data/sandbox/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/units.ruleset?rev=33973=33972=33973=diff


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

[Freeciv-commits] r33971 - in /branches/S2_6/data/civ2civ3: buildings.ruleset effects.ruleset terrain.ruleset

2016-10-03 Thread 0jacobnk . gna

Author: jtn
Date: Mon Oct  3 12:02:23 2016
New Revision: 33971

URL: http://svn.gna.org/viewcvs/freeciv?rev=33971=rev
Log:
Prevent building civ2civ3 Harbour next to Lake, since it cannot improve Lakes.

Also clarify Offshore Platform help wrt Lake after patch #5915.

See bug #25070.

Modified:
branches/S2_6/data/civ2civ3/buildings.ruleset
branches/S2_6/data/civ2civ3/effects.ruleset
branches/S2_6/data/civ2civ3/terrain.ruleset

Modified: branches/S2_6/data/civ2civ3/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/buildings.ruleset?rev=33971=33970=33971=diff
==
--- branches/S2_6/data/civ2civ3/buildings.ruleset   (original)
+++ branches/S2_6/data/civ2civ3/buildings.ruleset   Mon Oct  3 12:02:23 2016
@@ -500,7 +500,7 @@
 reqs   =
 { "type", "name", "range"
   "Tech", "Seafaring", "Player"
-  "TerrainClass", "Oceanic", "Adjacent"
+  "TerrainFlag", "Sea", "Adjacent"
 }
 graphic= "b.harbour"
 graphic_alt= "-"
@@ -514,7 +514,8 @@
 sound_alt  = "b_generic"
 helptext   = _("\
 Gives one extra food resource on all Ocean or Deep Ocean tiles (but \
-not Lakes). The city needs to be coastal to build this improvement.\
+not Lakes). The city needs to be coastal (next to one of these tiles) \
+to build this improvement.\
 ")
 
 [building_hydro_plant]
@@ -725,9 +726,9 @@
 sound  = "b_offshore_platform"
 sound_alt  = "b_generic"
 helptext   = _("\
-Every Ocean tile worked by the city yields one extra shield resource, \
+Every Ocean or Lake tile worked by the city yields one extra shield resource, \
 as well as any Deep Ocean tile containing an oil platform. The city needs \
-to be coastal to build this improvement.\
+to be next to a water tile to build this improvement.\
 "), _("\
 Offshore Platforms also increase the pollution caused by the population \
 of the city.\

Modified: branches/S2_6/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/effects.ruleset?rev=33971=33970=33971=diff
==
--- branches/S2_6/data/civ2civ3/effects.ruleset (original)
+++ branches/S2_6/data/civ2civ3/effects.ruleset Mon Oct  3 12:02:23 2016
@@ -2198,10 +2198,9 @@
 value   = 1
 reqs=
 { "type", "name", "range", "present"
-  "TerrainClass", "Oceanic", "Local", TRUE
+  "TerrainFlag", "Sea", "Local", TRUE
   "Building", "Harbour", "City", TRUE
   "OutputType", "Food", "Local", TRUE
-  "Terrain", "Lake", "Local", FALSE
 }
 
 [effect_hydro_plant]

Modified: branches/S2_6/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/terrain.ruleset?rev=33971=33970=33971=diff
==
--- branches/S2_6/data/civ2civ3/terrain.ruleset (original)
+++ branches/S2_6/data/civ2civ3/terrain.ruleset Mon Oct  3 12:02:23 2016
@@ -23,6 +23,7 @@
 flags =
   { "name", "helptxt"
 _("Oil"), _("Mine can be upgraded to Oil Well.")
+_("Sea"), _("Allows cities to build Harbors.")
 _("NoPollution"), _("No Pollution nor Fallout appear here.")
   }
 
@@ -306,7 +307,7 @@
 cooler_wetter_result = "Glacier"
 cooler_drier_result  = "no"
 native_to= "Sea", "Air", "Missile", "Helicopter", "Trireme"
-flags= "NoCities", "UnsafeCoast", "NoZoc", "NoFortify"
+flags= "NoCities", "UnsafeCoast", "NoZoc", "NoFortify", "Sea"
 property_ocean_depth = 32
 color.r  = 0
 color.g  = 46
@@ -350,7 +351,7 @@
 cooler_wetter_result = "no"
 cooler_drier_result  = "no"
 native_to= "Sea", "Air", "Missile", "Helicopter"
-flags= "NoCities", "NoPollution", "UnsafeCoast", "NoZoc", 
"NoFortify"
+flags= "NoCities", "NoPollution", "UnsafeCoast", "NoZoc", 
"NoFortify", "Sea"
 property_ocean_depth = 87
 color.r  = 0
 color.g  = 33


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

[Freeciv-commits] r33968 - in /trunk/data/sandbox: README.sandbox effects.ruleset game.ruleset governments.ruleset units.ruleset

2016-10-03 Thread 0jacobnk . gna

Author: jtn
Date: Mon Oct  3 12:01:38 2016
New Revision: 33968

URL: http://svn.gna.org/viewcvs/freeciv?rev=33968=rev
Log:
Import rules from experimental to sandbox ruleset:
 - Explorers establishing embassies once Writing is known
 - Spies can sabotage units in stacks
 - "Personal Freedom" custom policy

See patch #7744.

Modified:
trunk/data/sandbox/README.sandbox
trunk/data/sandbox/effects.ruleset
trunk/data/sandbox/game.ruleset
trunk/data/sandbox/governments.ruleset
trunk/data/sandbox/units.ruleset

Modified: trunk/data/sandbox/README.sandbox
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/README.sandbox?rev=33968=33967=33968=diff
==
--- trunk/data/sandbox/README.sandbox   (original)
+++ trunk/data/sandbox/README.sandbox   Mon Oct  3 12:01:38 2016
@@ -82,9 +82,16 @@
 the maximum distance corruption is the same regardless of the size of
 the world.
 
+Explorers establishing embassies:
+Explorers can establish embassies once Writing is known. The Explorer
+unit is used up by this.
+
 Establish Embassy from sea:
 Units can establish embassies directly from boats without
 disembarking.
+
+Units can be bribed/sabotaged if not along on their tile:
+Being part of a unit stack won't protect against spy actions.
 
 Merchant movement restrictions:
 Caravans and Freight can only moves on roads and rivers (as in older
@@ -95,3 +102,7 @@
 routes, and can get revenue even when a trade route exists
 ('Enter Marketplace'), as in older versions of civ2civ3; however,
 this latter action really requires a Marketplace building in the city.
+
+Custom policy "Personal Freedom":
+You can trade off a science bonus against extra unhappiness from your
+aggressive military units.

Modified: trunk/data/sandbox/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/effects.ruleset?rev=33968=33967=33968=diff
==
--- trunk/data/sandbox/effects.ruleset  (original)
+++ trunk/data/sandbox/effects.ruleset  Mon Oct  3 12:01:38 2016
@@ -850,6 +850,23 @@
   "Gov", "Democracy", "Player"
 }
 
+[effect_personal_freedom_unit_unhappiness]
+type= "Unhappy_Factor"
+value   = 1
+multiplier = "Personal Freedom"
+reqs   =
+{ "type", "name", "range"
+}
+
+[effect_personal_freedom_science_bonus]
+type= "Output_Bonus_2"
+value   = 10
+multiplier = "Personal Freedom"
+reqs   =
+{ "type", "name", "range"
+  "OutputType", "Science", "Local"
+}
+
 ; Govs with 1 free unit
 [effect_upkeep_free_mil_1]
 type= "Make_Content_Mil"

Modified: trunk/data/sandbox/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/game.ruleset?rev=33968=33967=33968=diff
==
--- trunk/data/sandbox/game.ruleset (original)
+++ trunk/data/sandbox/game.ruleset Mon Oct  3 12:01:38 2016
@@ -362,6 +362,21 @@
   "NationGroup", "Barbarian", "Player", FALSE
 }
 
+[actionenabler_explorer_establish_embassy]
+action   = "Establish Embassy"
+actor_reqs=
+{ "type",   "name", "range"
+  "UnitType", "Explorer", "Local"
+  "Tech", "Writing", "Player"
+  "UnitState", "OnLivableTile", "Local"
+  "MinMoveFrags", "1", "Local"
+  "DiplRel", "Is foreign", "Local"
+}
+target_reqs  =
+{ "type",   "name", "range", "present"
+  "NationGroup", "Barbarian", "Player", FALSE
+}
+
 [actionenabler_investigate_city]
 action   = "Investigate City"
 actor_reqs=
@@ -465,7 +480,6 @@
   "CityTile", "Center", "Local", FALSE
   "Gov", "Republic", "Player", FALSE
   "Gov", "Democracy", "Player", FALSE
-  "MaxUnitsOnTile", "1", "Local", TRUE
 }
 
 [actionenabler_sabotage_unit]
@@ -481,7 +495,6 @@
 { "type",   "name", "range", "present"
   "CityTile", "Center", "Local", FALSE
   "MinHitPoints", "2", "Local", TRUE
-  "MaxUnitsOnTile", "1", "Local", TRUE
 }
 
 [actionenabler_traderoute]

Modified: trunk/data/sandbox/governments.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/governments.ruleset?rev=33968=33967=33968=diff
==
--- trunk/data/sandbox/governments.ruleset  (original)
+++ trunk/data/sandbox/governments.ruleset  Mon Oct  3 12:01:38 2016
@@ -396,3 +396,16 @@
 ;   newlines so that xgettext parsing works
 ;
 ; */ <-- avoid gettext warnings
+
+[multiplier_personal_freedom]
+name  = _("Personal Freedom")
+start = 0
+stop  = 5
+step  = 1
+default   = 0
+; /* xgettext:no-c-format */
+helptext  = _("\
+Each step of personal freedom you allow your citizens yields a 10% \
+increase in science output, but makes an additional citizen unhappy \
+for every aggressively deployed military unit.\
+")

Modified: trunk/data/sandbox/units.ruleset
URL:

[Freeciv-commits] r33969 - in /trunk/data/sandbox: README.sandbox game.ruleset

2016-10-03 Thread 0jacobnk . gna

Author: jtn
Date: Mon Oct  3 12:01:41 2016
New Revision: 33969

URL: http://svn.gna.org/viewcvs/freeciv?rev=33969=rev
Log:
sandbox: Allow a city's outer workable tiles to be stolen, but not inner tiles.

See patch #7745.

Modified:
trunk/data/sandbox/README.sandbox
trunk/data/sandbox/game.ruleset

Modified: trunk/data/sandbox/README.sandbox
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/README.sandbox?rev=33969=33968=33969=diff
==
--- trunk/data/sandbox/README.sandbox   (original)
+++ trunk/data/sandbox/README.sandbox   Mon Oct  3 12:01:41 2016
@@ -106,3 +106,8 @@
 Custom policy "Personal Freedom":
 You can trade off a science bonus against extra unhappiness from your
 aggressive military units.
+
+Border stealing:
+The workable tiles next to a city are permanently within the city
+owner's borders, once claimed. The outer workable tiles can be stolen
+by a city with greater influence.

Modified: trunk/data/sandbox/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/game.ruleset?rev=33969=33968=33969=diff
==
--- trunk/data/sandbox/game.ruleset (original)
+++ trunk/data/sandbox/game.ruleset Mon Oct  3 12:01:41 2016
@@ -818,7 +818,7 @@
 ; If City_Radius_Sq is variable, so is the set of locked tiles; this is
 ; a squared value, so the radius of the ring of tiles which are workable
 ; but not locked (or vice versa) varies but the area is constant.
-radius_sq_city_permanent = 0
+radius_sq_city_permanent = -3
 
 [research]
 ; Method of calculating technology costs


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

[Freeciv-commits] r33965 - in /trunk/data/civ2civ3: buildings.ruleset effects.ruleset terrain.ruleset

2016-10-03 Thread 0jacobnk . gna

Author: jtn
Date: Mon Oct  3 12:01:26 2016
New Revision: 33965

URL: http://svn.gna.org/viewcvs/freeciv?rev=33965=rev
Log:
Prevent building civ2civ3 Harbour next to Lake, since it cannot improve Lakes.

Also clarify Offshore Platform help wrt Lake after patch #5915.

See bug #25070.

Modified:
trunk/data/civ2civ3/buildings.ruleset
trunk/data/civ2civ3/effects.ruleset
trunk/data/civ2civ3/terrain.ruleset

Modified: trunk/data/civ2civ3/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/buildings.ruleset?rev=33965=33964=33965=diff
==
--- trunk/data/civ2civ3/buildings.ruleset   (original)
+++ trunk/data/civ2civ3/buildings.ruleset   Mon Oct  3 12:01:26 2016
@@ -504,7 +504,7 @@
 reqs   =
 { "type", "name", "range"
   "Tech", "Seafaring", "Player"
-  "TerrainClass", "Oceanic", "Adjacent"
+  "TerrainFlag", "Sea", "Adjacent"
 }
 graphic= "b.harbour"
 graphic_alt= "-"
@@ -518,7 +518,8 @@
 sound_alt  = "b_generic"
 helptext   = _("\
 Gives one extra food resource on all Ocean or Deep Ocean tiles (but \
-not Lakes). The city needs to be coastal to build this improvement.\
+not Lakes). The city needs to be coastal (next to one of these tiles) \
+to build this improvement.\
 ")
 
 [building_hydro_plant]
@@ -729,9 +730,9 @@
 sound  = "b_offshore_platform"
 sound_alt  = "b_generic"
 helptext   = _("\
-Every Ocean tile worked by the city yields one extra shield resource, \
+Every Ocean or Lake tile worked by the city yields one extra shield resource, \
 as well as any Deep Ocean tile containing an oil platform. The city needs \
-to be coastal to build this improvement.\
+to be next to a water tile to build this improvement.\
 "), _("\
 Offshore Platforms also increase the pollution caused by the population \
 of the city.\

Modified: trunk/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=33965=33964=33965=diff
==
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Mon Oct  3 12:01:26 2016
@@ -2207,10 +2207,9 @@
 value   = 1
 reqs=
 { "type", "name", "range", "present"
-  "TerrainClass", "Oceanic", "Local", TRUE
+  "TerrainFlag", "Sea", "Local", TRUE
   "Building", "Harbour", "City", TRUE
   "OutputType", "Food", "Local", TRUE
-  "Terrain", "Lake", "Local", FALSE
 }
 
 [effect_hydro_plant]

Modified: trunk/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/terrain.ruleset?rev=33965=33964=33965=diff
==
--- trunk/data/civ2civ3/terrain.ruleset (original)
+++ trunk/data/civ2civ3/terrain.ruleset Mon Oct  3 12:01:26 2016
@@ -24,6 +24,7 @@
 flags =
   { "name", "helptxt"
 _("Oil"), _("Mine can be upgraded to Oil Well.")
+_("Sea"), _("Allows cities to build Harbors.")
 _("NoPollution"), _("No Pollution nor Fallout appear here.")
   }
 
@@ -319,7 +320,7 @@
 cooler_wetter_result = "Glacier"
 cooler_drier_result  = "no"
 native_to= "Sea", "Air", "Missile", "Helicopter", "Trireme"
-flags= "NoCities", "UnsafeCoast", "NoZoc", "NoFortify"
+flags= "NoCities", "UnsafeCoast", "NoZoc", "NoFortify", "Sea"
 property_ocean_depth = 32
 color.r  = 0
 color.g  = 46
@@ -363,7 +364,7 @@
 cooler_wetter_result = "no"
 cooler_drier_result  = "no"
 native_to= "Sea", "Air", "Missile", "Helicopter"
-flags= "NoCities", "NoPollution", "UnsafeCoast", "NoZoc", 
"NoFortify"
+flags= "NoCities", "NoPollution", "UnsafeCoast", "NoZoc", 
"NoFortify", "Sea"
 property_ocean_depth = 87
 color.r  = 0
 color.g  = 33


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

[Freeciv-commits] r33966 - in /trunk/data/civ2civ3: buildings.ruleset terrain.ruleset

2016-10-03 Thread 0jacobnk . gna

Author: jtn
Date: Mon Oct  3 12:01:31 2016
New Revision: 33966

URL: http://svn.gna.org/viewcvs/freeciv?rev=33966=rev
Log:
civ2civ3: Allow building Lighthouse and Magellan's Expedition next to
Deep Ocean.

See patch #7742.

Modified:
trunk/data/civ2civ3/buildings.ruleset
trunk/data/civ2civ3/terrain.ruleset

Modified: trunk/data/civ2civ3/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/buildings.ruleset?rev=33966=33965=33966=diff
==
--- trunk/data/civ2civ3/buildings.ruleset   (original)
+++ trunk/data/civ2civ3/buildings.ruleset   Mon Oct  3 12:01:31 2016
@@ -1686,7 +1686,7 @@
 reqs   =
 { "type", "name", "range"
   "Tech", "Map Making", "Player"
-  "Terrain", "Ocean", "Adjacent"
+  "TerrainFlag", "Sea", "Adjacent"
 }
 graphic= "b.lighthouse"
 graphic_alt= "-"
@@ -1711,7 +1711,7 @@
 reqs   =
 { "type", "name", "range"
   "Tech", "Magnetism", "Player"
-  "Terrain", "Ocean", "Adjacent"
+  "TerrainFlag", "Sea", "Adjacent"
 }
 graphic= "b.magellans_expedition"
 graphic_alt= "-"

Modified: trunk/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/terrain.ruleset?rev=33966=33965=33966=diff
==
--- trunk/data/civ2civ3/terrain.ruleset (original)
+++ trunk/data/civ2civ3/terrain.ruleset Mon Oct  3 12:01:31 2016
@@ -24,7 +24,7 @@
 flags =
   { "name", "helptxt"
 _("Oil"), _("Mine can be upgraded to Oil Well.")
-_("Sea"), _("Allows cities to build Harbors.")
+_("Sea"), _("Allows cities to build Harbors and coastal wonders.")
 _("NoPollution"), _("No Pollution nor Fallout appear here.")
   }
 


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

[Freeciv-commits] r33938 - /branches/S2_6/client/gui-gtk-3.0/citydlg.c

2016-09-28 Thread 0jacobnk . gna

Author: jtn
Date: Thu Sep 29 01:59:53 2016
New Revision: 33938

URL: http://svn.gna.org/viewcvs/freeciv?rev=33938=rev
Log:
Use transport selection dialog when loading unit from Gtk3 city dialog.

See bug #25122.

Modified:
branches/S2_6/client/gui-gtk-3.0/citydlg.c

Modified: branches/S2_6/client/gui-gtk-3.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/citydlg.c?rev=33938=33937=33938=diff
==
--- branches/S2_6/client/gui-gtk-3.0/citydlg.c  (original)
+++ branches/S2_6/client/gui-gtk-3.0/citydlg.c  Thu Sep 29 01:59:53 2016
@@ -2660,7 +2660,7 @@
 player_unit_by_number(client_player(), (size_t)data);
 
   if (NULL != punit) {
-request_unit_load(punit, NULL, unit_tile(punit));
+request_transport(punit, unit_tile(punit));
   }
 }
 


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

[Freeciv-commits] r33937 - /branches/S2_6/common/road.c

2016-09-28 Thread 0jacobnk . gna

Author: jtn
Date: Thu Sep 29 01:59:50 2016
New Revision: 33937

URL: http://svn.gna.org/viewcvs/freeciv?rev=33937=rev
Log:
When 'first_reqs' are specified for a cardinal road type, only
cardinally adjacent roads can be continued from.

See bug #25121.

Modified:
branches/S2_6/common/road.c

Modified: branches/S2_6/common/road.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/road.c?rev=33937=33936=33937=diff
==
--- branches/S2_6/common/road.c (original)
+++ branches/S2_6/common/road.c Thu Sep 29 01:59:50 2016
@@ -262,12 +262,23 @@
 bool beginning = TRUE;
 
 extra_type_list_iterate(proad->integrators, iroad) {
-  adjc_iterate(ptile, adjc_tile) {
-if (tile_has_extra(adjc_tile, iroad)) {
-  beginning = FALSE;
-  break;
-}
-  } adjc_iterate_end;
+  /* FIXME: mixing cardinal and non-cardinal roads as integrators is
+   * probably not a good idea. */
+  if (is_cardinal_only_road(iroad)) {
+cardinal_adjc_iterate(ptile, adjc_tile) {
+  if (tile_has_extra(adjc_tile, iroad)) {
+beginning = FALSE;
+break;
+  }
+} cardinal_adjc_iterate_end;
+  } else {
+adjc_iterate(ptile, adjc_tile) {
+  if (tile_has_extra(adjc_tile, iroad)) {
+beginning = FALSE;
+break;
+  }
+} adjc_iterate_end;
+  }
 
   if (!beginning) {
 break;


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

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1197 matches

Mail list logo