[Freeciv-commits] r31800 - /branches/S2_5_3/translations/freeciv/fi.po

[cazfi74]

Author: cazfi
Date: Sun Feb  7 09:40:49 2016
New Revision: 31800

URL: http://svn.gna.org/viewcvs/freeciv?rev=31800&view=rev
Log:
Removed mnemonic from where it's not supported from Finnish translation.

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

Modified: branches/S2_5_3/translations/freeciv/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/translations/freeciv/fi.po?rev=31800&r1=31799&r2=31800&view=diff
==
--- branches/S2_5_3/translations/freeciv/fi.po  (original)
+++ branches/S2_5_3/translations/freeciv/fi.po  Sun Feb  7 09:40:49 2016
@@ -26,7 +26,7 @@
 "Project-Id-Version: freeciv 2.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-01-19 20:35+\n"
-"PO-Revision-Date: 2016-02-03 21:08+0200\n"
+"PO-Revision-Date: 2016-02-07 10:38+0200\n"
 "Last-Translator: Markus Linnakangas \n"
 "Language-Team: None \n"
 "Language: fi\n"
@@ -6791,7 +6791,7 @@
 #: client/gui-qt/menu.cpp:768 client/gui-sdl/menu.c:836
 #: client/gui-xaw/menu.c:209
 msgid "Establish Trade Route"
-msgstr "Perusta kaupparei_tti"
+msgstr "Perusta kauppareitti"
 
 #: client/gui-qt/menu.cpp:774
 msgid "Civilization"


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

[Freeciv-commits] r31801 - in /trunk: doc/README.msys2 win32/installer_msys2/Makefile

[cazfi74]

Author: cazfi
Date: Sun Feb  7 09:54:15 2016
New Revision: 31801

URL: http://svn.gna.org/viewcvs/freeciv?rev=31801&view=rev
Log:
Fixes to Qt-client specific parts of msys2 based Installer build.
To actually build the package still doesn't work because problems of the common 
part.

See patch #6897

Modified:
trunk/doc/README.msys2
trunk/win32/installer_msys2/Makefile

Modified: trunk/doc/README.msys2
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=31801&r1=31800&r2=31801&view=diff
==
--- trunk/doc/README.msys2  (original)
+++ trunk/doc/README.msys2  Sun Feb  7 09:54:15 2016
@@ -14,7 +14,8 @@
 
 
 - With very specific configure options (see Problems) and msys2 package
-  selection freeciv can be built. This includes the server and gtk3-client
+  selection freeciv can be built.
+- Buildable clients are gtk3 and Qt
 - Both server and client launch ok
 - Client cannot connect to the server
 - Installers cannot be built
@@ -30,6 +31,8 @@
 2.1) Packages needed for building freeciv
  These packages are needed even if you don't plan to make installer,
  but only build freeciv for local use.
+
+2.1.1) Arch independent packages needed for building freeciv
 
  - subversion
  - make
@@ -47,13 +50,21 @@
  - liblzma-devel
  - icu-devel
 
+2.1.2) Arch-specific packages needed for building freeciv
+
  - mingw-w64-i686-gtk3 / mingw-w64-x86_64-gtk3
+ - mingw-w64-i686-qt5 / mingw-w64-x86_64-qt5
 
-2.2) Packaged needed for building installer
+2.2) Packaged needed for building installer package
+ These are needed in addition to above ones used in the
+ building step already.
+
+2.2.1) Arch-specific packages needed for building installer
+ package
+
  - mingw-w64-i686-nsis / mingw-w64-x86_64-nsis
 
-
-Packages TODO:
+2.3) Packages TODO:
  - Mixer support
  - Clients other than gtk3
  - MagickWand support
@@ -66,6 +77,7 @@
   Target can be:
   - "-installer", where  is
  - gtk3
+ - qt
 
 Problems
 

Modified: trunk/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=31801&r1=31800&r2=31801&view=diff
==
--- trunk/win32/installer_msys2/Makefile(original)
+++ trunk/win32/installer_msys2/MakefileSun Feb  7 09:54:15 2016
@@ -36,7 +36,7 @@
make GUI=sdl2 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit 
$(EXTRA_CONFIG)" wrap-sdl2
 
 qt-installer:
-   make GUI=qt FCMP=qt wrap-qt
+   make GUI=qt FCMP=qt 
EXTRA_CONFIG="--with-qt5-includes=$(ARCHDIR)/include 
--with-qt5-libs=$(ARCHDIR)/lib $(EXTRA_CONFIG)" wrap-qt
 
 ruledit-installer:
make wrap-ruledit
@@ -252,15 +252,25 @@
 
 QT_DLLS := \
libstdc++-6.dll \
+   libicuin56.dll \
+   libicuuc56.dll \
+   libicudt56.dll \
+   libpcre16-0.dll \
+   libharfbuzz-0.dll \
+   libsqlite3-0.dll \
Qt5Core.dll \
Qt5Gui.dll \
Qt5Widgets.dll
 
+QT_MSYS_DLLS := \
+   stdc++-6.dll
+
 install-env-qt: install-env-common
# add DLLs
cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-$(GUI)
+   cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(GUI)
# add additional Qt files
-   cp -R /plugins install-$(GUI)/
+   cp -R $(ARCHDIR)/share/qt5/plugins install-$(GUI)/
cp -R /share/locale install-$(GUI)/share/
find install-$(GUI)/share/locale -type f -not -name "freeciv*.mo" 
-delete
 
@@ -269,7 +279,7 @@
cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-ruledit
cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-ruledit
# add additional Qt files
-   cp -R /plugins install-ruledit/
+   cp -R $(ARCHDIR)/share/qt5/plugins install-ruledit/
cp -R /share/locale install-ruledit/share/
find install-ruledit/share/locale -type f -not -name 
"freeciv-ruledit.mo" -delete
 


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

[Freeciv-commits] r31802 - in /branches/S2_6: doc/README.msys2 win32/installer_msys2/Makefile

[cazfi74]

Author: cazfi
Date: Sun Feb  7 09:54:22 2016
New Revision: 31802

URL: http://svn.gna.org/viewcvs/freeciv?rev=31802&view=rev
Log:
Fixes to Qt-client specific parts of msys2 based Installer build.
To actually build the package still doesn't work because problems of the common 
part.

See patch #6897

Modified:
branches/S2_6/doc/README.msys2
branches/S2_6/win32/installer_msys2/Makefile

Modified: branches/S2_6/doc/README.msys2
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.msys2?rev=31802&r1=31801&r2=31802&view=diff
==
--- branches/S2_6/doc/README.msys2  (original)
+++ branches/S2_6/doc/README.msys2  Sun Feb  7 09:54:22 2016
@@ -14,7 +14,8 @@
 
 
 - With very specific configure options (see Problems) and msys2 package
-  selection freeciv can be built. This includes the server and gtk3-client
+  selection freeciv can be built.
+- Buildable clients are gtk3 and Qt
 - Both server and client launch ok
 - Client cannot connect to the server
 - Installers cannot be built
@@ -31,6 +32,8 @@
  These packages are needed even if you don't plan to make installer,
  but only build freeciv for local use.
 
+2.1.1) Arch independent packages needed for building freeciv
+
  - subversion
  - make
  - automake
@@ -46,13 +49,21 @@
  - libcurl-devel
  - liblzma-devel
 
+2.1.2) Arch-specific packages needed for building freeciv
+
  - mingw-w64-i686-gtk3 / mingw-w64-x86_64-gtk3
+ - mingw-w64-i686-qt5 / mingw-w64-x86_64-qt5
 
-2.2) Packaged needed for building installer
+2.2) Packaged needed for building installer package
+ These are needed in addition to above ones used in the
+ building step already.
+
+2.2.1) Arch-specific packages needed for building installer
+ package
+
  - mingw-w64-i686-nsis / mingw-w64-x86_64-nsis
 
-
-Packages TODO:
+2.3) Packages TODO:
  - Mixer support
  - Clients other than gtk3
  - MagickWand support
@@ -65,6 +76,7 @@
   Target can be:
   - "-installer", where  is
  - gtk3
+ - qt
 
 
 Problems

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=31802&r1=31801&r2=31802&view=diff
==
--- branches/S2_6/win32/installer_msys2/Makefile(original)
+++ branches/S2_6/win32/installer_msys2/MakefileSun Feb  7 09:54:22 2016
@@ -36,7 +36,7 @@
make GUI=sdl2 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit 
$(EXTRA_CONFIG)" wrap-sdl2
 
 qt-installer:
-   make GUI=qt FCMP=qt wrap-qt
+   make GUI=qt FCMP=qt 
EXTRA_CONFIG="--with-qt5-includes=$(ARCHDIR)/include 
--with-qt5-libs=$(ARCHDIR)/lib $(EXTRA_CONFIG)" wrap-qt
 
 ruledit-installer:
make wrap-ruledit
@@ -249,15 +249,25 @@
 
 QT_DLLS := \
libstdc++-6.dll \
+   libicuin56.dll \
+   libicuuc56.dll \
+   libicudt56.dll \
+   libpcre16-0.dll \
+   libharfbuzz-0.dll \
+   libsqlite3-0.dll \
Qt5Core.dll \
Qt5Gui.dll \
Qt5Widgets.dll
 
+QT_MSYS_DLLS := \
+   stdc++-6.dll
+
 install-env-qt: install-env-common
# add DLLs
cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-$(GUI)
+   cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(GUI)
# add additional Qt files
-   cp -R /plugins install-$(GUI)/
+   cp -R $(ARCHDIR)/share/qt5/plugins install-$(GUI)/
cp -R /share/locale install-$(GUI)/share/
find install-$(GUI)/share/locale -type f -not -name "freeciv*.mo" 
-delete
 
@@ -266,7 +276,7 @@
cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-ruledit
cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-ruledit
# add additional Qt files
-   cp -R /plugins install-ruledit/
+   cp -R $(ARCHDIR)/share/qt5/plugins install-ruledit/
cp -R /share/locale install-ruledit/share/
find install-ruledit/share/locale -type f -not -name 
"freeciv-ruledit.mo" -delete
 


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

[Freeciv-commits] r31803 - in /branches/S2_5_3/translations: freeciv/ nations/

[0jacobnk . gna]

Author: jtn
Date: Sun Feb  7 10:20:45 2016
New Revision: 31803

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

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

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

Modified: branches/S2_5_3/translations/freeciv/ar.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/translations/freeciv/ar.po?rev=31803&r1=31802&r2=31803&view=diff

Modified: branches/S2_5_3/translations/freeciv/bg.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/translations/freeciv/bg.po?rev=31803&r1=31802&r2=31803&view=diff

Modified: branches/S2_5_3/translations/freeciv/ca.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/translations/freeciv/ca.po?rev=31803&r1=31802&r2=31803&view=diff

Modified: branches/S2_5_3/translations/freeciv/cs.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/translations/freeciv/cs.po?rev=31803&r1=31802&r2=31803&view=diff

Modified: branches/S2_5_3/translations/freeciv/da.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/translations/freeciv/da.po?rev=31803&r1=31802&r2=31803&view=diff

Modified: branches/S2_5_3/translations/freeciv/de.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/translations/freeciv/de.po?rev=31803&r1=31802&r2=31803&view=diff

Modified: branches/S2_5_3/translations/freeciv/el.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/translations/freeciv/el.po?rev=31803&r1=31802&r2=31803&view=diff

Modified: branches/S2_5_3/translations/freeciv/en_GB.po
U

[Freeciv-commits] r31804 - /branches/S2_5_3/NEWS-2.5

[0jacobnk . gna]

Author: jtn
Date: Sun Feb  7 10:39:07 2016
New Revision: 31804

URL: http://svn.gna.org/viewcvs/freeciv?rev=31804&view=rev
Log:
Refresh NEWS-2.5 for 2.5.3, from wiki.

Modified:
branches/S2_5_3/NEWS-2.5

Modified: branches/S2_5_3/NEWS-2.5
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/NEWS-2.5?rev=31804&r1=31803&r2=31804&view=diff
==
--- branches/S2_5_3/NEWS-2.5(original)
+++ branches/S2_5_3/NEWS-2.5Sun Feb  7 10:39:07 2016
@@ -1,10 +1,43 @@
 
-Welcome to Freeciv 2.5.2
+Welcome to Freeciv 2.5.3
 
 
 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.2 to 2.5.3
+---
+
+   (from )
+
+   2.5.3 is a bugfix release mainly aimed at Linux distribution
+   maintainers and other repackagers. There have only been a few minor
+   user-visible fixes since 2.5.2.
+
+ * Build fixes:
+  + Re-generating the configure script could fail on recent OS
+distributions due to a clash with the system supplied
+glib-gettext.m4. This did not affect most users, who would
+build with the configure script supplied in the tarball.
+GNA#24379
+  + configure could spuriously output "-lncurses: not found" and
+fail to find readline on some systems (seen on OpenBSD).
+GNA#24372
+ * Qt client fixes:
+  + The menu options and keyboard shortcuts to save games were
+disabled when there were no active units. GNA#24371
+  + The Qt client could create a directory called literally
+'$HOME'. GNA#24359
+  + A few strings in the Qt client were displayed unlocalized.
+GNA#24339
+ * Increase the size of some buffers that were causing truncated
+   strings in some localizations, such as Russian. GNA#24328
+ * Change a couple of flag files to address auto-detected licensing
+   conflicts. GNA#23814 GNAPATCH#6855
+ * Some corrections to the Finnish and Russian translations.
+   GNAPATCH#6902
 
 
 CHANGES FROM 2.5.1 to 2.5.2


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

[Freeciv-commits] r31805 - /branches/S2_5_3/ChangeLog

[0jacobnk . gna]

Author: jtn
Date: Sun Feb  7 10:44:35 2016
New Revision: 31805

URL: http://svn.gna.org/viewcvs/freeciv?rev=31805&view=rev
Log:
Update ChangeLog as of S2_5_3 r31804.

Modified:
branches/S2_5_3/ChangeLog

Modified: branches/S2_5_3/ChangeLog
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/ChangeLog?rev=31805&r1=31804&r2=31805&view=diff
==
--- branches/S2_5_3/ChangeLog   (original)
+++ branches/S2_5_3/ChangeLog   Sun Feb  7 10:44:35 2016
@@ -1,3 +1,235 @@
+
+r31804 | jtn | 2016-02-07 09:39:07 + (Sun, 07 Feb 2016) | 2 lines
+Changed paths:
+   M /branches/S2_5_3/NEWS-2.5
+
+Refresh NEWS-2.5 for 2.5.3, from wiki.
+
+
+r31803 | jtn | 2016-02-07 09:20:45 + (Sun, 07 Feb 2016) | 3 lines
+Changed paths:
+   M /branches/S2_5_3/translations/freeciv/ar.po
+   M /branches/S2_5_3/translations/freeciv/bg.po
+   M /branches/S2_5_3/translations/freeciv/ca.po
+   M /branches/S2_5_3/translations/freeciv/cs.po
+   M /branches/S2_5_3/translations/freeciv/da.po
+   M /branches/S2_5_3/translations/freeciv/de.po
+   M /branches/S2_5_3/translations/freeciv/el.po
+   M /branches/S2_5_3/translations/freeciv/en_GB.po
+   M /branches/S2_5_3/translations/freeciv/eo.po
+   M /branches/S2_5_3/translations/freeciv/es.po
+   M /branches/S2_5_3/translations/freeciv/et.po
+   M /branches/S2_5_3/translations/freeciv/fa.po
+   M /branches/S2_5_3/translations/freeciv/fi.po
+   M /branches/S2_5_3/translations/freeciv/fr.po
+   M /branches/S2_5_3/translations/freeciv/ga.po
+   M /branches/S2_5_3/translations/freeciv/gd.po
+   M /branches/S2_5_3/translations/freeciv/he.po
+   M /branches/S2_5_3/translations/freeciv/hu.po
+   M /branches/S2_5_3/translations/freeciv/id.po
+   M /branches/S2_5_3/translations/freeciv/it.po
+   M /branches/S2_5_3/translations/freeciv/ja.po
+   M /branches/S2_5_3/translations/freeciv/ko.po
+   M /branches/S2_5_3/translations/freeciv/lt.po
+   M /branches/S2_5_3/translations/freeciv/nb.po
+   M /branches/S2_5_3/translations/freeciv/nl.po
+   M /branches/S2_5_3/translations/freeciv/pl.po
+   M /branches/S2_5_3/translations/freeciv/pt.po
+   M /branches/S2_5_3/translations/freeciv/pt_BR.po
+   M /branches/S2_5_3/translations/freeciv/ro.po
+   M /branches/S2_5_3/translations/freeciv/ru.po
+   M /branches/S2_5_3/translations/freeciv/sr.po
+   M /branches/S2_5_3/translations/freeciv/sv.po
+   M /branches/S2_5_3/translations/freeciv/tr.po
+   M /branches/S2_5_3/translations/freeciv/uk.po
+   M /branches/S2_5_3/translations/freeciv/zh_CN.po
+   M /branches/S2_5_3/translations/freeciv/zh_TW.po
+   M /branches/S2_5_3/translations/nations/ar.po
+   M /branches/S2_5_3/translations/nations/bg.po
+   M /branches/S2_5_3/translations/nations/ca.po
+   M /branches/S2_5_3/translations/nations/cs.po
+   M /branches/S2_5_3/translations/nations/da.po
+   M /branches/S2_5_3/translations/nations/de.po
+   M /branches/S2_5_3/translations/nations/el.po
+   M /branches/S2_5_3/translations/nations/en_GB.po
+   M /branches/S2_5_3/translations/nations/eo.po
+   M /branches/S2_5_3/translations/nations/es.po
+   M /branches/S2_5_3/translations/nations/et.po
+   M /branches/S2_5_3/translations/nations/fa.po
+   M /branches/S2_5_3/translations/nations/fi.po
+   M /branches/S2_5_3/translations/nations/fr.po
+   M /branches/S2_5_3/translations/nations/ga.po
+   M /branches/S2_5_3/translations/nations/gd.po
+   M /branches/S2_5_3/translations/nations/he.po
+   M /branches/S2_5_3/translations/nations/hu.po
+   M /branches/S2_5_3/translations/nations/id.po
+   M /branches/S2_5_3/translations/nations/it.po
+   M /branches/S2_5_3/translations/nations/ja.po
+   M /branches/S2_5_3/translations/nations/ko.po
+   M /branches/S2_5_3/translations/nations/lt.po
+   M /branches/S2_5_3/translations/nations/nb.po
+   M /branches/S2_5_3/translations/nations/nl.po
+   M /branches/S2_5_3/translations/nations/pl.po
+   M /branches/S2_5_3/translations/nations/pt.po
+   M /branches/S2_5_3/translations/nations/pt_BR.po
+   M /branches/S2_5_3/translations/nations/ro.po
+   M /branches/S2_5_3/translations/nations/ru.po
+   M /branches/S2_5_3/translations/nations/sr.po
+   M /branches/S2_5_3/translations/nations/sv.po
+   M /branches/S2_5_3/translations/nations/tr.po
+   M /branches/S2_5_3/translations/nations/uk.po
+   M /branches/S2_5_3/translations/nations/zh_CN.po
+   M /branches/S2_5_3/translations/nations/zh_TW.po
+
+Results of running "make update-po"
+in translations/freeciv/ and translations/nations/
+
+
+r31800 | cazfi | 2016-02-07 08:40:49 + (Sun, 07 Feb 2016) | 2 lines
+Changed paths:
+   M /branches/S2_5_3/translations/freeciv/fi.po
+
+Removed mnemonic from where it's not supported from Finnish translation.
+
+--

[Freeciv-commits] r31806 - /tags/R2_5_3/

[0jacobnk . gna]

Author: jtn
Date: Sun Feb  7 10:53:04 2016
New Revision: 31806

URL: http://svn.gna.org/viewcvs/freeciv?rev=31806&view=rev
Log:
Tag 2.5.3 release.

Added:
tags/R2_5_3/
  - copied from r31805, branches/S2_5_3/


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

[Freeciv-commits] r31807 - /tags/R2_5_3/fc_version

[0jacobnk . gna]

Author: jtn
Date: Sun Feb  7 10:59:23 2016
New Revision: 31807

URL: http://svn.gna.org/viewcvs/freeciv?rev=31807&view=rev
Log:
Strip '-pre' from version string for release.

Modified:
tags/R2_5_3/fc_version

Modified: tags/R2_5_3/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/tags/R2_5_3/fc_version?rev=31807&r1=31806&r2=31807&view=diff
==
--- tags/R2_5_3/fc_version  (original)
+++ tags/R2_5_3/fc_version  Sun Feb  7 10:59:23 2016
@@ -7,7 +7,7 @@
 MAJOR_VERSION="2"
 MINOR_VERSION="5"
 PATCH_VERSION="3"
-VERSION_LABEL="-pre"
+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] r31808 - /branches/S2_5/NEWS-2.5

[0jacobnk . gna]

Author: jtn
Date: Sun Feb  7 11:02:02 2016
New Revision: 31808

URL: http://svn.gna.org/viewcvs/freeciv?rev=31808&view=rev
Log:
Refresh NEWS-2.5 for 2.5.3 (copied from S2_5_3 release branch).

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=31808&r1=31807&r2=31808&view=diff
==
--- branches/S2_5/NEWS-2.5  (original)
+++ branches/S2_5/NEWS-2.5  Sun Feb  7 11:02:02 2016
@@ -1,10 +1,43 @@
 
-Welcome to Freeciv 2.5.2
+Welcome to Freeciv 2.5.3
 
 
 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.2 to 2.5.3
+---
+
+   (from )
+
+   2.5.3 is a bugfix release mainly aimed at Linux distribution
+   maintainers and other repackagers. There have only been a few minor
+   user-visible fixes since 2.5.2.
+
+ * Build fixes:
+  + Re-generating the configure script could fail on recent OS
+distributions due to a clash with the system supplied
+glib-gettext.m4. This did not affect most users, who would
+build with the configure script supplied in the tarball.
+GNA#24379
+  + configure could spuriously output "-lncurses: not found" and
+fail to find readline on some systems (seen on OpenBSD).
+GNA#24372
+ * Qt client fixes:
+  + The menu options and keyboard shortcuts to save games were
+disabled when there were no active units. GNA#24371
+  + The Qt client could create a directory called literally
+'$HOME'. GNA#24359
+  + A few strings in the Qt client were displayed unlocalized.
+GNA#24339
+ * Increase the size of some buffers that were causing truncated
+   strings in some localizations, such as Russian. GNA#24328
+ * Change a couple of flag files to address auto-detected licensing
+   conflicts. GNA#23814 GNAPATCH#6855
+ * Some corrections to the Finnish and Russian translations.
+   GNAPATCH#6902
 
 
 CHANGES FROM 2.5.1 to 2.5.2


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

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

[0jacobnk . gna]

Author: jtn
Date: Sun Feb  7 12:10:06 2016
New Revision: 31809

URL: http://svn.gna.org/viewcvs/freeciv?rev=31809&view=rev
Log:
Announce 2.5.3.

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=31809&r1=31808&r2=31809&view=diff
==
--- website/download.html   (original)
+++ website/download.html   Sun Feb  7 12:10:06 2016
@@ -63,26 +63,26 @@
 
 
 
-Here you can download the latest version of Freeciv: 2.5.2. 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.3. 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.2";>list of changes 
in the most recent release.
+See the http://www.freeciv.org/wiki/NEWS-2.5.3";>list of changes 
in the most recent release.
 
 Source Code
 To compile Freeciv yourself, download the source code:
 
 
-freeciv-2.5.2.tar.bz2 
-http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.2.tar.bz2?download";>Mirror
 1 (sourceforge.net)
-http://download.gna.org/freeciv/stable/freeciv-2.5.2.tar.bz2";>Mirror 
2 (gna.org)
-freeciv-2.5.2.zip 
-http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.2.zip?download";>Mirror
 1 (sourceforge.net)
-http://download.gna.org/freeciv/stable/freeciv-2.5.2.zip";>Mirror 2 
(gna.org)
+freeciv-2.5.3.tar.bz2 
+http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.3.tar.bz2?download";>Mirror
 1 (sourceforge.net)
+http://download.gna.org/freeciv/stable/freeciv-2.5.3.tar.bz2";>Mirror 
2 (gna.org)
+freeciv-2.5.3.zip 
+http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.3.zip?download";>Mirror
 1 (sourceforge.net)
+http://download.gna.org/freeciv/stable/freeciv-2.5.3.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=31809&r1=31808&r2=31809&view=diff
==
--- website/index.html  (original)
+++ website/index.html  Sun Feb  7 12:10:06 2016
@@ -62,7 +62,7 @@


Download Freeciv 
-   Stable Version 2.5.2 released on 19th Jan 
2016
+   Stable Version 2.5.3 released on 7th Feb 
2016
https://play.freeciv.org/";>Play Freeciv-web 
The online browser version of Freeciv using 
HTML5
http://forum.freeciv.org/";>Community Forum 
@@ -92,12 +92,11 @@
 
   Project news

+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).
 19th Jan 2016 - http://www.freeciv.org/wiki/NEWS-2.5.2";>Freeciv 2.5.2 is a bugfix 
release in the stable 2.5 series.
 14th Nov 2015 - The Freeciv project was founded 20 
years ago today. http://play.freeciv.org/blog/2015/11/freeciv-founded-20-years-ago-today/";>Andreas
 Røsdal interviews the original developers.
 4th Oct 2015 - The Freeciv.org front page has been 
redesigned.
 15th Aug 2015 - Two new bugfix releases of Freeciv: 
http://www.freeciv.org/wiki/NEWS-2.5.1";>2.5.1 and, for those still 
playing 2.4, a final http://www.freeciv.org/wiki/NEWS-2.4.5";>2.4.5 
release.
-14th Mar 2015 - After 18 months, Freeciv 2.5.0 is 
released. http://www.freeciv.org/wiki/NEWS-2.5.0";>NEWS-2.5.0 
describes what's changed since 2.4.x.
-(The previous stable release, 2.4.4, is still available 
from the Download page.)

 
 http://www.freeciv.org/wiki/News_archive";>All news...

Modified: website/js/freeciv.js
URL: 
http://svn.gna.org/viewcvs/freeciv/website/js/freeciv.js?rev=31809&r1=31808&r2=31809&view=diff
==
--- website/js/freeciv.js   (original)
+++ website/js/freeciv.js   Sun Feb  7 12:10:06 2016
@@ -22,9 +22,9 @@
* place.
   
   if (window.ui.os=="Windows") {
-$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.2-win32-gtk2-setup.exe?download";);
+$("#download_button").attr("href", 
"http://prdownloads.sourceforge.net/freeciv/Freeciv-2.5.3-win32-gtk2-setup.exe?download";);
   } else if (window.ui.os=="Linux") {
-$("#download_button").attr("href", 
"http://p

[Freeciv-commits] r31810 - /branches/S2_5/server/civserver.c

[cazfi74]

Author: cazfi
Date: Sun Feb  7 14:00:58 2016
New Revision: 31810

URL: http://svn.gna.org/viewcvs/freeciv?rev=31810&view=rev
Log:
Include winsock2.h to civserver.c before windows.h

See bug #24387

Modified:
branches/S2_5/server/civserver.c

Modified: branches/S2_5/server/civserver.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/civserver.c?rev=31810&r1=31809&r2=31810&view=diff
==
--- branches/S2_5/server/civserver.c(original)
+++ branches/S2_5/server/civserver.cSun Feb  7 14:00:58 2016
@@ -32,6 +32,13 @@
 #include 
 #endif
 
+#ifdef HAVE_WINSOCK
+#ifdef HAVE_WINSOCK2
+#include 
+#else  /* HAVE_WINSOCK2 */
+#include 
+#endif /* HAVE_WINSOCK2 */
+#endif /* HAVE_WINSOCK */
 #ifdef WIN32_NATIVE
 #include 
 #endif


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

[Freeciv-commits] r31811 - in /trunk: Makefile.am m4/intlmacosx.m4

[cazfi74]

Author: cazfi
Date: Sun Feb  7 16:53:55 2016
New Revision: 31811

URL: http://svn.gna.org/viewcvs/freeciv?rev=31811&view=rev
Log:
Added missing intlmacosx.m4 from gettext distribution.

See bug #24386

Added:
trunk/m4/intlmacosx.m4
Modified:
trunk/Makefile.am

Modified: trunk/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/Makefile.am?rev=31811&r1=31810&r2=31811&view=diff
==
--- trunk/Makefile.am   (original)
+++ trunk/Makefile.am   Sun Feb  7 16:53:55 2016
@@ -52,6 +52,7 @@
m4/gtk3-client.m4   \
m4/gtk3x-client.m4  \
m4/iconv.m4 \
+   m4/intlmacosx.m4\
m4/lib-ld.m4\
m4/lib-link.m4  \
m4/lib-prefix.m4\

Added: trunk/m4/intlmacosx.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/m4/intlmacosx.m4?rev=31811&view=auto
==
--- trunk/m4/intlmacosx.m4  (added)
+++ trunk/m4/intlmacosx.m4  Sun Feb  7 16:53:55 2016
@@ -0,0 +1,56 @@
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on Mac OS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in Mac OS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+[gt_cv_func_CFPreferencesCopyAppValue],
+[gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ AC_LINK_IFELSE(
+   [AC_LANG_PROGRAM(
+  [[#include ]],
+  [[CFPreferencesCopyAppValue(NULL, NULL)]])],
+   [gt_cv_func_CFPreferencesCopyAppValue=yes],
+   [gt_cv_func_CFPreferencesCopyAppValue=no])
+ LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+  [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue 
in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in Mac OS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+[gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ AC_LINK_IFELSE(
+   [AC_LANG_PROGRAM(
+  [[#include ]],
+  [[CFLocaleCopyCurrent();]])],
+   [gt_cv_func_CFLocaleCopyCurrent=yes],
+   [gt_cv_func_CFLocaleCopyCurrent=no])
+ LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+  [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in 
the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test 
$gt_cv_func_CFLocaleCopyCurrent = yes; then
+INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])


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

[Freeciv-commits] r31812 - in /branches/S2_6: Makefile.am m4/intlmacosx.m4

[cazfi74]

Author: cazfi
Date: Sun Feb  7 16:54:05 2016
New Revision: 31812

URL: http://svn.gna.org/viewcvs/freeciv?rev=31812&view=rev
Log:
Added missing intlmacosx.m4 from gettext distribution.

See bug #24386

Added:
branches/S2_6/m4/intlmacosx.m4
Modified:
branches/S2_6/Makefile.am

Modified: branches/S2_6/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/Makefile.am?rev=31812&r1=31811&r2=31812&view=diff
==
--- branches/S2_6/Makefile.am   (original)
+++ branches/S2_6/Makefile.am   Sun Feb  7 16:54:05 2016
@@ -50,6 +50,7 @@
m4/gtk2-client.m4   \
m4/gtk3-client.m4   \
m4/iconv.m4 \
+   m4/intlmacosx.m4\
m4/lib-ld.m4\
m4/lib-link.m4  \
m4/lib-prefix.m4\

Added: branches/S2_6/m4/intlmacosx.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/intlmacosx.m4?rev=31812&view=auto
==
--- branches/S2_6/m4/intlmacosx.m4  (added)
+++ branches/S2_6/m4/intlmacosx.m4  Sun Feb  7 16:54:05 2016
@@ -0,0 +1,56 @@
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on Mac OS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in Mac OS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+[gt_cv_func_CFPreferencesCopyAppValue],
+[gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ AC_LINK_IFELSE(
+   [AC_LANG_PROGRAM(
+  [[#include ]],
+  [[CFPreferencesCopyAppValue(NULL, NULL)]])],
+   [gt_cv_func_CFPreferencesCopyAppValue=yes],
+   [gt_cv_func_CFPreferencesCopyAppValue=no])
+ LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+  [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue 
in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in Mac OS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+[gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ AC_LINK_IFELSE(
+   [AC_LANG_PROGRAM(
+  [[#include ]],
+  [[CFLocaleCopyCurrent();]])],
+   [gt_cv_func_CFLocaleCopyCurrent=yes],
+   [gt_cv_func_CFLocaleCopyCurrent=no])
+ LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+  [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in 
the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test 
$gt_cv_func_CFLocaleCopyCurrent = yes; then
+INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])


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

[Freeciv-commits] r31814 - /trunk/common/unittype.h

[sveinung84]

Author: sveinung
Date: Mon Feb  8 01:09:55 2016
New Revision: 31814

URL: http://svn.gna.org/viewcvs/freeciv?rev=31814&view=rev
Log:
Fix a comment's reference to UTYF_PARATROOPERS.

It isn't called F_PARATROOPERS any more.

Modified:
trunk/common/unittype.h

Modified: trunk/common/unittype.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.h?rev=31814&r1=31813&r2=31814&view=diff
==
--- trunk/common/unittype.h (original)
+++ trunk/common/unittype.h Mon Feb  8 01:09:55 2016
@@ -489,7 +489,8 @@
   int happy_cost;  /* unhappy people in home city */
   int upkeep[O_LAST];
 
-  int paratroopers_range; /* only valid for F_PARATROOPERS */
+  /* Only valid for UTYF_PARATROOPERS */
+  int paratroopers_range;
   int paratroopers_mr_req;
   int paratroopers_mr_sub;
 


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

[Freeciv-commits] r31813 - /trunk/client/gui-qt/menu.cpp

[sveinung84]

Author: sveinung
Date: Mon Feb  8 01:09:24 2016
New Revision: 31813

URL: http://svn.gna.org/viewcvs/freeciv?rev=31813&view=rev
Log:
Fix an outdated comment about the order system.

The orders system now allows the client to specify detailed target
information.

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

Modified: trunk/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=31813&r1=31812&r2=31813&view=diff
==
--- trunk/client/gui-qt/menu.cpp(original)
+++ trunk/client/gui-qt/menu.cppMon Feb  8 01:09:24 2016
@@ -382,8 +382,9 @@
   }
 
   if (action_requires_details(action_id)) {
-/* The order system doesn't support actions that requires the
- * player to specify details. */
+/* This menu doesn't support specifying a detailed target (think
+ * "Go to and..."->"Industrial Sabotage"->"City Walls") for the
+ * action order. */
 continue;
   }
 


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

[Freeciv-commits] r31815 - /branches/S2_6/common/unittype.h

[sveinung84]

Author: sveinung
Date: Mon Feb  8 01:11:01 2016
New Revision: 31815

URL: http://svn.gna.org/viewcvs/freeciv?rev=31815&view=rev
Log:
Fix comment's reference to UTYF_PARATROOPERS.

It isn't called F_PARATROOPERS any more.

Modified:
branches/S2_6/common/unittype.h

Modified: branches/S2_6/common/unittype.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/unittype.h?rev=31815&r1=31814&r2=31815&view=diff
==
--- branches/S2_6/common/unittype.h (original)
+++ branches/S2_6/common/unittype.h Mon Feb  8 01:11:01 2016
@@ -489,7 +489,8 @@
   int happy_cost;  /* unhappy people in home city */
   int upkeep[O_LAST];
 
-  int paratroopers_range; /* only valid for F_PARATROOPERS */
+  /* Only valid for UTYF_PARATROOPERS */
+  int paratroopers_range;
   int paratroopers_mr_req;
   int paratroopers_mr_sub;
 


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

[Freeciv-commits] r31816 - /branches/S2_5/common/unittype.h

[sveinung84]

Author: sveinung
Date: Mon Feb  8 01:12:01 2016
New Revision: 31816

URL: http://svn.gna.org/viewcvs/freeciv?rev=31816&view=rev
Log:
Fix comment's reference to UTYF_PARATROOPERS.

It isn't called F_PARATROOPERS any more.

Modified:
branches/S2_5/common/unittype.h

Modified: branches/S2_5/common/unittype.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unittype.h?rev=31816&r1=31815&r2=31816&view=diff
==
--- branches/S2_5/common/unittype.h (original)
+++ branches/S2_5/common/unittype.h Mon Feb  8 01:12:01 2016
@@ -437,7 +437,8 @@
   int happy_cost;  /* unhappy people in home city */
   int upkeep[O_LAST];
 
-  int paratroopers_range; /* only valid for F_PARATROOPERS */
+  /* Only valid for UTYF_PARATROOPERS */
+  int paratroopers_range;
   int paratroopers_mr_req;
   int paratroopers_mr_sub;
 


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