This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch stretch-backports in repository freeciv.
commit ea245a9a975b9d888f361760b8341fa954dc9444 Merge: 236d0f7 7512c1e Author: Markus Koschany <a...@debian.org> Date: Tue Apr 3 22:45:14 2018 +0200 Merge branch 'master' into stretch-backports ChangeLog | 342 ++++++++ NEWS-2.5 | 35 +- client/editor.c | 2 +- client/gui-gtk-2.0/pages.c | 2 +- client/gui-gtk-3.0/pages.c | 2 +- client/gui-qt/citydlg.cpp | 1 - client/gui-qt/fc_client.cpp | 7 +- client/gui-qt/fc_client.h | 2 +- client/gui-qt/gui_main.cpp | 2 +- client/gui-qt/spaceshipdlg.cpp | 1 - client/gui-sdl/dialogs.c | 18 +- client/gui-xaw/Freeciv.h | 2 +- client/helpdata.c | 44 +- client/luascript/tolua_client_gen.h | 2 +- client/tilespec.c | 4 - common/effects.h | 2 +- common/scriptcore/tolua_common_a_gen.h | 2 +- common/scriptcore/tolua_common_z_gen.h | 2 +- common/scriptcore/tolua_game_gen.c | 20 +- common/scriptcore/tolua_game_gen.h | 2 +- common/scriptcore/tolua_signal_gen.h | 2 +- common/unit.h | 2 +- configure | 50 +- data/Freeciv | 2 +- data/Makefile.in | 2 +- data/amplio2/moderncities.spec | 2 +- data/civ1/terrain.ruleset | 8 +- data/civ2/terrain.ruleset | 8 +- data/civ2civ3/terrain.ruleset | 8 +- data/classic/terrain.ruleset | 8 +- data/experimental/terrain.ruleset | 8 +- data/flags/convert_png | 3 +- data/multiplayer/terrain.ruleset | 8 +- data/nation/cuyavian.ruleset | 2 +- debian/changelog | 7 +- doc/FAQ | 20 +- fc_version | 6 +- server/maphand.c | 2 +- server/notify.c | 2 +- server/report.c | 3 +- server/savegame2.c | 2 +- server/scripting/tolua_fcdb_gen.h | 2 +- server/scripting/tolua_server_gen.c | 8 +- server/scripting/tolua_server_gen.h | 2 +- server/techtools.c | 2 +- server/unittools.c | 2 +- tools/modinst.c | 6 +- tools/mpdb.c | 4 +- translations/freeciv/ar.gmo | Bin 189776 -> 189776 bytes translations/freeciv/ar.po | 924 ++++++++++----------- translations/freeciv/bg.gmo | Bin 119153 -> 119153 bytes translations/freeciv/bg.po | 924 ++++++++++----------- translations/freeciv/ca.gmo | Bin 1025190 -> 1025178 bytes translations/freeciv/ca.po | 932 ++++++++++----------- translations/freeciv/cs.gmo | Bin 214369 -> 214369 bytes translations/freeciv/cs.po | 924 ++++++++++----------- translations/freeciv/da.gmo | Bin 564158 -> 564158 bytes translations/freeciv/da.po | 924 ++++++++++----------- translations/freeciv/de.gmo | Bin 1039392 -> 1039392 bytes translations/freeciv/de.po | 924 ++++++++++----------- translations/freeciv/el.gmo | Bin 245435 -> 245435 bytes translations/freeciv/el.po | 924 ++++++++++----------- translations/freeciv/en_GB.gmo | Bin 963421 -> 963421 bytes translations/freeciv/en_GB.po | 924 ++++++++++----------- translations/freeciv/eo.gmo | Bin 181680 -> 186184 bytes translations/freeciv/eo.po | 1339 +++++++++++++++--------------- translations/freeciv/es.gmo | Bin 1040861 -> 1040861 bytes translations/freeciv/es.po | 924 ++++++++++----------- translations/freeciv/et.gmo | Bin 227346 -> 227346 bytes translations/freeciv/et.po | 924 ++++++++++----------- translations/freeciv/fa.gmo | Bin 96047 -> 96047 bytes translations/freeciv/fa.po | 924 ++++++++++----------- translations/freeciv/fi.gmo | Bin 1017274 -> 1017282 bytes translations/freeciv/fi.po | 929 ++++++++++----------- translations/freeciv/fr.gmo | Bin 1053503 -> 1053503 bytes translations/freeciv/fr.po | 924 ++++++++++----------- translations/freeciv/freeciv.pot | 924 ++++++++++----------- translations/freeciv/ga.gmo | Bin 210575 -> 210575 bytes translations/freeciv/ga.po | 924 ++++++++++----------- translations/freeciv/gd.gmo | Bin 795164 -> 795164 bytes translations/freeciv/gd.po | 924 ++++++++++----------- translations/freeciv/he.gmo | Bin 97381 -> 97381 bytes translations/freeciv/he.po | 924 ++++++++++----------- translations/freeciv/hu.gmo | Bin 140436 -> 140436 bytes translations/freeciv/hu.po | 924 ++++++++++----------- translations/freeciv/id.gmo | Bin 215657 -> 215657 bytes translations/freeciv/id.po | 924 ++++++++++----------- translations/freeciv/it.gmo | Bin 473736 -> 473736 bytes translations/freeciv/it.po | 924 ++++++++++----------- translations/freeciv/ja.gmo | Bin 1061523 -> 1061523 bytes translations/freeciv/ja.po | 924 ++++++++++----------- translations/freeciv/ko.gmo | Bin 423510 -> 423510 bytes translations/freeciv/ko.po | 924 ++++++++++----------- translations/freeciv/lt.gmo | Bin 176634 -> 176634 bytes translations/freeciv/lt.po | 924 ++++++++++----------- translations/freeciv/nb.gmo | Bin 194184 -> 194184 bytes translations/freeciv/nb.po | 924 ++++++++++----------- translations/freeciv/nl.gmo | Bin 403468 -> 403468 bytes translations/freeciv/nl.po | 924 ++++++++++----------- translations/freeciv/pl.gmo | Bin 1011305 -> 1011318 bytes translations/freeciv/pl.po | 940 ++++++++++----------- translations/freeciv/pt.gmo | Bin 130372 -> 130372 bytes translations/freeciv/pt.po | 924 ++++++++++----------- translations/freeciv/pt_BR.gmo | Bin 430373 -> 430373 bytes translations/freeciv/pt_BR.po | 924 ++++++++++----------- translations/freeciv/ro.gmo | Bin 198183 -> 198183 bytes translations/freeciv/ro.po | 924 ++++++++++----------- translations/freeciv/ru.gmo | Bin 1402983 -> 1402916 bytes translations/freeciv/ru.po | 1027 ++++++++++++----------- translations/freeciv/sr.gmo | Bin 144669 -> 144669 bytes translations/freeciv/sr.po | 924 ++++++++++----------- translations/freeciv/sv.gmo | Bin 295260 -> 295260 bytes translations/freeciv/sv.po | 924 ++++++++++----------- translations/freeciv/tr.gmo | Bin 226460 -> 226460 bytes translations/freeciv/tr.po | 924 ++++++++++----------- translations/freeciv/uk.gmo | Bin 1273317 -> 1273317 bytes translations/freeciv/uk.po | 924 ++++++++++----------- translations/freeciv/zh_CN.gmo | Bin 164542 -> 164542 bytes translations/freeciv/zh_CN.po | 924 ++++++++++----------- translations/freeciv/zh_TW.gmo | Bin 98755 -> 98755 bytes translations/freeciv/zh_TW.po | 924 ++++++++++----------- translations/nations/ar.gmo | Bin 8073 -> 8073 bytes translations/nations/ar.po | 4 +- translations/nations/bg.gmo | Bin 25894 -> 25894 bytes translations/nations/bg.po | 4 +- translations/nations/ca.gmo | Bin 439414 -> 439414 bytes translations/nations/ca.po | 10 +- translations/nations/cs.gmo | Bin 14197 -> 14197 bytes translations/nations/cs.po | 4 +- translations/nations/da.gmo | Bin 136486 -> 136486 bytes translations/nations/da.po | 4 +- translations/nations/de.gmo | Bin 236240 -> 235924 bytes translations/nations/de.po | 5 +- translations/nations/el.gmo | Bin 16074 -> 16074 bytes translations/nations/el.po | 4 +- translations/nations/en_GB.gmo | Bin 430077 -> 430077 bytes translations/nations/en_GB.po | 10 +- translations/nations/eo.gmo | Bin 15121 -> 15121 bytes translations/nations/eo.po | 4 +- translations/nations/es.gmo | Bin 442471 -> 442145 bytes translations/nations/es.po | 5 +- translations/nations/et.gmo | Bin 22050 -> 22050 bytes translations/nations/et.po | 4 +- translations/nations/fa.gmo | Bin 9699 -> 9699 bytes translations/nations/fa.po | 4 +- translations/nations/fi.gmo | Bin 305593 -> 305262 bytes translations/nations/fi.po | 5 +- translations/nations/fr.gmo | Bin 449451 -> 449115 bytes translations/nations/fr.po | 5 +- translations/nations/freeciv-nations.pot | 4 +- translations/nations/ga.gmo | Bin 56909 -> 56909 bytes translations/nations/ga.po | 4 +- translations/nations/gd.gmo | Bin 332014 -> 332014 bytes translations/nations/gd.po | 4 +- translations/nations/he.gmo | Bin 8157 -> 8157 bytes translations/nations/he.po | 4 +- translations/nations/hu.gmo | Bin 5123 -> 5123 bytes translations/nations/hu.po | 4 +- translations/nations/id.gmo | Bin 93554 -> 93554 bytes translations/nations/id.po | 4 +- translations/nations/it.gmo | Bin 53432 -> 53432 bytes translations/nations/it.po | 4 +- translations/nations/ja.gmo | Bin 418701 -> 418348 bytes translations/nations/ja.po | 5 +- translations/nations/ko.gmo | Bin 24959 -> 24959 bytes translations/nations/ko.po | 4 +- translations/nations/lt.gmo | Bin 24700 -> 24700 bytes translations/nations/lt.po | 4 +- translations/nations/nb.gmo | Bin 6925 -> 6925 bytes translations/nations/nb.po | 4 +- translations/nations/nl.gmo | Bin 161899 -> 161568 bytes translations/nations/nl.po | 5 +- translations/nations/pl.gmo | Bin 441209 -> 441236 bytes translations/nations/pl.po | 12 +- translations/nations/pt.gmo | Bin 4689 -> 4689 bytes translations/nations/pt.po | 4 +- translations/nations/pt_BR.gmo | Bin 51623 -> 51623 bytes translations/nations/pt_BR.po | 4 +- translations/nations/ro.gmo | Bin 6126 -> 6126 bytes translations/nations/ro.po | 4 +- translations/nations/ru.gmo | Bin 622952 -> 622952 bytes translations/nations/ru.po | 12 +- translations/nations/sr.gmo | Bin 7910 -> 7910 bytes translations/nations/sr.po | 4 +- translations/nations/sv.gmo | Bin 32739 -> 32739 bytes translations/nations/sv.po | 4 +- translations/nations/tr.gmo | Bin 10641 -> 10641 bytes translations/nations/tr.po | 4 +- translations/nations/uk.gmo | Bin 154729 -> 154729 bytes translations/nations/uk.po | 4 +- translations/nations/zh_CN.gmo | Bin 12197 -> 12197 bytes translations/nations/zh_CN.po | 4 +- translations/nations/zh_TW.gmo | Bin 33649 -> 33649 bytes translations/nations/zh_TW.po | 4 +- win32/installer/Makefile | 2 +- 195 files changed, 17979 insertions(+), 17615 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freeciv.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits