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

2016-11-19 Thread cazfi74 
Author: cazfi
Date: Sat Nov 19 23:38:28 2016
New Revision: 34581

URL: http://svn.gna.org/viewcvs/freeciv?rev=34581=rev
Log:
Removed base_index()

See patch #7992

Modified:
trunk/client/gui-gtk-2.0/editprop.c
trunk/client/gui-gtk-3.0/editprop.c
trunk/client/gui-gtk-3.22/editprop.c
trunk/common/base.c
trunk/common/base.h
trunk/server/ruleset.c

Modified: trunk/client/gui-gtk-2.0/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/editprop.c?rev=34581=34580=34581=diff
==
--- trunk/client/gui-gtk-2.0/editprop.c (original)
+++ trunk/client/gui-gtk-2.0/editprop.c Sat Nov 19 23:38:28 2016
@@ -1545,7 +1545,7 @@
 BV_CLR_ALL(pv->data.v_bv_bases);
 extra_type_by_cause_iterate(EC_BASE, pextra) {
   if (tile_has_extra(ptile, pextra)) {
-BV_SET(pv->data.v_bv_bases, base_index(extra_base_get(pextra)));
+BV_SET(pv->data.v_bv_bases, base_number(extra_base_get(pextra)));
   }
 } extra_type_by_cause_iterate_end;
 break;
@@ -2420,7 +2420,7 @@
 return;
   case OPID_TILE_BASES:
 extra_type_by_cause_iterate(EC_BASE, pextra) {
-  int bidx = base_index(extra_base_get(pextra));
+  int bidx = base_number(extra_base_get(pextra));
 
   if (BV_ISSET(pv->data.v_bv_bases, bidx)) {
 BV_SET(packet->extras, extra_index(pextra));

Modified: trunk/client/gui-gtk-3.0/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/editprop.c?rev=34581=34580=34581=diff
==
--- trunk/client/gui-gtk-3.0/editprop.c (original)
+++ trunk/client/gui-gtk-3.0/editprop.c Sat Nov 19 23:38:28 2016
@@ -1549,7 +1549,7 @@
 BV_CLR_ALL(pv->data.v_bv_bases);
 extra_type_by_cause_iterate(EC_BASE, pextra) {
   if (tile_has_extra(ptile, pextra)) {
-BV_SET(pv->data.v_bv_bases, base_index(extra_base_get(pextra)));
+BV_SET(pv->data.v_bv_bases, base_number(extra_base_get(pextra)));
   }
 } extra_type_by_cause_iterate_end;
 break;
@@ -2424,7 +2424,7 @@
 return;
   case OPID_TILE_BASES:
 extra_type_by_cause_iterate(EC_BASE, pextra) {
-  int bidx = base_index(extra_base_get(pextra));
+  int bidx = base_number(extra_base_get(pextra));
 
   if (BV_ISSET(pv->data.v_bv_bases, bidx)) {
 BV_SET(packet->extras, extra_index(pextra));

Modified: trunk/client/gui-gtk-3.22/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/editprop.c?rev=34581=34580=34581=diff
==
--- trunk/client/gui-gtk-3.22/editprop.c(original)
+++ trunk/client/gui-gtk-3.22/editprop.cSat Nov 19 23:38:28 2016
@@ -1549,7 +1549,7 @@
 BV_CLR_ALL(pv->data.v_bv_bases);
 extra_type_by_cause_iterate(EC_BASE, pextra) {
   if (tile_has_extra(ptile, pextra)) {
-BV_SET(pv->data.v_bv_bases, base_index(extra_base_get(pextra)));
+BV_SET(pv->data.v_bv_bases, base_number(extra_base_get(pextra)));
   }
 } extra_type_by_cause_iterate_end;
 break;
@@ -2424,7 +2424,7 @@
 return;
   case OPID_TILE_BASES:
 extra_type_by_cause_iterate(EC_BASE, pextra) {
-  int bidx = base_index(extra_base_get(pextra));
+  int bidx = base_number(extra_base_get(pextra));
 
   if (BV_ISSET(pv->data.v_bv_bases, bidx)) {
 BV_SET(packet->extras, extra_index(pextra));

Modified: trunk/common/base.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/base.c?rev=34581=34580=34581=diff
==
--- trunk/common/base.c (original)
+++ trunk/common/base.c Sat Nov 19 23:38:28 2016
@@ -202,24 +202,6 @@
 }
 
 /**
-  Return the base index.
-
-  Currently same as base_number(), paired with base_count()
-  indicates use as an array index.
-
-  FIXME: Get rid of this. _index() makes no sense when they are not
-  in an array.
-**/
-Base_type_id base_index(const struct base_type *pbase)
-{
-  fc_assert_ret_val(NULL != pbase, -1);
-
-  /* FIXME: */
-  /*  return pbase - base_types; */
-  return base_number(pbase);
-}
-
-/**
   Return extra that base is.
 **/
 struct extra_type *base_extra_get(const struct base_type *pbase)

Modified: trunk/common/base.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/base.h?rev=34581=34580=34581=diff
==

[Freeciv-commits] r34579 - /trunk/server/techtools.c

2016-11-19 Thread cazfi74 
Author: cazfi
Date: Sat Nov 19 21:43:56 2016
New Revision: 34579

URL: http://svn.gna.org/viewcvs/freeciv?rev=34579=rev
Log:
Give Future Tech as cheapest free tech when player already is researching those.

bug #25312

Modified:
trunk/server/techtools.c

Modified: trunk/server/techtools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/techtools.c?rev=34579=34578=34579=diff
==
--- trunk/server/techtools.c(original)
+++ trunk/server/techtools.cSat Nov 19 21:43:56 2016
@@ -881,7 +881,7 @@
 {
   int cheapest_cost = -1;
   int cheapest_amount = 0;
-  Tech_type_id cheapest = A_NONE;
+  Tech_type_id cheapest = A_FUTURE; /* If no real tech is found to be missing 
*/
 
   advance_index_iterate(A_FIRST, i) {
 if (research_invention_state(presearch, i) == TECH_PREREQS_KNOWN) {
@@ -896,6 +896,7 @@
   }
 }
   } advance_index_iterate_end;
+
   return cheapest;
 }
 


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

[Freeciv-commits] r34580 - /branches/S2_6/server/techtools.c

2016-11-19 Thread cazfi74 
Author: cazfi
Date: Sat Nov 19 21:44:02 2016
New Revision: 34580

URL: http://svn.gna.org/viewcvs/freeciv?rev=34580=rev
Log:
Give Future Tech as cheapest free tech when player already is researching those.

bug #25312

Modified:
branches/S2_6/server/techtools.c

Modified: branches/S2_6/server/techtools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/techtools.c?rev=34580=34579=34580=diff
==
--- branches/S2_6/server/techtools.c(original)
+++ branches/S2_6/server/techtools.cSat Nov 19 21:44:02 2016
@@ -881,7 +881,7 @@
 {
   int cheapest_cost = -1;
   int cheapest_amount = 0;
-  Tech_type_id cheapest = A_NONE;
+  Tech_type_id cheapest = A_FUTURE; /* If no real tech is found to be missing 
*/
 
   advance_index_iterate(A_FIRST, i) {
 if (research_invention_state(presearch, i) == TECH_PREREQS_KNOWN) {
@@ -896,6 +896,7 @@
   }
 }
   } advance_index_iterate_end;
+
   return cheapest;
 }
 


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

[Freeciv-commits] r34578 - in /branches/S2_6: client/gui-gtk-3.22/gui_main.c doc/man/freeciv-client.6.in

2016-11-19 Thread cazfi74 
Author: cazfi
Date: Sat Nov 19 19:00:37 2016
New Revision: 34578

URL: http://svn.gna.org/viewcvs/freeciv?rev=34578=rev
Log:
Removed silencing of gtk warning logs from gtk3.22-client.

See patch #8003

Modified:
branches/S2_6/client/gui-gtk-3.22/gui_main.c
branches/S2_6/doc/man/freeciv-client.6.in

Modified: branches/S2_6/client/gui-gtk-3.22/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/gui_main.c?rev=34578=34577=34578=diff
==
--- branches/S2_6/client/gui-gtk-3.22/gui_main.c(original)
+++ branches/S2_6/client/gui-gtk-3.22/gui_main.cSat Nov 19 19:00:37 2016
@@ -282,10 +282,6 @@
  _("Other gui-specific options are:\n"));
 
   fc_fprintf(stderr,
- _("-g, --gtk-warnings\tAllow Gtk+ to print warnings "
-   "to console\n"));
-
-  fc_fprintf(stderr,
  _("-r, --resolution WIDTHxHEIGHT\tAssume given resolution "
"screen\n"));
 
@@ -303,23 +299,12 @@
 }
 
 /**
-  Dummy gtk error printer
-**/
-static void log_gtk_warns(const gchar *log_domain, GLogLevelFlags log_level,
-  const gchar *message,
-  gpointer user_data)
-{
-  log_verbose("%s", message);
-}
-
-/**
   Search for command line options. right now, it's just help
   semi-useless until we have options that aren't the same across all clients.
 **/
 static void parse_options(int argc, char **argv)
 {
   int i = 1;
-  bool gtk_warns_enabled = FALSE;
 
   while (i < argc) {
 char *option = NULL;
@@ -327,8 +312,6 @@
 if (is_option("--help", argv[i])) {
   print_usage();
   exit(EXIT_SUCCESS);
-} else if (is_option("--gtk-warnings", argv[i])) {
-  gtk_warns_enabled = TRUE;
 
 #ifdef GTK3_ZOOM_ENABLED
 } else if ((option = get_option_malloc("--zoom", argv, , argc, FALSE))) {
@@ -353,10 +336,6 @@
 /* Can't check against unknown options, as those might be gtk options */
 
 i++;
-  }
-
-  if (!gtk_warns_enabled) {
-g_log_set_handler("Gtk", G_LOG_LEVEL_WARNING, log_gtk_warns, NULL);
   }
 }
 

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=34578=34577=34578=diff
==
--- branches/S2_6/doc/man/freeciv-client.6.in   (original)
+++ branches/S2_6/doc/man/freeciv-client.6.in   Sat Nov 19 19:00:37 2016
@@ -49,8 +49,7 @@
 .B freeciv-gtk3.22
 accepts the standard Gtk parameters following \fB\-\-\fP; see the Gtk
 documentation. It also accepts
-.B [ \-g|\-\-gtk-warnings ] \
-[ \-h|\-\-help ] \
+.B[ \-h|\-\-help ] \
 [ \-r|\-\-resolution \fIWIDTHxHEIGHT\fP ]
 
 .B freeciv-qt


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

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

2016-11-19 Thread cazfi74 
Author: cazfi
Date: Sat Nov 19 18:58:20 2016
New Revision: 34577

URL: http://svn.gna.org/viewcvs/freeciv?rev=34577=rev
Log:
Removed mention of --gtk-warnings commandline parameter for gtk3.22-client from 
man pages.

See patch #8003

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=34577=34576=34577=diff
==
--- trunk/doc/man/freeciv-client.6.in   (original)
+++ trunk/doc/man/freeciv-client.6.in   Sat Nov 19 18:58:20 2016
@@ -48,8 +48,7 @@
 .B freeciv-gtk3x
 accepts the standard Gtk parameters following \fB\-\-\fP; see the Gtk
 documentation. It also accepts
-.B [ \-g|\-\-gtk-warnings ] \
-[ \-h|\-\-help ] \
+.B[ \-h|\-\-help ] \
 [ \-r|\-\-resolution \fIWIDTHxHEIGHT\fP ]
 
 .B freeciv-qt


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

[Freeciv-commits] r34576 - /branches/S2_5/translations/freeciv/fi.po

2016-11-19 Thread cazfi74 
Author: cazfi
Date: Sat Nov 19 17:43:14 2016
New Revision: 34576

URL: http://svn.gna.org/viewcvs/freeciv?rev=34576=rev
Log:
Updated Finnish translation.

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

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

Modified: branches/S2_5/translations/freeciv/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/fi.po?rev=34576=34575=34576=diff


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

[Freeciv-commits] r34575 - /branches/S2_6/translations/freeciv/fi.po

2016-11-19 Thread cazfi74 
Author: cazfi
Date: Sat Nov 19 17:42:53 2016
New Revision: 34575

URL: http://svn.gna.org/viewcvs/freeciv?rev=34575=rev
Log:
Updated Finnish translation.

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

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

Modified: branches/S2_6/translations/freeciv/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/fi.po?rev=34575=34574=34575=diff


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

[Freeciv-commits] r34574 - /trunk/translations/core/fi.po

2016-11-19 Thread cazfi74 
Author: cazfi
Date: Sat Nov 19 17:42:28 2016
New Revision: 34574

URL: http://svn.gna.org/viewcvs/freeciv?rev=34574=rev
Log:
Updated Finnish translation.

Modified:
trunk/translations/core/fi.po

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

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


___
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