[freeciv] 02/02: Merge branch 'master' into jessie-backports

Markus Koschany apo at moszumanska.debian.org
Wed May 25 20:19:12 UTC 2016


This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch jessie-backports
in repository freeciv.

commit 8fefe8db48eece2cb8a59fdf28c0b66762c715dc
Merge: a81ea27 17b9bff
Author: Markus Koschany <apo at debian.org>
Date:   Wed May 25 22:17:08 2016 +0200

    Merge branch 'master' into jessie-backports

 ChangeLog                                          | 2172 ++++-
 Makefile.am                                        |    5 +-
 Makefile.in                                        |   13 +-
 NEWS-2.5                                           |  203 +-
 aclocal.m4                                         | 8607 +-------------------
 ai/Makefile.in                                     |    7 +-
 ai/classic/Makefile.in                             |    7 +-
 ai/classic/classicai.h                             |    6 +-
 ai/default/Makefile.in                             |    7 +-
 ai/default/advdiplomacy.c                          |  312 +-
 ai/default/aicity.c                                |   32 +-
 ai/default/aiparatrooper.c                         |    2 +-
 ai/default/aisettler.c                             |   14 +-
 ai/default/aiunit.c                                |    7 +
 ai/stub/Makefile.in                                |    7 +-
 ai/threaded/Makefile.in                            |    7 +-
 autogen.sh                                         |    7 +
 client/Makefile.in                                 |    7 +-
 client/agents/Makefile.in                          |    7 +-
 client/chatline_common.c                           |   11 +-
 client/chatline_common.h                           |    2 +-
 client/client_main.c                               |   10 +
 client/clinet.c                                    |   11 +-
 client/connectdlg_common.c                         |  128 +-
 client/connectdlg_common.h                         |    7 +-
 client/control.c                                   |    2 +-
 client/editor.c                                    |   34 +-
 client/editor.h                                    |    8 +-
 client/gui-gtk-2.0/Makefile.in                     |    7 +-
 client/gui-gtk-2.0/cma_fe.c                        |   10 +-
 client/gui-gtk-2.0/editgui.c                       |    4 +-
 client/gui-gtk-2.0/editprop.c                      |   10 +-
 client/gui-gtk-2.0/gui_main.c                      |    2 +-
 client/gui-gtk-2.0/gui_stuff.c                     |    6 +-
 client/gui-gtk-2.0/pages.c                         |    6 +-
 client/gui-gtk-2.0/themes.c                        |    4 +-
 client/gui-gtk-3.0/Makefile.in                     |    7 +-
 client/gui-gtk-3.0/citydlg.c                       |   31 +-
 client/gui-gtk-3.0/cityrep.c                       |    4 +-
 client/gui-gtk-3.0/cma_fe.c                        |   20 +-
 client/gui-gtk-3.0/dialogs.c                       |    6 +-
 client/gui-gtk-3.0/diplodlg.c                      |   12 +-
 client/gui-gtk-3.0/editgui.c                       |   16 +-
 client/gui-gtk-3.0/editprop.c                      |   36 +-
 client/gui-gtk-3.0/gtkpixcomm.c                    |   75 +-
 client/gui-gtk-3.0/gtkpixcomm.h                    |    4 +-
 client/gui-gtk-3.0/gui_main.c                      |   63 +-
 client/gui-gtk-3.0/gui_stuff.c                     |   19 +-
 client/gui-gtk-3.0/happiness.c                     |   16 +-
 client/gui-gtk-3.0/helpdlg.c                       |    7 +-
 client/gui-gtk-3.0/inteldlg.c                      |    6 +-
 client/gui-gtk-3.0/pages.c                         |   27 +-
 client/gui-gtk-3.0/repodlgs.c                      |    7 +-
 client/gui-gtk-3.0/spaceshipdlg.c                  |    3 +-
 client/gui-gtk-3.0/voteinfo_bar.c                  |   32 +-
 client/gui-qt/Makefile.in                          |    7 +-
 client/gui-qt/chatline.cpp                         |    3 +
 client/gui-qt/diplodlg.cpp                         |    1 +
 client/gui-qt/fc_client.cpp                        |    5 +-
 client/gui-qt/menu.cpp                             |   34 +-
 client/gui-qt/menu.h                               |    6 +-
 client/gui-qt/pages.cpp                            |    4 +-
 client/gui-qt/plrdlg.cpp                           |   34 +-
 client/gui-qt/plrdlg.h                             |    2 +
 client/gui-sdl/Makefile.in                         |    7 +-
 client/gui-sdl/connectdlg.c                        |    2 +-
 client/gui-sdl/gui_id.h                            |    1 +
 client/gui-sdl/gui_main.c                          |    6 +-
 client/gui-sdl/helpdlg.c                           |   10 +-
 client/gui-sdl/helpdlg.h                           |    3 +
 client/gui-sdl/optiondlg.c                         |   24 +
 client/gui-sdl/pages.c                             |    2 +-
 client/gui-sdl/plrdlg.c                            |   10 +-
 client/gui-sdl/wldlg.c                             |   13 +-
 client/gui-stub/Makefile.in                        |    7 +-
 client/gui-xaw/Freeciv.h                           |    2 +-
 client/gui-xaw/Makefile.in                         |    7 +-
 client/helpdata.c                                  |   49 +-
 client/include/Makefile.in                         |    7 +-
 client/luascript/Makefile.in                       |    7 +-
 client/luascript/tolua_client_gen.h                |    2 +-
 client/mapctrl_common.c                            |    4 +-
 client/mapctrl_common.h                            |    2 +-
 client/mapview_common.h                            |    4 +-
 client/options.c                                   |   12 +-
 client/packhand.c                                  |   40 +-
 client/servers.c                                   |    7 +
 client/text.c                                      |    4 +-
 client/text.h                                      |    2 +-
 client/tilespec.c                                  |   33 +-
 common/Makefile.in                                 |    7 +-
 common/aicore/Makefile.in                          |    7 +-
 common/city.c                                      |   31 +-
 common/connection.c                                |    6 +-
 common/dataio.c                                    |    6 +-
 common/featured_text.c                             |    8 +-
 common/game.c                                      |    2 +
 common/generate_packets.py                         |   44 +-
 common/map.c                                       |   97 +-
 common/map.h                                       |   32 +-
 common/mapimg.c                                    |    3 +-
 common/packets.c                                   |    6 +-
 common/packets.def                                 |    9 +-
 common/packets_gen.c                               | 1558 +++-
 common/packets_gen.h                               |    3 +
 common/player.c                                    |   10 +-
 common/player.h                                    |   10 +-
 common/requirements.c                              |   11 +-
 common/scriptcore/Makefile.in                      |    7 +-
 common/scriptcore/luascript.c                      |    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/tech.c                                      |    4 +-
 common/tile.c                                      |    5 +-
 common/unit.c                                      |   25 +-
 common/unit.h                                      |    5 +-
 common/unittype.h                                  |   11 +-
 configure                                          |  375 +-
 configure.ac                                       |   68 +-
 data/Freeciv                                       |    2 +-
 data/Makefile.am                                   |    8 -
 data/Makefile.in                                   |   62 +-
 data/amplio2/Makefile.in                           |    7 +-
 data/buildings/Makefile.in                         |    7 +-
 data/cimpletoon/Makefile.in                        |    7 +-
 data/civ1/Makefile.in                              |    7 +-
 data/civ1/buildings.ruleset                        |   10 +-
 data/civ1/script.lua                               |    5 +
 data/civ1/techs.ruleset                            |    5 +-
 data/civ1/terrain.ruleset                          |   21 +-
 data/civ1/units.ruleset                            |   37 +-
 data/civ2/Makefile.in                              |    7 +-
 data/civ2/buildings.ruleset                        |   12 +-
 data/civ2/script.lua                               |    5 +
 data/civ2/techs.ruleset                            |    5 +-
 data/civ2/terrain.ruleset                          |   20 +-
 data/civ2/units.ruleset                            |   38 +-
 data/civ2civ3/Makefile.in                          |    7 +-
 data/civ2civ3/buildings.ruleset                    |   14 +-
 data/civ2civ3/game.ruleset                         |    2 -
 data/civ2civ3/script.lua                           |    8 +-
 data/civ2civ3/techs.ruleset                        |    5 +-
 data/civ2civ3/terrain.ruleset                      |   20 +-
 data/civ2civ3/units.ruleset                        |   44 +-
 data/classic/Makefile.in                           |    7 +-
 data/classic/buildings.ruleset                     |   12 +-
 data/classic/script.lua                            |    8 +-
 data/classic/techs.ruleset                         |    5 +-
 data/classic/terrain.ruleset                       |   20 +-
 data/classic/units.ruleset                         |   44 +-
 data/default/Makefile.in                           |    7 +-
 data/experimental/Makefile.in                      |    7 +-
 data/experimental/buildings.ruleset                |   12 +-
 data/experimental/effects.ruleset                  |   73 +-
 data/experimental/script.lua                       |    6 +
 data/experimental/techs.ruleset                    |    5 +-
 data/experimental/terrain.ruleset                  |   20 +-
 data/experimental/units.ruleset                    |   44 +-
 data/flags/Makefile.in                             |    7 +-
 data/helpdata.txt                                  |   22 +-
 data/hex2t.tilespec                                |    6 -
 data/hex2t/Makefile.in                             |    7 +-
 data/icons/Makefile.in                             |    7 +-
 data/isophex.tilespec                              |    6 -
 data/isophex/Makefile.in                           |    7 +-
 data/isotrident/Makefile.in                        |    7 +-
 data/misc/Makefile.in                              |    7 +-
 data/multiplayer/Makefile.in                       |    7 +-
 data/multiplayer/buildings.ruleset                 |   12 +-
 data/multiplayer/script.lua                        |    6 +
 data/multiplayer/techs.ruleset                     |    5 +-
 data/multiplayer/terrain.ruleset                   |   20 +-
 data/multiplayer/units.ruleset                     |   44 +-
 data/nation/Makefile.in                            |    7 +-
 data/scenarios/Makefile.in                         |    7 +-
 data/scenarios/tutorial.sav                        |   60 +-
 data/stdsounds/Makefile.in                         |    7 +-
 data/themes/Makefile.in                            |    7 +-
 data/themes/gui-gtk-2.0/Freeciv/Makefile.in        |    7 +-
 .../gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.in |    7 +-
 .../Freeciv/gtk-2.0/Buttons/Makefile.in            |    7 +-
 .../Freeciv/gtk-2.0/Check-Radio/Makefile.in        |    7 +-
 .../gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.in  |    7 +-
 .../Freeciv/gtk-2.0/Frame-Gap/Makefile.in          |    7 +-
 .../Freeciv/gtk-2.0/Handles/Makefile.in            |    7 +-
 .../gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.in  |    7 +-
 .../Freeciv/gtk-2.0/ListHeaders/Makefile.in        |    7 +-
 .../themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.in |    7 +-
 .../Freeciv/gtk-2.0/Menu-Menubar/Makefile.in       |    7 +-
 .../gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.in |    7 +-
 .../gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.in  |    7 +-
 .../Freeciv/gtk-2.0/ProgressBar/Makefile.in        |    7 +-
 .../gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.in  |    7 +-
 .../Freeciv/gtk-2.0/Scrollbars/Makefile.in         |    7 +-
 .../Freeciv/gtk-2.0/Shadows/Makefile.in            |    7 +-
 .../gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.in   |    7 +-
 .../gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.in   |    7 +-
 .../Freeciv/gtk-2.0/Toolbar/Makefile.in            |    7 +-
 data/themes/gui-gtk-2.0/Makefile.in                |    7 +-
 data/themes/gui-gtk-3.0/Freeciv/Makefile.in        |    7 +-
 .../gui-gtk-3.0/Freeciv/gtk-3.0/Arrows/Makefile.in |    7 +-
 .../Freeciv/gtk-3.0/Buttons/Makefile.in            |    7 +-
 .../Freeciv/gtk-3.0/Check-Radio/Makefile.in        |    7 +-
 .../gui-gtk-3.0/Freeciv/gtk-3.0/Combo/Makefile.in  |    7 +-
 .../Freeciv/gtk-3.0/Frame-Gap/Makefile.in          |    7 +-
 .../Freeciv/gtk-3.0/Handles/Makefile.in            |    7 +-
 .../gui-gtk-3.0/Freeciv/gtk-3.0/Lines/Makefile.in  |    7 +-
 .../Freeciv/gtk-3.0/ListHeaders/Makefile.in        |    7 +-
 .../themes/gui-gtk-3.0/Freeciv/gtk-3.0/Makefile.in |    7 +-
 .../Freeciv/gtk-3.0/Menu-Menubar/Makefile.in       |    7 +-
 .../gui-gtk-3.0/Freeciv/gtk-3.0/Others/Makefile.in |    7 +-
 .../gui-gtk-3.0/Freeciv/gtk-3.0/Panel/Makefile.in  |    7 +-
 .../Freeciv/gtk-3.0/ProgressBar/Makefile.in        |    7 +-
 .../gui-gtk-3.0/Freeciv/gtk-3.0/Range/Makefile.in  |    7 +-
 .../Freeciv/gtk-3.0/Scrollbars/Makefile.in         |    7 +-
 .../Freeciv/gtk-3.0/Shadows/Makefile.in            |    7 +-
 .../gui-gtk-3.0/Freeciv/gtk-3.0/Spin/Makefile.in   |    7 +-
 .../gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/Makefile.in   |    7 +-
 .../Freeciv/gtk-3.0/Toolbar/Makefile.in            |    7 +-
 data/themes/gui-gtk-3.0/Freeciv/gtk-3.0/gtk.css    |    2 +-
 data/themes/gui-gtk-3.0/Makefile.in                |    7 +-
 data/themes/gui-qt/Makefile.in                     |    7 +-
 data/themes/gui-qt/icons/Makefile.in               |    7 +-
 data/themes/gui-sdl/Makefile.in                    |    7 +-
 data/themes/gui-sdl/human/Makefile.in              |    7 +-
 data/trident/Makefile.in                           |    7 +-
 data/trident/fog.spec                              |    3 +
 data/wonders/Makefile.in                           |    7 +-
 debian/changelog                                   |   11 +-
 debian/control                                     |    4 +-
 dependencies/Makefile.in                           |    7 +-
 dependencies/cvercmp/Makefile.in                   |    7 +-
 dependencies/cvercmp/cvercmp.c                     |   16 +-
 dependencies/lua-5.2/Makefile.in                   |    7 +-
 dependencies/lua-5.2/src/Makefile.in               |    7 +-
 dependencies/luasql/Makefile.in                    |    7 +-
 dependencies/luasql/src/Makefile.in                |    7 +-
 dependencies/tolua-5.2/Makefile.in                 |    7 +-
 dependencies/tolua-5.2/src/Makefile.in             |    7 +-
 dependencies/tolua-5.2/src/bin/Makefile.in         |    7 +-
 dependencies/tolua-5.2/src/lib/Makefile.in         |    7 +-
 doc/Makefile.in                                    |    7 +-
 doc/README.AI                                      |    2 +-
 doc/README.rulesets                                |    7 +
 doc/ca/Makefile.in                                 |    7 +-
 doc/de/Makefile.in                                 |    7 +-
 doc/fr/Makefile.in                                 |    7 +-
 doc/it/Makefile.in                                 |    7 +-
 doc/ja/Makefile.in                                 |    7 +-
 doc/man/Makefile.in                                |    7 +-
 doc/man/freeciv-modpack.6.in                       |   15 +-
 doc/nl/Makefile.in                                 |    7 +-
 doc/sv/Makefile.in                                 |    7 +-
 fc_config.h.in                                     |    9 +
 fc_version                                         |    6 +-
 lua/Makefile.am                                    |   15 +
 {data/cimpletoon => lua}/Makefile.in               |   59 +-
 {data => lua}/database.lua                         |    0
 m4/ac_path_lib.m4                                  |    6 +-
 m4/debug.m4                                        |    4 +-
 m4/gtk-2.0.m4                                      |    2 +-
 m4/gtk-3.0.m4                                      |    2 +-
 m4/imlib.m4                                        |    4 +-
 aclocal.m4 => m4/libtool.m4                        | 1842 +----
 m4/ltoptions.m4                                    |  384 +
 m4/ltsugar.m4                                      |  123 +
 m4/ltversion.m4                                    |   23 +
 m4/lt~obsolete.m4                                  |   98 +
 m4/qt5-darwin.m4                                   |   60 +-
 m4/sdl.m4                                          |    2 +-
 m4/sdl2.m4                                         |    2 +-
 m4/sqlite3.m4                                      |    2 +-
 server/Makefile.in                                 |    7 +-
 server/advisors/Makefile.in                        |    7 +-
 server/advisors/advbuilding.c                      |    5 +-
 server/auth.c                                      |    3 +-
 server/citytools.c                                 |   12 +-
 server/cityturn.c                                  |   13 +-
 server/civserver.c                                 |    7 +
 server/diplhand.c                                  |    3 +-
 server/gamehand.c                                  |   33 +-
 server/gamehand.h                                  |    4 +-
 server/generator/Makefile.in                       |    7 +-
 server/maphand.c                                   |   51 +-
 server/maphand.h                                   |    5 +-
 server/meta.c                                      |    9 +-
 server/notify.c                                    |   36 +-
 server/report.c                                    |    3 +-
 server/rssanity.c                                  |   22 +
 server/savegame.c                                  |  561 +-
 server/savegame2.c                                 |   26 +-
 server/scripting/Makefile.in                       |    7 +-
 server/scripting/tolua_fcdb_gen.h                  |    2 +-
 server/scripting/tolua_server_gen.c                |    8 +-
 server/scripting/tolua_server_gen.h                |    2 +-
 server/sernet.c                                    |    9 +-
 server/srv_main.c                                  |   26 +-
 server/stdinhand.c                                 |   25 +-
 server/stdinhand.h                                 |    4 +-
 server/unithand.c                                  |   31 +-
 server/unithand.h                                  |    5 +
 server/unittools.c                                 |    5 +-
 tests/Makefile.am                                  |    2 +-
 tests/Makefile.in                                  |    9 +-
 tests/header_guard.sh                              |    4 +-
 tools/Makefile.in                                  |    7 +-
 tools/modinst.c                                    |    5 +-
 tools/modinst.h                                    |    2 +-
 tools/mpcli.c                                      |    7 +-
 tools/mpcmdline.c                                  |   26 +
 tools/mpgui_gtk2.c                                 |    4 +-
 tools/mpgui_gtk3.c                                 |    4 +-
 tools/mpgui_qt.cpp                                 |    4 +-
 translations/Makefile.in                           |    7 +-
 translations/freeciv/ar.gmo                        |  Bin 190318 -> 190167 bytes
 translations/freeciv/ar.po                         | 7643 ++++++++---------
 translations/freeciv/bg.gmo                        |  Bin 119916 -> 119624 bytes
 translations/freeciv/bg.po                         | 7640 ++++++++---------
 translations/freeciv/ca.gmo                        |  Bin 1016954 -> 1007410 bytes
 translations/freeciv/ca.po                         | 7694 ++++++++---------
 translations/freeciv/cs.gmo                        |  Bin 216311 -> 215991 bytes
 translations/freeciv/cs.po                         | 7641 ++++++++---------
 translations/freeciv/da.gmo                        |  Bin 575798 -> 570712 bytes
 translations/freeciv/da.po                         | 7653 ++++++++---------
 translations/freeciv/de.gmo                        |  Bin 1020418 -> 1010504 bytes
 translations/freeciv/de.po                         | 7669 ++++++++---------
 translations/freeciv/el.gmo                        |  Bin 253791 -> 247758 bytes
 translations/freeciv/el.po                         | 7639 ++++++++---------
 translations/freeciv/en_GB.gmo                     |  Bin 955737 -> 960479 bytes
 translations/freeciv/en_GB.po                      | 7741 +++++++++---------
 translations/freeciv/eo.gmo                        |  Bin 178311 -> 177959 bytes
 translations/freeciv/eo.po                         | 7641 ++++++++---------
 translations/freeciv/es.gmo                        |  Bin 1032518 -> 1037529 bytes
 translations/freeciv/es.po                         | 7805 +++++++++---------
 translations/freeciv/et.gmo                        |  Bin 230960 -> 229190 bytes
 translations/freeciv/et.po                         | 7643 ++++++++---------
 translations/freeciv/fa.gmo                        |  Bin 96177 -> 96136 bytes
 translations/freeciv/fa.po                         | 7635 ++++++++---------
 translations/freeciv/fi.gmo                        |  Bin 1008537 -> 1013862 bytes
 translations/freeciv/fi.po                         | 7899 +++++++++---------
 translations/freeciv/fr.gmo                        |  Bin 1044663 -> 1050222 bytes
 translations/freeciv/fr.po                         | 7841 +++++++++---------
 translations/freeciv/freeciv.pot                   | 7616 ++++++++---------
 translations/freeciv/ga.gmo                        |  Bin 211246 -> 210989 bytes
 translations/freeciv/ga.po                         | 7638 ++++++++---------
 translations/freeciv/gd.gmo                        |  Bin 809615 -> 802213 bytes
 translations/freeciv/gd.po                         | 7667 ++++++++---------
 translations/freeciv/he.gmo                        |  Bin 97796 -> 97655 bytes
 translations/freeciv/he.po                         | 7636 ++++++++---------
 translations/freeciv/hu.gmo                        |  Bin 142936 -> 141202 bytes
 translations/freeciv/hu.po                         | 7642 ++++++++---------
 translations/freeciv/id.gmo                        |  Bin 217456 -> 216538 bytes
 translations/freeciv/id.po                         | 7645 ++++++++---------
 translations/freeciv/it.gmo                        |  Bin 482217 -> 476916 bytes
 translations/freeciv/it.po                         | 7649 ++++++++---------
 translations/freeciv/ja.gmo                        |  Bin 1003347 -> 992757 bytes
 translations/freeciv/ja.po                         | 7665 ++++++++---------
 translations/freeciv/ko.gmo                        |  Bin 435524 -> 429513 bytes
 translations/freeciv/ko.po                         | 7645 ++++++++---------
 translations/freeciv/lt.gmo                        |  Bin 177647 -> 177385 bytes
 translations/freeciv/lt.po                         | 7638 ++++++++---------
 translations/freeciv/nb.gmo                        |  Bin 196081 -> 195777 bytes
 translations/freeciv/nb.po                         | 7641 ++++++++---------
 translations/freeciv/nl.gmo                        |  Bin 408645 -> 406987 bytes
 translations/freeciv/nl.po                         | 7654 ++++++++---------
 translations/freeciv/pl.gmo                        |  Bin 917140 -> 908697 bytes
 translations/freeciv/pl.po                         | 7666 ++++++++---------
 translations/freeciv/pt.gmo                        |  Bin 131169 -> 131013 bytes
 translations/freeciv/pt.po                         | 7640 ++++++++---------
 translations/freeciv/pt_BR.gmo                     |  Bin 436960 -> 432375 bytes
 translations/freeciv/pt_BR.po                      | 7644 ++++++++---------
 translations/freeciv/ro.gmo                        |  Bin 199364 -> 199037 bytes
 translations/freeciv/ro.po                         | 7643 ++++++++---------
 translations/freeciv/ru.gmo                        |  Bin 1390374 -> 1387938 bytes
 translations/freeciv/ru.po                         | 7992 +++++++++---------
 translations/freeciv/sr.gmo                        |  Bin 145448 -> 145162 bytes
 translations/freeciv/sr.po                         | 7640 ++++++++---------
 translations/freeciv/sv.gmo                        |  Bin 299234 -> 297238 bytes
 translations/freeciv/sv.po                         | 7643 ++++++++---------
 translations/freeciv/tr.gmo                        |  Bin 230087 -> 228285 bytes
 translations/freeciv/tr.po                         | 7643 ++++++++---------
 translations/freeciv/uk.gmo                        |  Bin 516176 -> 515471 bytes
 translations/freeciv/uk.po                         | 7640 ++++++++---------
 translations/freeciv/zh_CN.gmo                     |  Bin 165709 -> 165500 bytes
 translations/freeciv/zh_CN.po                      | 7641 ++++++++---------
 translations/freeciv/zh_TW.gmo                     |  Bin 99138 -> 98755 bytes
 translations/freeciv/zh_TW.po                      | 7641 ++++++++---------
 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 439462 -> 439462 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 236328 -> 236328 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 430139 -> 430139 bytes
 translations/nations/en_GB.po                      |    2 +-
 translations/nations/eo.gmo                        |  Bin 15192 -> 15192 bytes
 translations/nations/eo.po                         |    2 +-
 translations/nations/es.gmo                        |  Bin 442542 -> 442542 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 275709 -> 277433 bytes
 translations/nations/fi.po                         |  110 +-
 translations/nations/fr.gmo                        |  Bin 449518 -> 449518 bytes
 translations/nations/fr.po                         |    2 +-
 translations/nations/freeciv-nations.pot           |    2 +-
 translations/nations/ga.gmo                        |  Bin 57007 -> 57007 bytes
 translations/nations/ga.po                         |    2 +-
 translations/nations/gd.gmo                        |  Bin 332115 -> 332115 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 93658 -> 93658 bytes
 translations/nations/id.po                         |    2 +-
 translations/nations/it.gmo                        |  Bin 53499 -> 53499 bytes
 translations/nations/it.po                         |    2 +-
 translations/nations/ja.gmo                        |  Bin 411935 -> 411935 bytes
 translations/nations/ja.po                         |    2 +-
 translations/nations/ko.gmo                        |  Bin 25039 -> 25039 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 161986 -> 161986 bytes
 translations/nations/nl.po                         |    2 +-
 translations/nations/pl.gmo                        |  Bin 441176 -> 441176 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 622771 -> 622771 bytes
 translations/nations/ru.po                         |    2 +-
 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 83765 -> 83765 bytes
 translations/nations/uk.po                         |    2 +-
 translations/nations/zh_CN.gmo                     |  Bin 12245 -> 12245 bytes
 translations/nations/zh_CN.po                      |    2 +-
 translations/nations/zh_TW.gmo                     |  Bin 33758 -> 33758 bytes
 translations/nations/zh_TW.po                      |    2 +-
 utility/Makefile.in                                |    7 +-
 utility/fcbacktrace.h                              |    8 +
 utility/fcthread.h                                 |   10 +
 utility/genlist.c                                  |   31 -
 utility/genlist.h                                  |   38 +-
 utility/ioz.c                                      |   34 +-
 utility/log.c                                      |    2 +-
 utility/netfile.c                                  |   24 +-
 utility/netintf.c                                  |    6 +-
 utility/netintf.h                                  |    6 +-
 utility/registry_ini.c                             |   14 +-
 utility/section_file.c                             |    2 +-
 utility/shared.c                                   |   21 +-
 utility/shared.h                                   |    4 +
 utility/support.c                                  |   74 +-
 win32/Makefile.am                                  |    1 +
 win32/Makefile.in                                  |    8 +-
 win32/installer/Makefile                           |    4 +-
 win32/installer/create-freeciv-gtk-qt-nsi.sh       |    2 +-
 win32/installer/create-freeciv-sdl-nsi.sh          |    2 +-
 win32/installer/licenses/COPYING.installer         |  346 +
 484 files changed, 152179 insertions(+), 152509 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