[freeciv] 05/07: Merge tag 'upstream/2.5.7'
Markus Koschany
apo at moszumanska.debian.org
Sat May 13 17:37:08 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository freeciv.
commit dbcacf7c2fe591ddb3c09fef7b17d8ff55e44a52
Merge: dad6335 ff6eaa6
Author: Markus Koschany <apo at debian.org>
Date: Sat May 13 18:54:50 2017 +0200
Merge tag 'upstream/2.5.7'
Upstream version 2.5.7
# gpg: Signatur vom Sa 13 Mai 2017 18:54:49 CEST
# gpg: mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
# gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
# gpg: alias "Markus Koschany <markus at koschany.net>" [ultimativ]
# gpg: alias "Markus Koschany <apo at debian.org>" [ultimativ]
ChangeLog | 570 +++++++++++++++++++
INSTALL | 24 +-
NEWS-2.5 | 68 ++-
ai/default/advmilitary.c | 6 +-
ai/default/aitools.c | 6 +-
bootstrap/freeciv-gtk2.appdata.xml.in | 2 +-
bootstrap/freeciv-gtk3.appdata.xml.in | 2 +-
bootstrap/freeciv-mp-gtk2.appdata.xml.in | 2 +-
bootstrap/freeciv-mp-gtk3.appdata.xml.in | 2 +-
bootstrap/freeciv-mp-qt.appdata.xml.in | 2 +-
bootstrap/freeciv-qt.appdata.xml.in | 2 +-
bootstrap/freeciv-sdl.appdata.xml.in | 2 +-
bootstrap/freeciv-server.appdata.xml.in | 2 +-
bootstrap/generate_gitrev.sh | 4 +-
client/agents/agents.c | 32 +-
client/client_main.c | 8 +-
client/gui-gtk-3.0/gui_main.c | 4 +-
client/gui-gtk-3.0/unitselect.c | 4 -
client/gui-qt/gui_main.cpp | 2 +-
client/gui-qt/optiondlg.h | 2 +-
client/gui-qt/pages.cpp | 6 +-
client/gui-qt/plrdlg.cpp | 22 +-
client/gui-sdl/gui_string.c | 6 +-
client/gui-xaw/Freeciv.h | 2 +-
client/luascript/tolua_client_gen.h | 2 +-
client/mapctrl_common.c | 19 +-
client/mapctrl_common.h | 3 +-
client/options.c | 17 +-
client/packhand.c | 4 +
common/scriptcore/tolua_common_a_gen.h | 2 +-
common/scriptcore/tolua_common_z_gen.h | 2 +-
common/scriptcore/tolua_game_gen.c | 18 +-
common/scriptcore/tolua_game_gen.h | 2 +-
common/scriptcore/tolua_signal_gen.h | 2 +-
configure | 54 +-
configure.ac | 4 +-
data/Freeciv | 2 +-
data/helpdata.txt | 9 +-
data/nation/newfoundland.ruleset | 2 +-
doc/BUGS | 4 +-
doc/FAQ | 72 +--
doc/README | 21 +-
doc/README.AI | 4 +-
doc/README.sound | 2 +-
doc/TODO | 5 +-
doc/ca/BUGS.ca | 2 +-
doc/de/BUGS.de | 6 +-
doc/de/HOWTOPLAY.de | 4 +-
doc/de/INSTALL.de | 2 +-
doc/fr/BUGS.fr | 6 +-
doc/fr/HOWTOPLAY.fr | 4 +-
doc/it/HOWTOPLAY.it | 2 +-
doc/it/INSTALL.it | 2 +-
doc/ja/BUGS.ja | 6 +-
doc/ja/HOWTOPLAY.ja | 2 +-
doc/nl/BUGS.nl | 6 +-
doc/nl/HOWTOPLAY.nl | 2 +-
doc/sv/BUGS.sv | 2 +-
doc/sv/HOWTOPLAY.sv | 2 +-
fc_version | 4 +-
server/advisors/advgoto.c | 6 +-
server/report.c | 2 +-
server/rssanity.c | 4 +-
server/savegame.c | 8 +-
server/savegame2.c | 4 +-
server/scripting/tolua_fcdb_gen.h | 2 +-
server/scripting/tolua_server_gen.c | 8 +-
server/scripting/tolua_server_gen.h | 2 +-
server/srv_main.c | 9 +-
translations/freeciv/ar.gmo | Bin 189864 -> 189864 bytes
translations/freeciv/ar.po | 701 +++++++++++------------
translations/freeciv/bg.gmo | Bin 119377 -> 119377 bytes
translations/freeciv/bg.po | 701 +++++++++++------------
translations/freeciv/ca.gmo | Bin 1024533 -> 1024625 bytes
translations/freeciv/ca.po | 706 +++++++++++------------
translations/freeciv/cs.gmo | Bin 214502 -> 214502 bytes
translations/freeciv/cs.po | 701 +++++++++++------------
translations/freeciv/da.gmo | Bin 564280 -> 564280 bytes
translations/freeciv/da.po | 701 +++++++++++------------
translations/freeciv/de.gmo | Bin 1039720 -> 1039812 bytes
translations/freeciv/de.po | 706 +++++++++++------------
translations/freeciv/el.gmo | Bin 245533 -> 245533 bytes
translations/freeciv/el.po | 701 +++++++++++------------
translations/freeciv/en_GB.gmo | Bin 962875 -> 962969 bytes
translations/freeciv/en_GB.po | 712 +++++++++++------------
translations/freeciv/eo.gmo | Bin 176400 -> 176400 bytes
translations/freeciv/eo.po | 701 +++++++++++------------
translations/freeciv/es.gmo | Bin 1040204 -> 1040295 bytes
translations/freeciv/es.po | 708 +++++++++++------------
translations/freeciv/et.gmo | Bin 227478 -> 227478 bytes
translations/freeciv/et.po | 701 +++++++++++------------
translations/freeciv/fa.gmo | Bin 96136 -> 96136 bytes
translations/freeciv/fa.po | 701 +++++++++++------------
translations/freeciv/fi.gmo | Bin 1016546 -> 1016762 bytes
translations/freeciv/fi.po | 937 ++++++++++++++++---------------
translations/freeciv/fr.gmo | Bin 1052897 -> 1052988 bytes
translations/freeciv/fr.po | 708 +++++++++++------------
translations/freeciv/freeciv.pot | 701 +++++++++++------------
translations/freeciv/ga.gmo | Bin 210707 -> 210707 bytes
translations/freeciv/ga.po | 701 +++++++++++------------
translations/freeciv/gd.gmo | Bin 795218 -> 795310 bytes
translations/freeciv/gd.po | 706 +++++++++++------------
translations/freeciv/he.gmo | Bin 97381 -> 97381 bytes
translations/freeciv/he.po | 701 +++++++++++------------
translations/freeciv/hu.gmo | Bin 140508 -> 140508 bytes
translations/freeciv/hu.po | 701 +++++++++++------------
translations/freeciv/id.gmo | Bin 215769 -> 215769 bytes
translations/freeciv/id.po | 701 +++++++++++------------
translations/freeciv/it.gmo | Bin 473855 -> 473855 bytes
translations/freeciv/it.po | 703 +++++++++++------------
translations/freeciv/ja.gmo | Bin 1061863 -> 1061863 bytes
translations/freeciv/ja.po | 701 +++++++++++------------
translations/freeciv/ko.gmo | Bin 423645 -> 423645 bytes
translations/freeciv/ko.po | 701 +++++++++++------------
translations/freeciv/lt.gmo | Bin 176757 -> 176757 bytes
translations/freeciv/lt.po | 701 +++++++++++------------
translations/freeciv/nb.gmo | Bin 194250 -> 194250 bytes
translations/freeciv/nb.po | 701 +++++++++++------------
translations/freeciv/nl.gmo | Bin 403534 -> 403534 bytes
translations/freeciv/nl.po | 701 +++++++++++------------
translations/freeciv/pl.gmo | Bin 899428 -> 899520 bytes
translations/freeciv/pl.po | 706 +++++++++++------------
translations/freeciv/pt.gmo | Bin 130445 -> 130445 bytes
translations/freeciv/pt.po | 701 +++++++++++------------
translations/freeciv/pt_BR.gmo | Bin 430492 -> 430492 bytes
translations/freeciv/pt_BR.po | 701 +++++++++++------------
translations/freeciv/ro.gmo | Bin 198254 -> 198254 bytes
translations/freeciv/ro.po | 701 +++++++++++------------
translations/freeciv/ru.gmo | Bin 1401697 -> 1401807 bytes
translations/freeciv/ru.po | 714 +++++++++++------------
translations/freeciv/sr.gmo | Bin 144669 -> 144669 bytes
translations/freeciv/sr.po | 701 +++++++++++------------
translations/freeciv/sv.gmo | Bin 295373 -> 295373 bytes
translations/freeciv/sv.po | 701 +++++++++++------------
translations/freeciv/tr.gmo | Bin 226528 -> 226528 bytes
translations/freeciv/tr.po | 701 +++++++++++------------
translations/freeciv/uk.gmo | Bin 1269102 -> 1273785 bytes
translations/freeciv/uk.po | 868 ++++++++++++++--------------
translations/freeciv/zh_CN.gmo | Bin 164600 -> 164600 bytes
translations/freeciv/zh_CN.po | 701 +++++++++++------------
translations/freeciv/zh_TW.gmo | Bin 98755 -> 98755 bytes
translations/freeciv/zh_TW.po | 701 +++++++++++------------
translations/nations/ar.gmo | Bin 8111 -> 8111 bytes
translations/nations/ar.po | 2 +-
translations/nations/bg.gmo | Bin 25942 -> 25942 bytes
translations/nations/bg.po | 2 +-
translations/nations/ca.gmo | Bin 439418 -> 439418 bytes
translations/nations/ca.po | 2 +-
translations/nations/cs.gmo | Bin 14232 -> 14232 bytes
translations/nations/cs.po | 2 +-
translations/nations/da.gmo | Bin 136522 -> 136522 bytes
translations/nations/da.po | 2 +-
translations/nations/de.gmo | Bin 236278 -> 236278 bytes
translations/nations/de.po | 2 +-
translations/nations/el.gmo | Bin 16120 -> 16120 bytes
translations/nations/el.po | 2 +-
translations/nations/en_GB.gmo | Bin 430141 -> 430143 bytes
translations/nations/en_GB.po | 6 +-
translations/nations/eo.gmo | Bin 15192 -> 15192 bytes
translations/nations/eo.po | 2 +-
translations/nations/es.gmo | Bin 442543 -> 442543 bytes
translations/nations/es.po | 2 +-
translations/nations/et.gmo | Bin 22087 -> 22087 bytes
translations/nations/et.po | 2 +-
translations/nations/fa.gmo | Bin 9777 -> 9777 bytes
translations/nations/fa.po | 2 +-
translations/nations/fi.gmo | Bin 290157 -> 290157 bytes
translations/nations/fi.po | 2 +-
translations/nations/fr.gmo | Bin 449519 -> 449519 bytes
translations/nations/fr.po | 2 +-
translations/nations/freeciv-nations.pot | 2 +-
translations/nations/ga.gmo | Bin 56956 -> 56956 bytes
translations/nations/ga.po | 2 +-
translations/nations/gd.gmo | Bin 332059 -> 332059 bytes
translations/nations/gd.po | 2 +-
translations/nations/he.gmo | Bin 8205 -> 8205 bytes
translations/nations/he.po | 2 +-
translations/nations/hu.gmo | Bin 5157 -> 5157 bytes
translations/nations/hu.po | 2 +-
translations/nations/id.gmo | Bin 93595 -> 93595 bytes
translations/nations/id.po | 2 +-
translations/nations/it.gmo | Bin 53499 -> 53499 bytes
translations/nations/it.po | 2 +-
translations/nations/ja.gmo | Bin 418742 -> 418742 bytes
translations/nations/ja.po | 2 +-
translations/nations/ko.gmo | Bin 24991 -> 24991 bytes
translations/nations/ko.po | 2 +-
translations/nations/lt.gmo | Bin 24758 -> 24758 bytes
translations/nations/lt.po | 2 +-
translations/nations/nb.gmo | Bin 6977 -> 6977 bytes
translations/nations/nb.po | 2 +-
translations/nations/nl.gmo | Bin 161936 -> 161936 bytes
translations/nations/nl.po | 2 +-
translations/nations/pl.gmo | Bin 441094 -> 441094 bytes
translations/nations/pl.po | 2 +-
translations/nations/pt.gmo | Bin 4748 -> 4748 bytes
translations/nations/pt.po | 2 +-
translations/nations/pt_BR.gmo | Bin 51658 -> 51658 bytes
translations/nations/pt_BR.po | 2 +-
translations/nations/ro.gmo | Bin 6160 -> 6160 bytes
translations/nations/ro.po | 2 +-
translations/nations/ru.gmo | Bin 622772 -> 622772 bytes
translations/nations/ru.po | 6 +-
translations/nations/sr.gmo | Bin 7952 -> 7952 bytes
translations/nations/sr.po | 2 +-
translations/nations/sv.gmo | Bin 32776 -> 32776 bytes
translations/nations/sv.po | 2 +-
translations/nations/tr.gmo | Bin 10677 -> 10677 bytes
translations/nations/tr.po | 2 +-
translations/nations/uk.gmo | Bin 151556 -> 154775 bytes
translations/nations/uk.po | 30 +-
translations/nations/zh_CN.gmo | Bin 12245 -> 12245 bytes
translations/nations/zh_CN.po | 2 +-
translations/nations/zh_TW.gmo | Bin 33716 -> 33716 bytes
translations/nations/zh_TW.po | 2 +-
utility/fciconv.c | 5 +-
utility/ioz.c | 8 +
utility/registry_ini.c | 2 +
win32/installer/Makefile | 2 +-
219 files changed, 14206 insertions(+), 13450 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freeciv.git
More information about the Pkg-games-commits
mailing list