[freeciv] 01/03: New upstream version 2.5.9

Markus Koschany apo at moszumanska.debian.org
Sat Aug 19 16:17:55 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 68496acee914aef6c0ba78019e3fdde5046181bb
Author: Markus Koschany <apo at debian.org>
Date:   Sat Aug 19 17:54:57 2017 +0200

    New upstream version 2.5.9
---
 ChangeLog                                |  79 +++++++++++++++++++++++++++++++
 NEWS-2.5                                 |  16 ++++++-
 client/gui-xaw/Freeciv.h                 |   2 +-
 client/luascript/tolua_client_gen.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 +-
 configure                                |  22 ++++-----
 data/Freeciv                             |   2 +-
 data/nation/muskogee.ruleset             |   2 +-
 doc/FAQ                                  |  20 ++++----
 fc_version                               |   2 +-
 server/report.c                          |   2 +-
 server/scripting/tolua_fcdb_gen.h        |   2 +-
 server/scripting/tolua_server_gen.c      |   6 +--
 server/scripting/tolua_server_gen.h      |   2 +-
 translations/freeciv/ar.gmo              | Bin 189776 -> 189776 bytes
 translations/freeciv/ar.po               |   2 +-
 translations/freeciv/bg.gmo              | Bin 119283 -> 119283 bytes
 translations/freeciv/bg.po               |   2 +-
 translations/freeciv/ca.gmo              | Bin 1024904 -> 1024908 bytes
 translations/freeciv/ca.po               |  10 ++--
 translations/freeciv/cs.gmo              | Bin 214424 -> 214424 bytes
 translations/freeciv/cs.po               |   2 +-
 translations/freeciv/da.gmo              | Bin 564213 -> 564213 bytes
 translations/freeciv/da.po               |   2 +-
 translations/freeciv/de.gmo              | Bin 1039438 -> 1039438 bytes
 translations/freeciv/de.po               |   2 +-
 translations/freeciv/el.gmo              | Bin 245435 -> 245435 bytes
 translations/freeciv/el.po               |   2 +-
 translations/freeciv/en_GB.gmo           | Bin 963187 -> 963187 bytes
 translations/freeciv/en_GB.po            |   2 +-
 translations/freeciv/eo.gmo              | Bin 176326 -> 176326 bytes
 translations/freeciv/eo.po               |   2 +-
 translations/freeciv/es.gmo              | Bin 1039931 -> 1039931 bytes
 translations/freeciv/es.po               |   2 +-
 translations/freeciv/et.gmo              | Bin 227404 -> 227404 bytes
 translations/freeciv/et.po               |   2 +-
 translations/freeciv/fa.gmo              | Bin 96047 -> 96047 bytes
 translations/freeciv/fa.po               |   2 +-
 translations/freeciv/fi.gmo              | Bin 1017009 -> 1017009 bytes
 translations/freeciv/fi.po               |   2 +-
 translations/freeciv/fr.gmo              | Bin 1053243 -> 1053243 bytes
 translations/freeciv/fr.po               |   2 +-
 translations/freeciv/freeciv.pot         |   2 +-
 translations/freeciv/ga.gmo              | Bin 210632 -> 210632 bytes
 translations/freeciv/ga.po               |   2 +-
 translations/freeciv/gd.gmo              | Bin 795231 -> 795231 bytes
 translations/freeciv/gd.po               |   2 +-
 translations/freeciv/he.gmo              | Bin 97381 -> 97381 bytes
 translations/freeciv/he.po               |   2 +-
 translations/freeciv/hu.gmo              | Bin 140436 -> 140436 bytes
 translations/freeciv/hu.po               |   2 +-
 translations/freeciv/id.gmo              | Bin 215702 -> 215702 bytes
 translations/freeciv/id.po               |   2 +-
 translations/freeciv/it.gmo              | Bin 473783 -> 473783 bytes
 translations/freeciv/it.po               |   2 +-
 translations/freeciv/ja.gmo              | Bin 1061577 -> 1061577 bytes
 translations/freeciv/ja.po               |   2 +-
 translations/freeciv/ko.gmo              | Bin 423510 -> 423510 bytes
 translations/freeciv/ko.po               |   2 +-
 translations/freeciv/lt.gmo              | Bin 176692 -> 176692 bytes
 translations/freeciv/lt.po               |   2 +-
 translations/freeciv/nb.gmo              | Bin 194184 -> 194184 bytes
 translations/freeciv/nb.po               |   2 +-
 translations/freeciv/nl.gmo              | Bin 403468 -> 403468 bytes
 translations/freeciv/nl.po               |   2 +-
 translations/freeciv/pl.gmo              | Bin 899271 -> 899271 bytes
 translations/freeciv/pl.po               |   2 +-
 translations/freeciv/pt.gmo              | Bin 130372 -> 130372 bytes
 translations/freeciv/pt.po               |   2 +-
 translations/freeciv/pt_BR.gmo           | Bin 430420 -> 430420 bytes
 translations/freeciv/pt_BR.po            |   2 +-
 translations/freeciv/ro.gmo              | Bin 198183 -> 198183 bytes
 translations/freeciv/ro.po               |   2 +-
 translations/freeciv/ru.gmo              | Bin 1402076 -> 1402050 bytes
 translations/freeciv/ru.po               |  58 ++++++++++-------------
 translations/freeciv/sr.gmo              | Bin 144669 -> 144669 bytes
 translations/freeciv/sr.po               |   2 +-
 translations/freeciv/sv.gmo              | Bin 295308 -> 295308 bytes
 translations/freeciv/sv.po               |   2 +-
 translations/freeciv/tr.gmo              | Bin 226460 -> 226460 bytes
 translations/freeciv/tr.po               |   2 +-
 translations/freeciv/uk.gmo              | Bin 1273375 -> 1273375 bytes
 translations/freeciv/uk.po               |   2 +-
 translations/freeciv/zh_CN.gmo           | Bin 164542 -> 164542 bytes
 translations/freeciv/zh_CN.po            |   2 +-
 translations/freeciv/zh_TW.gmo           | Bin 98755 -> 98755 bytes
 translations/freeciv/zh_TW.po            |   2 +-
 translations/nations/ar.gmo              | Bin 8111 -> 8073 bytes
 translations/nations/ar.po               |   9 ++--
 translations/nations/bg.gmo              | Bin 25942 -> 25894 bytes
 translations/nations/bg.po               |   9 ++--
 translations/nations/ca.gmo              | Bin 439480 -> 439414 bytes
 translations/nations/ca.po               |   9 ++--
 translations/nations/cs.gmo              | Bin 14232 -> 14197 bytes
 translations/nations/cs.po               |   9 ++--
 translations/nations/da.gmo              | Bin 136522 -> 136486 bytes
 translations/nations/da.po               |   9 ++--
 translations/nations/de.gmo              | Bin 236278 -> 236240 bytes
 translations/nations/de.po               |   9 ++--
 translations/nations/el.gmo              | Bin 16120 -> 16074 bytes
 translations/nations/el.po               |   9 ++--
 translations/nations/en_GB.gmo           | Bin 430143 -> 430077 bytes
 translations/nations/en_GB.po            |   9 ++--
 translations/nations/eo.gmo              | Bin 15192 -> 15121 bytes
 translations/nations/eo.po               |   9 ++--
 translations/nations/es.gmo              | Bin 442543 -> 442471 bytes
 translations/nations/es.po               |   9 ++--
 translations/nations/et.gmo              | Bin 22087 -> 22050 bytes
 translations/nations/et.po               |   9 ++--
 translations/nations/fa.gmo              | Bin 9777 -> 9699 bytes
 translations/nations/fa.po               |   9 ++--
 translations/nations/fi.gmo              | Bin 305650 -> 305593 bytes
 translations/nations/fi.po               |   9 ++--
 translations/nations/fr.gmo              | Bin 449519 -> 449451 bytes
 translations/nations/fr.po               |   9 ++--
 translations/nations/freeciv-nations.pot |   6 +--
 translations/nations/ga.gmo              | Bin 56956 -> 56909 bytes
 translations/nations/ga.po               |   9 ++--
 translations/nations/gd.gmo              | Bin 332059 -> 332014 bytes
 translations/nations/gd.po               |   9 ++--
 translations/nations/he.gmo              | Bin 8205 -> 8157 bytes
 translations/nations/he.po               |   9 ++--
 translations/nations/hu.gmo              | Bin 5157 -> 5123 bytes
 translations/nations/hu.po               |   9 ++--
 translations/nations/id.gmo              | Bin 93595 -> 93554 bytes
 translations/nations/id.po               |   9 ++--
 translations/nations/it.gmo              | Bin 53499 -> 53432 bytes
 translations/nations/it.po               |   9 ++--
 translations/nations/ja.gmo              | Bin 418742 -> 418701 bytes
 translations/nations/ja.po               |   9 ++--
 translations/nations/ko.gmo              | Bin 24991 -> 24959 bytes
 translations/nations/ko.po               |   9 ++--
 translations/nations/lt.gmo              | Bin 24758 -> 24700 bytes
 translations/nations/lt.po               |   9 ++--
 translations/nations/nb.gmo              | Bin 6977 -> 6925 bytes
 translations/nations/nb.po               |   9 ++--
 translations/nations/nl.gmo              | Bin 161936 -> 161899 bytes
 translations/nations/nl.po               |   9 ++--
 translations/nations/pl.gmo              | Bin 441094 -> 441056 bytes
 translations/nations/pl.po               |   9 ++--
 translations/nations/pt.gmo              | Bin 4748 -> 4689 bytes
 translations/nations/pt.po               |   9 ++--
 translations/nations/pt_BR.gmo           | Bin 51658 -> 51623 bytes
 translations/nations/pt_BR.po            |   9 ++--
 translations/nations/ro.gmo              | Bin 6160 -> 6126 bytes
 translations/nations/ro.po               |   9 ++--
 translations/nations/ru.gmo              | Bin 622772 -> 622694 bytes
 translations/nations/ru.po               |   8 +---
 translations/nations/sr.gmo              | Bin 7952 -> 7910 bytes
 translations/nations/sr.po               |   9 ++--
 translations/nations/sv.gmo              | Bin 32776 -> 32739 bytes
 translations/nations/sv.po               |   9 ++--
 translations/nations/tr.gmo              | Bin 10677 -> 10641 bytes
 translations/nations/tr.po               |   9 ++--
 translations/nations/uk.gmo              | Bin 154775 -> 154729 bytes
 translations/nations/uk.po               |   9 ++--
 translations/nations/zh_CN.gmo           | Bin 12245 -> 12197 bytes
 translations/nations/zh_CN.po            |   9 ++--
 translations/nations/zh_TW.gmo           | Bin 33716 -> 33649 bytes
 translations/nations/zh_TW.po            |   9 ++--
 164 files changed, 349 insertions(+), 305 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 858e04c..d780a5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,82 @@
+commit d8041b462dc66879a5c6bccb0f8ac0ddc8386ae5
+Author: Jacob Nevins <0jacobnk.fcdev at chiark.greenend.org.uk>
+Date:   Sat Aug 19 10:21:46 2017 +0100
+
+    Bump version number and mark as release code.
+
+commit c1da8c3e5be9157c30997e6210aac02fa6563127
+Author: Jacob Nevins <0jacobnk.fcdev at chiark.greenend.org.uk>
+Date:   Sat Aug 19 10:15:32 2017 +0100
+
+    Refresh NEWS-2.5 for 2.5.9, from wiki.
+
+commit 94ef42ccc724dbb61698b71b286d883dd0cc2d75
+Author: Jacob Nevins <0jacobnk.fcdev at chiark.greenend.org.uk>
+Date:   Sat Aug 19 10:14:05 2017 +0100
+
+    Update version numbers in FAQ.
+
+commit b0e2a4471064533cc4ae43f5b929c79a5aa17a33
+Author: Jacob Nevins <0jacobnk.fcdev at chiark.greenend.org.uk>
+Date:   Sat Aug 19 10:13:14 2017 +0100
+
+    Results of running "make update-po"
+    in translations/freeciv/ and translations/nations/
+
+commit 2ddcc412f06ca5e274aa98767bf6373d879e2967
+Author: Joan Creus <joan.creusandreu at gmail.com>
+Date:   Fri Aug 18 19:08:19 2017 -0700
+
+    Update Catalan translation
+
+commit 06e88befb4ee8f820b391fc6dd29eb8810f801d6
+Author: Konstantin Vedeneev <konved at gmail.com>
+Date:   Fri Aug 18 14:00:40 2017 +0500
+
+    Russian translation update
+
+commit 24429633efc885085a41bb1712b3364d89cb0967
+Author: Marko Lindqvist <cazfi74 at gmail.com>
+Date:   Mon Aug 14 06:58:36 2017 +0300
+
+    Drop gratuitous i18n marking around muskogee.ruleset nation groups
+    
+    Reported by Jacob Nevins
+    
+    See hrm Bug #690152
+    
+    Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
+
+commit d58f88ba3a38d64b76ffa38a67f4da458e46c6b0
+Author: Marko Lindqvist <cazfi74 at gmail.com>
+Date:   Sun Aug 13 23:19:25 2017 +0300
+
+    Make max scorelog line length 120 bytes
+    
+    Reported by Máximo Castañeda (lonemadmax)
+    
+    See hrm Bug #690381
+    
+    Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
+
+commit 9db5f4f79f740ba72b1c5183248eeb583491f6db
+Author: Joan Creus <joan.creusandreu at gmail.com>
+Date:   Tue Aug 15 22:56:51 2017 -0700
+
+    Another small change
+
+commit 134a66157512ae3e520d33a0abfecdbd48ff4a82
+Author: Joan Creus <joan.creusandreu at gmail.com>
+Date:   Tue Aug 15 21:47:05 2017 -0700
+
+    Minor fix to Catalan translation
+
+commit eb2af978dbf40e8389a17299013f82f4b8506006
+Author: Jacob Nevins <0jacobnk.fcdev at chiark.greenend.org.uk>
+Date:   Sat Aug 12 12:48:13 2017 +0100
+
+    Mark as development code.
+
 commit 7fcde2a2d6e1856a2542cf942de6533748fa65e3
 Author: Jacob Nevins <0jacobnk.fcdev at chiark.greenend.org.uk>
 Date:   Sat Aug 12 12:43:52 2017 +0100
diff --git a/NEWS-2.5 b/NEWS-2.5
index 5d0cfa0..98e1f1a 100644
--- a/NEWS-2.5
+++ b/NEWS-2.5
@@ -1,5 +1,5 @@
 ========================
-Welcome to Freeciv 2.5.8
+Welcome to Freeciv 2.5.9
 ========================
 
 The changes in the 2.5.x series are summarised below.
@@ -7,6 +7,20 @@ For changes prior to 2.5, see NEWS. For more detailed changes,
 see the ChangeLog file.
 
 
+CHANGES FROM 2.5.8 to 2.5.9
+---------------------------
+
+   (from <http://www.freeciv.org/wiki/NEWS-2.5.9>)
+
+   The purpose of this release is to fix an embarrassing regression in the
+   'scorelog' function: if one continues from a saved game, any scorelog
+   saved before that point gets wiped rather than appended to. (An
+   unexpected consequence of our Git migration.) HRM#690381
+
+   There have also been a couple of minor fixes to the Catalan and Russian
+   localizations.
+
+
 CHANGES FROM 2.5.7 to 2.5.8
 ---------------------------
 
diff --git a/client/gui-xaw/Freeciv.h b/client/gui-xaw/Freeciv.h
index 94b1acb..ca05026 100644
--- a/client/gui-xaw/Freeciv.h
+++ b/client/gui-xaw/Freeciv.h
@@ -2,7 +2,7 @@
 /* DO NOT EDIT THIS FILE, EDIT ../../data/Freeciv */
 /**************************************************/
 "Freeciv*gotAppDefFile:                       True",
-"Freeciv*version:                             2.5.8",
+"Freeciv*version:                             2.5.9",
 "Freeciv.title:                               Freeciv",
 "Freeciv.iconName:                            Freeciv",
 "Freeciv*borderColor:                         black",
diff --git a/client/luascript/tolua_client_gen.h b/client/luascript/tolua_client_gen.h
index 22f3261..5041418 100644
--- a/client/luascript/tolua_client_gen.h
+++ b/client/luascript/tolua_client_gen.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: client
-** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:53:44 2017.
+** Generated automatically by tolua 5.2.0 on Sat Aug 19 10:28:39 2017.
 */
 
 /* Exported function */
diff --git a/common/scriptcore/tolua_common_a_gen.h b/common/scriptcore/tolua_common_a_gen.h
index 5466c6d..1981f65 100644
--- a/common/scriptcore/tolua_common_a_gen.h
+++ b/common/scriptcore/tolua_common_a_gen.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: common_a
-** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:51:19 2017.
+** Generated automatically by tolua 5.2.0 on Sat Aug 19 10:26:26 2017.
 */
 
 /* Exported function */
diff --git a/common/scriptcore/tolua_common_z_gen.h b/common/scriptcore/tolua_common_z_gen.h
index 78654ba..e2d46a5 100644
--- a/common/scriptcore/tolua_common_z_gen.h
+++ b/common/scriptcore/tolua_common_z_gen.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: common_z
-** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:51:19 2017.
+** Generated automatically by tolua 5.2.0 on Sat Aug 19 10:26:26 2017.
 */
 
 /* Exported function */
diff --git a/common/scriptcore/tolua_game_gen.c b/common/scriptcore/tolua_game_gen.c
index 09c6460..1657afe 100644
--- a/common/scriptcore/tolua_game_gen.c
+++ b/common/scriptcore/tolua_game_gen.c
@@ -44,21 +44,21 @@ static int tolua_collect_Direction (lua_State* tolua_S)
 static void tolua_reg_types (lua_State* tolua_S)
 {
  tolua_usertype(tolua_S,"Terrain");
- tolua_usertype(tolua_S,"City");
- tolua_usertype(tolua_S,"Disaster");
- tolua_usertype(tolua_S,"Unit_Type");
+ tolua_usertype(tolua_S,"Nonexistent");
  tolua_usertype(tolua_S,"Direction");
- tolua_usertype(tolua_S,"Nation_Type");
- tolua_usertype(tolua_S,"Connection");
- tolua_usertype(tolua_S,"Government");
  tolua_usertype(tolua_S,"City_List_Link");
+ tolua_usertype(tolua_S,"Unit_Type");
  tolua_usertype(tolua_S,"Unit_List_Link");
- tolua_usertype(tolua_S,"Nonexistent");
  tolua_usertype(tolua_S,"Tech_Type");
- tolua_usertype(tolua_S,"Building_Type");
- tolua_usertype(tolua_S,"Tile");
- tolua_usertype(tolua_S,"Unit");
+ tolua_usertype(tolua_S,"Nation_Type");
+ tolua_usertype(tolua_S,"Disaster");
  tolua_usertype(tolua_S,"Player");
+ tolua_usertype(tolua_S,"Unit");
+ tolua_usertype(tolua_S,"Government");
+ tolua_usertype(tolua_S,"Tile");
+ tolua_usertype(tolua_S,"Building_Type");
+ tolua_usertype(tolua_S,"City");
+ tolua_usertype(tolua_S,"Connection");
 }
 
 /* get function: name of class  Player */
diff --git a/common/scriptcore/tolua_game_gen.h b/common/scriptcore/tolua_game_gen.h
index 4c7a776..402c75c 100644
--- a/common/scriptcore/tolua_game_gen.h
+++ b/common/scriptcore/tolua_game_gen.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: game
-** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:51:19 2017.
+** Generated automatically by tolua 5.2.0 on Sat Aug 19 10:26:26 2017.
 */
 
 /* Exported function */
diff --git a/common/scriptcore/tolua_signal_gen.h b/common/scriptcore/tolua_signal_gen.h
index 0e9c740..e6eb6bc 100644
--- a/common/scriptcore/tolua_signal_gen.h
+++ b/common/scriptcore/tolua_signal_gen.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: signal
-** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:51:19 2017.
+** Generated automatically by tolua 5.2.0 on Sat Aug 19 10:26:26 2017.
 */
 
 /* Exported function */
diff --git a/configure b/configure
index 7bd1c74..2697691 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Freeciv 2.5.8.
+# Generated by GNU Autoconf 2.69 for Freeciv 2.5.9.
 #
 # Report bugs to <https://www.hostedredmine.com/projects/freeciv>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Freeciv'
 PACKAGE_TARNAME='freeciv'
-PACKAGE_VERSION='2.5.8'
-PACKAGE_STRING='Freeciv 2.5.8'
+PACKAGE_VERSION='2.5.9'
+PACKAGE_STRING='Freeciv 2.5.9'
 PACKAGE_BUGREPORT='https://www.hostedredmine.com/projects/freeciv'
 PACKAGE_URL=''
 
@@ -1714,7 +1714,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Freeciv 2.5.8 to adapt to many kinds of systems.
+\`configure' configures Freeciv 2.5.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1788,7 +1788,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Freeciv 2.5.8:";;
+     short | recursive ) echo "Configuration of Freeciv 2.5.9:";;
    esac
   cat <<\_ACEOF
 
@@ -2022,7 +2022,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Freeciv configure 2.5.8
+Freeciv configure 2.5.9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2840,7 +2840,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Freeciv $as_me 2.5.8, which was
+It was created by Freeciv $as_me 2.5.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4869,7 +4869,7 @@ VERSION_SCRIPT_SILENT=yes
 
 MAJOR_VERSION="2"
 MINOR_VERSION="5"
-PATCH_VERSION="8"
+PATCH_VERSION="9"
 VERSION_LABEL=""
 
 # 1) Development until MAJOR and MINOR version numbers are
@@ -5571,7 +5571,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='freeciv'
- VERSION='2.5.8'
+ VERSION='2.5.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -36585,7 +36585,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Freeciv $as_me 2.5.8, which was
+This file was extended by Freeciv $as_me 2.5.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -36651,7 +36651,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Freeciv config.status 2.5.8
+Freeciv config.status 2.5.9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/data/Freeciv b/data/Freeciv
index 4dba21b..83316bc 100644
--- a/data/Freeciv
+++ b/data/Freeciv
@@ -5,7 +5,7 @@
 ! none widgets resources
 ! gotAppDefFile MUST be the first entry!
 Freeciv*gotAppDefFile:                       True
-Freeciv*version:                             2.5.8
+Freeciv*version:                             2.5.9
 Freeciv.title:                               Freeciv
 Freeciv.iconName:                            Freeciv
 Freeciv*borderColor:                         black
diff --git a/data/nation/muskogee.ruleset b/data/nation/muskogee.ruleset
index ba24c4c..aec6a44 100644
--- a/data/nation/muskogee.ruleset
+++ b/data/nation/muskogee.ruleset
@@ -2,7 +2,7 @@
 
 name=_("Muskogee")
 plural=_("?plural:Muskogee")
-groups=_("American")
+groups="American"
 legend=_("The Muskogee was a confederacy of North American tribes,\
  including the Creek, Seminole, Choctaw, and Chickasaw. They were based in\
  the area now encompassed by the U.S. states of Georgia and Alabama. Creek\
diff --git a/doc/FAQ b/doc/FAQ
index e45479c..5782ed6 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -699,8 +699,8 @@ Starting game.
 
 3.5 Am I using the latest version? Do I need to upgrade?
 
-   The current stable Freeciv version is 2.5.8. For an overview of changes
-   that went into this release, see the NEWS-2.5.8 article.
+   The current stable Freeciv version is 2.5.9. For an overview of changes
+   that went into this release, see the NEWS-2.5.9 article.
 
    The NEWS-#.#.# article is only updated for a new release; updates to
    Git can be reviewed in the online source code browser.
@@ -709,14 +709,14 @@ Starting game.
    contributed binaries.
 
    It's unlikely that all precompiled binaries and ports have been updated
-   to 2.5.8 yet. If you can contribute, please do! Prepare a package and
+   to 2.5.9 yet. If you can contribute, please do! Prepare a package and
    announce it to freeciv-dev at freelists.org.
 
    Clients and servers of different major versions are generally
    incompatible due to changes in the client/server protocol. You will see
    incompatibilities as a 'mismatched capabilities' error. Different minor
    versions should be compatible, however. For example, 2.0.0 and 2.0.8
-   are compatible; 2.0.0 and 2.5.8 are not.
+   are compatible; 2.0.0 and 2.5.9 are not.
 
 -------
 
@@ -1215,8 +1215,8 @@ set HOME="C:\Documents And Settings\(your username goes here)\Application Data"
 
    If you used one of the self installer versions then there's a program
    group with the name chosen at installation time (for example,
-   Freeciv 2.5.8 (GTK+2 client).) Just go to click on
-   Start→Programs→Freeciv 2.5.8 (GTK+2 client)→Freeciv
+   Freeciv 2.5.9 (GTK+2 client).) Just go to click on
+   Start→Programs→Freeciv 2.5.9 (GTK+2 client)→Freeciv
 
    That's it! You should be up and running.
 
@@ -1259,8 +1259,8 @@ set HOME="C:\Documents And Settings\(your username goes here)\Application Data"
 
    Then you have to unpack the tileset into the DATA or root directory in
    your Freeciv directory (so if your Freeciv directory is
-   C:\FREECIV-2.5.8, then you'd tell 7-Zip to extract to
-   C:\FREECIV-2.5.8\DATA.) Make sure you tell your extraction program to
+   C:\FREECIV-2.5.9, then you'd tell 7-Zip to extract to
+   C:\FREECIV-2.5.9\DATA.) Make sure you tell your extraction program to
    extract into the subdirectories in the file.
 
    Once that's done you can start using the new tileset (FINALLY!)
@@ -1273,7 +1273,7 @@ set HOME="C:\Documents And Settings\(your username goes here)\Application Data"
    the Freeciv client when you start it. Open a Command Prompt (from
    Start→Programs→Accessories→Command Prompt in my case, sometimes called
    an MS-DOS Window). Change to the Freeciv directory (for example, cd
-   \FREECIV-2.5.8) and start the client with the --tiles tilesetname
+   \FREECIV-2.5.9) and start the client with the --tiles tilesetname
    option. For example for the gtk2 client,
 FREECIV-GTK2 --tiles freeland
 
@@ -1288,7 +1288,7 @@ FREECIV-GTK2 --tiles freeland
 
    Otherwise, a different ruleset can be used by downloading the ruleset
    and extracting it in the Freeciv root or data directory
-   (C:\FREECIV-2.5.8\DATA, for example). This should create a subdirectory
+   (C:\FREECIV-2.5.9\DATA, for example). This should create a subdirectory
    with the ruleset name (ancients, for example.)
 
    Then you need to tell the server to use it. This is done by typing
diff --git a/fc_version b/fc_version
index 59bb356..3a8a65c 100755
--- a/fc_version
+++ b/fc_version
@@ -6,7 +6,7 @@
 
 MAJOR_VERSION="2"
 MINOR_VERSION="5"
-PATCH_VERSION="8"
+PATCH_VERSION="9"
 VERSION_LABEL=""
 
 # 1) Development until MAJOR and MINOR version numbers are
diff --git a/server/report.c b/server/report.c
index 81c2aa0..11b6ebb 100644
--- a/server/report.c
+++ b/server/report.c
@@ -1071,7 +1071,7 @@ static bool scan_score_log(char *id)
 {
   int line_nr, turn, plr_no, spaces;
   struct plrdata_slot *plrdata;
-  char plr_name[MAX_LEN_NAME], line[80], *ptr;
+  char plr_name[MAX_LEN_NAME], line[120], *ptr;
 
   fc_assert_ret_val(score_log != NULL, FALSE);
   fc_assert_ret_val(score_log->fp != NULL, FALSE);
diff --git a/server/scripting/tolua_fcdb_gen.h b/server/scripting/tolua_fcdb_gen.h
index 191b6c8..e237349 100644
--- a/server/scripting/tolua_fcdb_gen.h
+++ b/server/scripting/tolua_fcdb_gen.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: fcdb
-** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:52:29 2017.
+** Generated automatically by tolua 5.2.0 on Sat Aug 19 10:27:29 2017.
 */
 
 /* Exported function */
diff --git a/server/scripting/tolua_server_gen.c b/server/scripting/tolua_server_gen.c
index 298bf8c..b691541 100644
--- a/server/scripting/tolua_server_gen.c
+++ b/server/scripting/tolua_server_gen.c
@@ -32,14 +32,14 @@ LUALIB_API int luaopen_server (lua_State* tolua_S);
 /* function to register type */
 static void tolua_reg_types (lua_State* tolua_S)
 {
- tolua_usertype(tolua_S,"Nation_Type");
  tolua_usertype(tolua_S,"Player");
+ tolua_usertype(tolua_S,"Tile");
  tolua_usertype(tolua_S,"Unit_Type");
  tolua_usertype(tolua_S,"Direction");
+ tolua_usertype(tolua_S,"Nation_Type");
  tolua_usertype(tolua_S,"Tech_Type");
- tolua_usertype(tolua_S,"Unit");
- tolua_usertype(tolua_S,"Tile");
  tolua_usertype(tolua_S,"City");
+ tolua_usertype(tolua_S,"Unit");
 }
 
 /* function: api_server_save */
diff --git a/server/scripting/tolua_server_gen.h b/server/scripting/tolua_server_gen.h
index 4138f5f..64dabda 100644
--- a/server/scripting/tolua_server_gen.h
+++ b/server/scripting/tolua_server_gen.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: server
-** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:52:29 2017.
+** Generated automatically by tolua 5.2.0 on Sat Aug 19 10:27:29 2017.
 */
 
 /* Exported function */
diff --git a/translations/freeciv/ar.gmo b/translations/freeciv/ar.gmo
index b6fe9a1..3fd45be 100644
Binary files a/translations/freeciv/ar.gmo and b/translations/freeciv/ar.gmo differ
diff --git a/translations/freeciv/ar.po b/translations/freeciv/ar.po
index 3b9e706..1fc1d99 100644
--- a/translations/freeciv/ar.po
+++ b/translations/freeciv/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2007-08-10 18:00+0300\n"
 "Last-Translator: Ahmad M. Zawawi <zeus_go64 at yahoo.com>\n"
 "Language-Team: Arabic <freeciv-i18n at freeciv.org>\n"
diff --git a/translations/freeciv/bg.gmo b/translations/freeciv/bg.gmo
index 6a0aaa8..7321b2a 100644
Binary files a/translations/freeciv/bg.gmo and b/translations/freeciv/bg.gmo differ
diff --git a/translations/freeciv/bg.po b/translations/freeciv/bg.po
index 495e014..2412e7a 100644
--- a/translations/freeciv/bg.po
+++ b/translations/freeciv/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2012-06-10 00:52+0200\n"
 "Last-Translator: Bogdan Marinov <bogdan.marinov84 at gmail.com>\n"
 "Language-Team: Bulgarian\n"
diff --git a/translations/freeciv/ca.gmo b/translations/freeciv/ca.gmo
index a49d32c..97df5fd 100644
Binary files a/translations/freeciv/ca.gmo and b/translations/freeciv/ca.gmo differ
diff --git a/translations/freeciv/ca.po b/translations/freeciv/ca.po
index 6a6c8d3..52a6c6f 100644
--- a/translations/freeciv/ca.po
+++ b/translations/freeciv/ca.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2017-08-05 21:24-0800\n"
 "Last-Translator: Joan Creus <joan.creusandreu at gmail dot com>\n"
 "Language-Team: Catalan <kde-i18n-ca at kde.org>\n"
@@ -17821,7 +17821,7 @@ msgstr "Reciclatge"
 #: data/classic/techs.ruleset:619 data/experimental/techs.ruleset:680
 #: data/civ2civ3/techs.ruleset:700 data/multiplayer/techs.ruleset:625
 msgid "Refining"
-msgstr "Refinat"
+msgstr "Refinació"
 
 #: data/civ1/techs.ruleset:495
 msgid "Religion"
@@ -20643,8 +20643,8 @@ msgid ""
 "(Beware dropping into unseen territory, as Paratroopers landing on a tile "
 "occupied by enemy units are easy targets!)"
 msgstr ""
-"Els Paracaigudistes són expertsen atacs aerotransportats. Des d'una ciutat o "
-"base aèria amigues, els Paracaigudistes que no hagin gastat punts de "
+"Els Paracaigudistes són experts en atacs aerotransportats. Des d'una ciutat "
+"o base aèria amigues, els Paracaigudistes que no hagin gastat punts de "
 "moviment poden llançar-se en paracaigudes directament a qualsevol casella "
 "dins del seu rang, i estaran preparats immediatament per actuar-hi. (Vigileu "
 "si els llanceu en territori desconegut, perquè els Paracaigudistes que "
@@ -33113,7 +33113,7 @@ msgid ""
 "player can be reused (removing all record of that player from the running "
 "game)."
 msgstr ""
-"Amb la comanda 'create', es crea un jugador nom amb el nom donat.\n"
+"Amb la comanda 'create', es crea un jugador nou amb el nom donat.\n"
 "El paràmetre 'ai type' es pot utilitzar per seleccionar quin mòdul d'IA "
 "s'utilitzarà per al jugador creat. Això requereix que Freeciv s'hagi "
 "compilat amb suports de mòduls IA carregables, i que s'hagi carregat el "
diff --git a/translations/freeciv/cs.gmo b/translations/freeciv/cs.gmo
index 87728eb..25c4beb 100644
Binary files a/translations/freeciv/cs.gmo and b/translations/freeciv/cs.gmo differ
diff --git a/translations/freeciv/cs.po b/translations/freeciv/cs.po
index d3c2b6b..bc5e5e8 100644
--- a/translations/freeciv/cs.po
+++ b/translations/freeciv/cs.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2008-01-21 15:42+0100\n"
 "Last-Translator: Dusan Hokuv <dusan at mirc.cz>\n"
 "Language-Team: Czech <cs at li.org>\n"
diff --git a/translations/freeciv/da.gmo b/translations/freeciv/da.gmo
index 529c0c2..95553c6 100644
Binary files a/translations/freeciv/da.gmo and b/translations/freeciv/da.gmo differ
diff --git a/translations/freeciv/da.po b/translations/freeciv/da.po
index a10deb2..a1b301a 100644
--- a/translations/freeciv/da.po
+++ b/translations/freeciv/da.po
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2011-01-30 14:56+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen at gmail.com>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
diff --git a/translations/freeciv/de.gmo b/translations/freeciv/de.gmo
index 1a9ac37..e30ba58 100644
Binary files a/translations/freeciv/de.gmo and b/translations/freeciv/de.gmo differ
diff --git a/translations/freeciv/de.po b/translations/freeciv/de.po
index 4bb863b..39c589a 100644
--- a/translations/freeciv/de.po
+++ b/translations/freeciv/de.po
@@ -70,7 +70,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2016-11-16 23:36+0100\n"
 "Last-Translator: Marvin Gülker <m-guelker at phoenixmail.de>\n"
 "Language-Team: German Freeciv Translators <freeciv-de at googlegroups.com>\n"
diff --git a/translations/freeciv/el.gmo b/translations/freeciv/el.gmo
index 149c46f..bc55025 100644
Binary files a/translations/freeciv/el.gmo and b/translations/freeciv/el.gmo differ
diff --git a/translations/freeciv/el.po b/translations/freeciv/el.po
index bacb30a..b04b6ca 100644
--- a/translations/freeciv/el.po
+++ b/translations/freeciv/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:51+0300\n"
 "Last-Translator: Prekates Alexandros <aprekates at gmail.gr>\n"
 "Language-Team: Greek translation team <gr at li.org>\n"
diff --git a/translations/freeciv/en_GB.gmo b/translations/freeciv/en_GB.gmo
index 5baea99..edd4dc4 100644
Binary files a/translations/freeciv/en_GB.gmo and b/translations/freeciv/en_GB.gmo differ
diff --git a/translations/freeciv/en_GB.po b/translations/freeciv/en_GB.po
index 9ed25f5..fc3fca1 100644
--- a/translations/freeciv/en_GB.po
+++ b/translations/freeciv/en_GB.po
@@ -65,7 +65,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2017-07-23 11:07+0100\n"
 "Last-Translator: Jacob Nevins <0jacobnk.fcdev at chiark.greenend.org.uk>\n"
 "Language-Team: \n"
diff --git a/translations/freeciv/eo.gmo b/translations/freeciv/eo.gmo
index e5e178f..7a7f546 100644
Binary files a/translations/freeciv/eo.gmo and b/translations/freeciv/eo.gmo differ
diff --git a/translations/freeciv/eo.po b/translations/freeciv/eo.po
index 3ac6008..84d9fe5 100644
--- a/translations/freeciv/eo.po
+++ b/translations/freeciv/eo.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2008-07-10 17:52+0200\n"
 "Last-Translator: Antonio Codazzi <f_sophia at libero.it>\n"
 "Language-Team: Esperanto <eo at li.org>\n"
diff --git a/translations/freeciv/es.gmo b/translations/freeciv/es.gmo
index 4f4ca0f..8a732b4 100644
Binary files a/translations/freeciv/es.gmo and b/translations/freeciv/es.gmo differ
diff --git a/translations/freeciv/es.po b/translations/freeciv/es.po
index 11ebfea..86ba48c 100644
--- a/translations/freeciv/es.po
+++ b/translations/freeciv/es.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2017-08-07 23:13+0100\n"
 "Last-Translator: Jordi Negrevernis i Font <jorneg4 at hotmail.com>\n"
 "Language-Team: Spanish <>\n"
diff --git a/translations/freeciv/et.gmo b/translations/freeciv/et.gmo
index 2942cee..cbf9bf1 100644
Binary files a/translations/freeciv/et.gmo and b/translations/freeciv/et.gmo differ
diff --git a/translations/freeciv/et.po b/translations/freeciv/et.po
index 96cd864..a2ef2c8 100644
--- a/translations/freeciv/et.po
+++ b/translations/freeciv/et.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: et\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:51+0300\n"
 "Last-Translator: Elmo Todurov <todurov at gmail.com>\n"
 "Language-Team: eesti\n"
diff --git a/translations/freeciv/fa.gmo b/translations/freeciv/fa.gmo
index ef3540b..7706c06 100644
Binary files a/translations/freeciv/fa.gmo and b/translations/freeciv/fa.gmo differ
diff --git a/translations/freeciv/fa.po b/translations/freeciv/fa.po
index 419410e..98560b3 100644
--- a/translations/freeciv/fa.po
+++ b/translations/freeciv/fa.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:52+0300\n"
 "Last-Translator: Arman Ordookhani <arman_o71 at Yahoo.com>\n"
 "Language-Team: Farsi(Persian)\n"
diff --git a/translations/freeciv/fi.gmo b/translations/freeciv/fi.gmo
index 1604bce..65d8146 100644
Binary files a/translations/freeciv/fi.gmo and b/translations/freeciv/fi.gmo differ
diff --git a/translations/freeciv/fi.po b/translations/freeciv/fi.po
index 6929f70..2a4ff4f 100644
--- a/translations/freeciv/fi.po
+++ b/translations/freeciv/fi.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2017-07-17 00:59+0300\n"
 "Last-Translator: Markus Linnakangas <markus.linnakangas at luukku.com>\n"
 "Language-Team: None <freeciv-i18n at gna.org>\n"
diff --git a/translations/freeciv/fr.gmo b/translations/freeciv/fr.gmo
index bdd1a18..4d9308e 100644
Binary files a/translations/freeciv/fr.gmo and b/translations/freeciv/fr.gmo differ
diff --git a/translations/freeciv/fr.po b/translations/freeciv/fr.po
index 8e141a0..34b8428 100644
--- a/translations/freeciv/fr.po
+++ b/translations/freeciv/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2017-08-11 15:05+0200\n"
 "Last-Translator: Igx <igx31 hotmail.com>\n"
 "Language-Team: French <freeciv-l10n-fr at yahoogroupes.fr>\n"
diff --git a/translations/freeciv/freeciv.pot b/translations/freeciv/freeciv.pot
index 235f3ac..132fd7b 100644
--- a/translations/freeciv/freeciv.pot
+++ b/translations/freeciv/freeciv.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/translations/freeciv/ga.gmo b/translations/freeciv/ga.gmo
index 0e07af8..3993c4f 100644
Binary files a/translations/freeciv/ga.gmo and b/translations/freeciv/ga.gmo differ
diff --git a/translations/freeciv/ga.po b/translations/freeciv/ga.po
index bc4cb23..84b1064 100644
--- a/translations/freeciv/ga.po
+++ b/translations/freeciv/ga.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2011-01-29 07:42-0500\n"
 "Last-Translator: Kevin Scannell <kscanne at gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux at lists.sourceforge.net>\n"
diff --git a/translations/freeciv/gd.gmo b/translations/freeciv/gd.gmo
index 0e98d99..dad39ef 100644
Binary files a/translations/freeciv/gd.gmo and b/translations/freeciv/gd.gmo differ
diff --git a/translations/freeciv/gd.po b/translations/freeciv/gd.po
index 17a9286..c664ac7 100644
--- a/translations/freeciv/gd.po
+++ b/translations/freeciv/gd.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2014-08-08 08:40+0100\n"
 "Last-Translator: Michael Bauer <fios at akerbeltz.org>\n"
 "Language-Team: Akerbeltz\n"
diff --git a/translations/freeciv/he.gmo b/translations/freeciv/he.gmo
index 9795d96..fe7b616 100644
Binary files a/translations/freeciv/he.gmo and b/translations/freeciv/he.gmo differ
diff --git a/translations/freeciv/he.po b/translations/freeciv/he.po
index 8cfabe6..3b7c696 100644
--- a/translations/freeciv/he.po
+++ b/translations/freeciv/he.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2007-08-12 15:15+0300\n"
 "Last-Translator: Chen Levy <contrib at chenlevy.com>\n"
 "Language-Team: Hebrew <kde-il at yahoogroups.com>\n"
diff --git a/translations/freeciv/hu.gmo b/translations/freeciv/hu.gmo
index e245eb4..e73e116 100644
Binary files a/translations/freeciv/hu.gmo and b/translations/freeciv/hu.gmo differ
diff --git a/translations/freeciv/hu.po b/translations/freeciv/hu.po
index eaac725..6d91643 100644
--- a/translations/freeciv/hu.po
+++ b/translations/freeciv/hu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 1.14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2007-08-12 15:37+0300\n"
 "Last-Translator: G�bor Tak�cs <tg330 at hszk.bme.hu>\n"
 "Language-Team: Hungarian <hu at li.org>\n"
diff --git a/translations/freeciv/id.gmo b/translations/freeciv/id.gmo
index 02a836f..30e49f0 100644
Binary files a/translations/freeciv/id.gmo and b/translations/freeciv/id.gmo differ
diff --git a/translations/freeciv/id.po b/translations/freeciv/id.po
index 4dd6337..bad8551 100644
--- a/translations/freeciv/id.po
+++ b/translations/freeciv/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2012-07-26 20:54+0100\n"
 "Last-Translator: Dadan Haryana <dadanhrn at gmail.com>\n"
 "Language-Team: Indonesian <>\n"
diff --git a/translations/freeciv/it.gmo b/translations/freeciv/it.gmo
index 17ff3e2..538f5eb 100644
Binary files a/translations/freeciv/it.gmo and b/translations/freeciv/it.gmo differ
diff --git a/translations/freeciv/it.po b/translations/freeciv/it.po
index b68eec7..90d116e 100644
--- a/translations/freeciv/it.po
+++ b/translations/freeciv/it.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2011-03-26 15:29+0100\n"
 "Last-Translator: Paolo Sammicheli <paolo at sammiche.li>\n"
 "Language-Team: Italian <slug-freeciv at siena.linux.it>\n"
diff --git a/translations/freeciv/ja.gmo b/translations/freeciv/ja.gmo
index 8eb4a4e..5feac1e 100644
Binary files a/translations/freeciv/ja.gmo and b/translations/freeciv/ja.gmo differ
diff --git a/translations/freeciv/ja.po b/translations/freeciv/ja.po
index 1c45fd6..2073aed 100644
--- a/translations/freeciv/ja.po
+++ b/translations/freeciv/ja.po
@@ -156,7 +156,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.0.99-devel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2016-07-18 02:12+0900\n"
 "Last-Translator: Belgae <freeciv.belgae AT gmail.com>\n"
 "Language-Team: SAWADA Katsuya <ama at petmail.net>\n"
diff --git a/translations/freeciv/ko.gmo b/translations/freeciv/ko.gmo
index 66344a1..157e8ff 100644
Binary files a/translations/freeciv/ko.gmo and b/translations/freeciv/ko.gmo differ
diff --git a/translations/freeciv/ko.po b/translations/freeciv/ko.po
index 87059cb..f5c862c 100644
--- a/translations/freeciv/ko.po
+++ b/translations/freeciv/ko.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:52+0300\n"
 "Last-Translator: Sungdae\n"
 "Language-Team: Korean language team\n"
diff --git a/translations/freeciv/lt.gmo b/translations/freeciv/lt.gmo
index 5aa7662..119daf7 100644
Binary files a/translations/freeciv/lt.gmo and b/translations/freeciv/lt.gmo differ
diff --git a/translations/freeciv/lt.po b/translations/freeciv/lt.po
index 26579b7..cae0174 100644
--- a/translations/freeciv/lt.po
+++ b/translations/freeciv/lt.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2010-10-11 20:07+0100\n"
 "Last-Translator: Andrius Štikonas <stikonas at gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
diff --git a/translations/freeciv/nb.gmo b/translations/freeciv/nb.gmo
index efe1ca6..0578477 100644
Binary files a/translations/freeciv/nb.gmo and b/translations/freeciv/nb.gmo differ
diff --git a/translations/freeciv/nb.po b/translations/freeciv/nb.po
index b9ace17..44a964f 100644
--- a/translations/freeciv/nb.po
+++ b/translations/freeciv/nb.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-12 07:21+0300\n"
 "Last-Translator: Per I. Mathisen <per at freeciv.org>\n"
 "Language-Team: Norwegian <andrearo at stud.ntnu.no>\n"
diff --git a/translations/freeciv/nl.gmo b/translations/freeciv/nl.gmo
index 3b7e549..d7e4fb3 100644
Binary files a/translations/freeciv/nl.gmo and b/translations/freeciv/nl.gmo differ
diff --git a/translations/freeciv/nl.po b/translations/freeciv/nl.po
index f1d5992..1d74440 100644
--- a/translations/freeciv/nl.po
+++ b/translations/freeciv/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:52+0300\n"
 "Last-Translator: Jos Maalderink <josmaalderink at hotmail.com>\n"
 "Language-Team: Nederlands <nl at li.org>\n"
diff --git a/translations/freeciv/pl.gmo b/translations/freeciv/pl.gmo
index c21ad22..0441c1f 100644
Binary files a/translations/freeciv/pl.gmo and b/translations/freeciv/pl.gmo differ
diff --git a/translations/freeciv/pl.po b/translations/freeciv/pl.po
index b6c97be..e50d797 100644
--- a/translations/freeciv/pl.po
+++ b/translations/freeciv/pl.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2015-05-20 15:46+0100\n"
 "Last-Translator: Hubert Kowalewski <hubkow at gmail.com>\n"
 "Language-Team: polski <hubkow at gmail.com>\n"
diff --git a/translations/freeciv/pt.gmo b/translations/freeciv/pt.gmo
index a4be0fb..9356dc7 100644
Binary files a/translations/freeciv/pt.gmo and b/translations/freeciv/pt.gmo differ
diff --git a/translations/freeciv/pt.po b/translations/freeciv/pt.po
index 8c14501..501ef62 100644
--- a/translations/freeciv/pt.po
+++ b/translations/freeciv/pt.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:53+0300\n"
 "Last-Translator: Duarte Loreto <happyguy_pt at hotmail.com>\n"
 "Language-Team: \n"
diff --git a/translations/freeciv/pt_BR.gmo b/translations/freeciv/pt_BR.gmo
index a4cac9e..5d72218 100644
Binary files a/translations/freeciv/pt_BR.gmo and b/translations/freeciv/pt_BR.gmo differ
diff --git a/translations/freeciv/pt_BR.po b/translations/freeciv/pt_BR.po
index 06f5e32..672a5cd 100644
--- a/translations/freeciv/pt_BR.po
+++ b/translations/freeciv/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.1.0-beta3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2011-02-02 11:49-0200\n"
 "Last-Translator: Djavan Fagundes <djavan at comum.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
diff --git a/translations/freeciv/ro.gmo b/translations/freeciv/ro.gmo
index e845500..27f0913 100644
Binary files a/translations/freeciv/ro.gmo and b/translations/freeciv/ro.gmo differ
diff --git a/translations/freeciv/ro.po b/translations/freeciv/ro.po
index a22fd48..7baaec3 100644
--- a/translations/freeciv/ro.po
+++ b/translations/freeciv/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po-debconf://kdebase\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:53+0300\n"
 "Last-Translator: stan ioan-eugen <stan.ieugen at gmail.com>\n"
 "Language-Team: romanian <debian-l10n-romanian at lists.debian.org>\n"
diff --git a/translations/freeciv/ru.gmo b/translations/freeciv/ru.gmo
index a008157..264fb0f 100644
Binary files a/translations/freeciv/ru.gmo and b/translations/freeciv/ru.gmo differ
diff --git a/translations/freeciv/ru.po b/translations/freeciv/ru.po
index 560507b..bcc0601 100644
--- a/translations/freeciv/ru.po
+++ b/translations/freeciv/ru.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
-"PO-Revision-Date: 2017-08-05 02:29+0500\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
+"PO-Revision-Date: 2017-08-18 13:31+0500\n"
 "Last-Translator: Konstantin Vedeneev <konved at gmail.com>\n"
 "Language-Team: Russian <freeciv.ru at freelists.org>\n"
 "Language: ru\n"
@@ -393,11 +393,10 @@ msgstr "%s прекратили строить Чудо %s в городе %s."
 msgid "The %s have started building The %s in %s."
 msgstr "%s приступили к строительству Чуда %s в городе %s."
 
-# FIXME: pluralization
 #: ai/default/aicity.c:842
 #, c-format
 msgid "%s is selling %s (not needed) for %d."
-msgstr "Город %1$s за ненадобностью продаёт за %3$d золота здание %2$s."
+msgstr "Город %s за ненадобностью продаёт здание %s за %d."
 
 #: ai/threaded/threadedai.c:509
 msgid ""
@@ -1446,7 +1445,6 @@ msgstr "Запрос"
 msgid "You can't buy %s in %s!"
 msgstr "Вы не можете купить %s в городе %s!"
 
-# FIXME: Here would be 2 strings (for unit and improvement/wonder).
 #. TRANS: %s is a production type; this whole string is a sentence
 #. * fragment that is only ever included in one other string
 #. * (search comments for this string to find it)
@@ -1885,7 +1883,7 @@ msgstr "Окно вывода очищено."
 #: client/gui-gtk-2.0/chatline.c:1144 client/gui-gtk-3.0/chatline.c:1130
 #, c-format
 msgid "Select the %s color"
-msgstr "Выбрать цвет для %s"
+msgstr "Выберите цвет для %s"
 
 #: client/gui-gtk-2.0/chatline.c:1351 client/gui-gtk-3.0/chatline.c:1343
 msgid "Bold (Ctrl-B)"
@@ -1925,7 +1923,7 @@ msgstr "фона"
 #: client/gui-gtk-3.0/chatline.c:1405 client/gui-gtk-3.0/optiondlg.c:638
 #: client/gui-qt/optiondlg.cpp:718
 msgid "Select the background color"
-msgstr "Выбрать цвет фона"
+msgstr "Выберите цвет фона"
 
 #. TRANS: "Return" means the return key.
 #: client/gui-gtk-2.0/chatline.c:1431 client/gui-gtk-3.0/chatline.c:1423
@@ -2062,7 +2060,7 @@ msgstr "Купить (_B)"
 
 #: client/gui-gtk-2.0/citydlg.c:861 client/gui-gtk-3.0/citydlg.c:958
 msgid "I_mprovements:"
-msgstr "Здания: (_m)"
+msgstr "Сооружения: (_m)"
 
 #: client/gui-gtk-2.0/citydlg.c:879 client/gui-gtk-2.0/citydlg.c:1064
 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/citydlg.c:983
@@ -2305,7 +2303,6 @@ msgstr[2] ""
 msgid "Buy It!"
 msgstr "Купить!"
 
-# FIXME: Here would be 2 strings (for unit and improvement/wonder).
 #. TRANS: Last %s is pre-pluralised "Treasury contains %d gold."
 #: client/gui-gtk-2.0/citydlg.c:2647 client/gui-gtk-3.0/citydlg.c:2862
 #: client/gui-sdl/citydlg.c:1161 client/gui-xaw/citydlg.c:1969
@@ -4199,7 +4196,7 @@ msgstr ""
 #: client/gui-qt/fc_client.cpp:715 client/gui-qt/menu.cpp:422
 #: data/Freeciv.in:1246
 msgid "Set local options"
-msgstr "Установить локальные параметры"
+msgstr "Установка локальных параметров"
 
 #: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487
 #: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571
@@ -4782,7 +4779,7 @@ msgstr "Революция... (_R)"
 
 #: client/gui-gtk-2.0/menu.c:1739 client/gui-gtk-3.0/menu.c:1727
 msgid "_Center View"
-msgstr "Перевести обзор (_C)"
+msgstr "В центр карты (_C)"
 
 #: client/gui-gtk-2.0/menu.c:1743 client/gui-gtk-3.0/menu.c:1731
 msgid "_Economy"
@@ -5317,7 +5314,7 @@ msgstr "Переговоры (_M)"
 
 #: client/gui-gtk-2.0/plrdlg.c:326 client/gui-gtk-3.0/plrdlg.c:333
 msgid "Cancel _Treaty"
-msgstr "Отменить договор (_T)"
+msgstr "Разорвать договор (_T)"
 
 #: client/gui-gtk-2.0/plrdlg.c:332 client/gui-gtk-3.0/plrdlg.c:339
 msgid "_Withdraw Vision"
@@ -6157,6 +6154,7 @@ msgstr "Добавить"
 msgid "Sell"
 msgstr "Продать"
 
+# FIXME: 2 lines: button and menu item
 #: client/gui-qt/cityrep.cpp:535 client/gui-qt/menu.cpp:535
 msgid "Select"
 msgstr "Выбрать"
@@ -6686,7 +6684,7 @@ msgstr "Ждать"
 
 #: client/gui-qt/menu.cpp:564 client/gui-xaw/menu.c:215
 msgid "Done"
-msgstr "Сделано"
+msgstr "Закончить"
 
 #: client/gui-qt/menu.cpp:571
 msgid "Units Filter"
@@ -8321,7 +8319,7 @@ msgstr "Commit: %s"
 #. TRANS: Dead -- Rest In Peace -- Reqia In Pace
 #: client/gui-sdl/plrdlg.c:429 client/plrdlg_common.c:227
 msgid "R.I.P."
-msgstr "Исчез"
+msgstr "исчез"
 
 #: client/gui-sdl/plrdlg.c:653 client/plrdlg_common.c:311
 #: server/stdinhand.c:3528 server/stdinhand.c:6328
@@ -8331,7 +8329,7 @@ msgstr "Компьютер"
 #: client/gui-sdl/plrdlg.c:657 client/plrdlg_common.c:249
 #: client/plrdlg_common.c:258
 msgid "done"
-msgstr "сделано"
+msgstr "сходил"
 
 #: client/gui-sdl/plrdlg.c:659 client/plrdlg_common.c:260
 msgid "moving"
@@ -12284,16 +12282,16 @@ msgstr "Отключите этот параметр, чтобы спрятат
 
 #: client/options.c:2185 client/options.c:2395
 msgid "Keep dialogs on top"
-msgstr "Показывать диалоги сверху"
+msgstr "Показывать диалоги поверх окон"
 
 #: client/options.c:2186 client/options.c:2396
 msgid ""
 "If this option is set then dialog windows will always remain in front of the "
 "main Freeciv window. Disabling this has no effect in fullscreen mode."
 msgstr ""
-"Если этот параметр установлен, диалоговые окна будут всегда находится перед "
-"над главным окном Freeciv. Выключение не даёт никакого эффекта в "
-"полноэкранном режиме."
+"Если этот параметр установлен, диалоговые окна будут всегда находится поверх "
+"главного окна Freeciv. Выключение не даёт никакого эффекта в полноэкранном "
+"режиме."
 
 #: client/options.c:2190 client/options.c:2400
 msgid "Show worklist task icons"
@@ -17438,8 +17436,8 @@ msgid ""
 "continent of Asia. They became notorious for their utter ruthlessness in "
 "warfare."
 msgstr ""
-"Во времена правления Чингисхана монголы завоевали величайшую империю в "
-"истории человечества, расселившись на бо́льшей части Азиатского континента. "
+"Во времена правления Чингисхана монголы завоевали величайшую континентальную "
+"империю в истории человечества, расселившись по бо́льшей части Азии. "
 "Монгольские завоевания были чрезвычайно жестокими, подкрепляясь подавляющим "
 "превосходством в военной мощи."
 
@@ -32119,7 +32117,6 @@ msgstr "Мы прекратили торговлю между %1$s и %3$s, го
 msgid " from the worklist"
 msgstr " (по плану)"
 
-# FIXME: split needed (unit/improvement or even unit/building/wonder/coinage).
 #. TRANS: "<city> is building <production><source>."
 #: server/citytools.c:2839
 #, c-format
@@ -32387,11 +32384,10 @@ msgstr "Город %s не может поддерживать %s, соедин
 msgid "Citizens in %s perish for their failure to upkeep %s!"
 msgstr "Жители города %s умирают, надрываясь в попытке содержать %s!"
 
-# FIXME: split unit/improvement
 #: server/cityturn.c:1615 server/cityturn.c:1754
 #, c-format
 msgid "%s is building %s, which is no longer available."
-msgstr "Город %s строит здание %s, которое уже не доступно."
+msgstr "Город %s строит здание %s, которое больше не доступно."
 
 #: server/cityturn.c:1654
 #, c-format
@@ -32866,8 +32862,8 @@ msgstr ""
 "Эта команда начинает игру. Когда начинаем новую игру, она должна быть "
 "использована после того как все игроки подключились, и все компьютерные "
 "игроки созданы (если необходимо), и после того как все изменения настроек "
-"сервера были сделаны. После команды 'start' все человеческие игроки смогут "
-"выбрать страну и игра начнется. Эта команда также используется для запуска "
+"сервера были сделаны. После команды 'start' все люди-игроки смогут выбрать "
+"страну и игра начнется. Эта команда также используется для запуска "
 "сохранённой игры. После того как игра начинается, эта команда становится "
 "недоступной за ненадобностью."
 
@@ -35947,13 +35943,13 @@ msgstr ""
 msgid "%s has been added as human player."
 msgstr "Игрок %s был добавлен как игрок-человек."
 
-# FIXME: need split (player/team).
+# FIXME: 2 strings (player/team).
 #: server/savegame2.c:3535 server/savegame.c:4350
 #, c-format
 msgid "%s had invalid researching technology."
 msgstr "У %s была неверная изучаемая технология."
 
-# FIXME: need split (player/team).
+# FIXME: 2 strings (player/team).
 #: server/savegame2.c:3546 server/savegame.c:4361
 #, c-format
 msgid "%s had invalid technology goal."
@@ -40874,7 +40870,6 @@ msgstr ""
 "Технология, необходимая для установления новой формы правления %s, была "
 "утеряна. Жители предпочли перейти к форме правления %s."
 
-# FIXME: split unit-improvement.
 #: server/techtools.c:745 server/techtools.c:758
 #, c-format
 msgid "%s can't build %s. The required technology was lost."
@@ -40912,7 +40907,6 @@ msgstr ""
 msgid "Illegal packet, can't upgrade %s (yet)."
 msgstr "Неправильный пакет, невозможно модернизировать %s (пока)."
 
-# FIXME: split required (double pluralization)
 #. TRANS: "2 Musketeers upgraded to Riflemen for 100 gold."
 #. * Plurality is in gold (second %d), not units.
 #: server/unithand.c:149
@@ -41268,8 +41262,8 @@ msgstr "Соединение %s не может быть преобразова
 #, c-format
 msgid "Orders for %s aborted because activity is no longer available."
 msgstr ""
-"Приказы соединению %s были отменены, так как указанное действие в дальнейшем "
-"невозможно."
+"Приказы соединению %s были отменены, так как указанное действие больше не "
+"доступно."
 
 #: server/unittools.c:1154
 #, c-format
diff --git a/translations/freeciv/sr.gmo b/translations/freeciv/sr.gmo
index 2d6ba36..3ef52ff 100644
Binary files a/translations/freeciv/sr.gmo and b/translations/freeciv/sr.gmo differ
diff --git a/translations/freeciv/sr.po b/translations/freeciv/sr.po
index 4fe1352..82ca994 100644
--- a/translations/freeciv/sr.po
+++ b/translations/freeciv/sr.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:53+0300\n"
 "Last-Translator: Goran Rakic <grakic at devbase.net>\n"
 "Language-Team: Serbian (sr) <gnu at prevod.org>\n"
diff --git a/translations/freeciv/sv.gmo b/translations/freeciv/sv.gmo
index 5a76418..d6845cb 100644
Binary files a/translations/freeciv/sv.gmo and b/translations/freeciv/sv.gmo differ
diff --git a/translations/freeciv/sv.po b/translations/freeciv/sv.po
index 6d3ef96..3a60f8e 100644
--- a/translations/freeciv/sv.po
+++ b/translations/freeciv/sv.po
@@ -56,7 +56,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2010-06-20 19:43+0200\n"
 "Last-Translator: Jon Severinsson <jon at severinsson.net>\n"
 "Language-Team: Swedish <freeciv.sv at freelists.org>\n"
diff --git a/translations/freeciv/tr.gmo b/translations/freeciv/tr.gmo
index c87448d..2cfa13c 100644
Binary files a/translations/freeciv/tr.gmo and b/translations/freeciv/tr.gmo differ
diff --git a/translations/freeciv/tr.po b/translations/freeciv/tr.po
index 7b039ba..38397ec 100644
--- a/translations/freeciv/tr.po
+++ b/translations/freeciv/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2008-06-01 16:36+0300\n"
 "Last-Translator: Uğur Çetin <jnmbk at users.sourceforge.net>\n"
 "Language-Team: Turkish <yerellestirme at kde.org.tr>\n"
diff --git a/translations/freeciv/uk.gmo b/translations/freeciv/uk.gmo
index dc7a65b..748110d 100644
Binary files a/translations/freeciv/uk.gmo and b/translations/freeciv/uk.gmo differ
diff --git a/translations/freeciv/uk.po b/translations/freeciv/uk.po
index f32356a..125e8a0 100644
--- a/translations/freeciv/uk.po
+++ b/translations/freeciv/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 1.14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2016-10-06 17:27+0300\n"
 "Last-Translator: Sviatoslav Golda<swiatos at gmail.com>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
diff --git a/translations/freeciv/zh_CN.gmo b/translations/freeciv/zh_CN.gmo
index 646c18e..bc04168 100644
Binary files a/translations/freeciv/zh_CN.gmo and b/translations/freeciv/zh_CN.gmo differ
diff --git a/translations/freeciv/zh_CN.po b/translations/freeciv/zh_CN.po
index 178e8bf..34d6430 100644
--- a/translations/freeciv/zh_CN.po
+++ b/translations/freeciv/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:53+0300\n"
 "Last-Translator: Hongjia Cao <hjcao at yahoo.com>\n"
 "Language-Team: zh_CN <i18n-translation at linux.net.cn>\n"
diff --git a/translations/freeciv/zh_TW.gmo b/translations/freeciv/zh_TW.gmo
index 609c58f..b909413 100644
Binary files a/translations/freeciv/zh_TW.gmo and b/translations/freeciv/zh_TW.gmo differ
diff --git a/translations/freeciv/zh_TW.po b/translations/freeciv/zh_TW.po
index d6a17a6..70281fb 100644
--- a/translations/freeciv/zh_TW.po
+++ b/translations/freeciv/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.4.99-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2012-08-24 23:47+0800\n"
 "Last-Translator: Zhang Xiaowei <zero00072 at gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zero00072 at gmail.com>\n"
diff --git a/translations/nations/ar.gmo b/translations/nations/ar.gmo
index 2dc179a..06c8ece 100644
Binary files a/translations/nations/ar.gmo and b/translations/nations/ar.gmo differ
diff --git a/translations/nations/ar.po b/translations/nations/ar.po
index f1f874b..50f1865 100644
--- a/translations/nations/ar.po
+++ b/translations/nations/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2007-08-10 18:00+0300\n"
 "Last-Translator: Ahmad M. Zawawi <zeus_go64 at yahoo.com>\n"
 "Language-Team: Arabic <freeciv-i18n at freeciv.org>\n"
@@ -7949,10 +7949,6 @@ msgstr "حملة بندقية المسكيت"
 msgid "?plural:Muskogee"
 msgstr "?plural:البورميون"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "أمريكي"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12084,6 +12080,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "أمريكي"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "الأم العظمى"
diff --git a/translations/nations/bg.gmo b/translations/nations/bg.gmo
index d192ce9..447b56d 100644
Binary files a/translations/nations/bg.gmo and b/translations/nations/bg.gmo differ
diff --git a/translations/nations/bg.po b/translations/nations/bg.po
index 6963b47..d447ad6 100644
--- a/translations/nations/bg.po
+++ b/translations/nations/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2012-06-10 00:52+0200\n"
 "Last-Translator: Bogdan Marinov <bogdan.marinov84 at gmail.com>\n"
 "Language-Team: Bulgarian\n"
@@ -7617,10 +7617,6 @@ msgstr ""
 msgid "?plural:Muskogee"
 msgstr ""
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Американска"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -11523,6 +11519,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Американска"
+
 #, fuzzy
 #~ msgid "?female:Shaykha %s"
 #~ msgstr "?female:Сатрап %s"
diff --git a/translations/nations/ca.gmo b/translations/nations/ca.gmo
index 23a851c..0282b6f 100644
Binary files a/translations/nations/ca.gmo and b/translations/nations/ca.gmo differ
diff --git a/translations/nations/ca.po b/translations/nations/ca.po
index 31a06e9..ef30ad8 100644
--- a/translations/nations/ca.po
+++ b/translations/nations/ca.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2017-08-02 00:18-0800\n"
 "Last-Translator: Joan Creus <joan.creusandreu at gmail dot com>\n"
 "Language-Team: Catalan <kde-i18n-ca at kde.org>\n"
@@ -9047,10 +9047,6 @@ msgstr "Muskogee"
 msgid "?plural:Muskogee"
 msgstr "?plural:Muskogee"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Americà"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -13992,6 +13988,9 @@ msgstr ""
 "1979. Des de 1980, el país ha estat governat per Robert Mugabe, que ha "
 "aconseguit una reputació internacional tan dolenta com el règim anterior."
 
+#~ msgid "American"
+#~ msgstr "Americà"
+
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Mare Superiora %s"
 
diff --git a/translations/nations/cs.gmo b/translations/nations/cs.gmo
index d025b12..0871706 100644
Binary files a/translations/nations/cs.gmo and b/translations/nations/cs.gmo differ
diff --git a/translations/nations/cs.po b/translations/nations/cs.po
index c4261b8..452d3b2 100644
--- a/translations/nations/cs.po
+++ b/translations/nations/cs.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2008-01-21 15:42+0100\n"
 "Last-Translator: Dusan Hokuv <dusan at mirc.cz>\n"
 "Language-Team: Czech <cs at li.org>\n"
@@ -7948,10 +7948,6 @@ msgstr "Muskogee"
 msgid "?plural:Muskogee"
 msgstr "Forma plurálů:"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Americký"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12066,6 +12062,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Americký"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Matka představená"
diff --git a/translations/nations/da.gmo b/translations/nations/da.gmo
index f701274..ce2626a 100644
Binary files a/translations/nations/da.gmo and b/translations/nations/da.gmo differ
diff --git a/translations/nations/da.po b/translations/nations/da.po
index bd537f3..938c47a 100644
--- a/translations/nations/da.po
+++ b/translations/nations/da.po
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2011-01-30 14:56+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen at gmail.com>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -8324,10 +8324,6 @@ msgstr "Muskogee"
 msgid "?plural:Muskogee"
 msgstr "?plural:Muskogeerne"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Amerikansk"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12673,6 +12669,9 @@ msgstr ""
 "Mugabe, som har fået et lige så dårligt internationalt omdømme som det "
 "tidligere styre."
 
+#~ msgid "American"
+#~ msgstr "Amerikansk"
+
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Abbedisse %s"
 
diff --git a/translations/nations/de.gmo b/translations/nations/de.gmo
index 2cb55ac..e19b17d 100644
Binary files a/translations/nations/de.gmo and b/translations/nations/de.gmo differ
diff --git a/translations/nations/de.po b/translations/nations/de.po
index c6642fc..2c49a2d 100644
--- a/translations/nations/de.po
+++ b/translations/nations/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2015-06-30 23:26+0200\n"
 "Last-Translator: Marvin Gülker <quintus at quintilianus.eu>\n"
 "Language-Team: German Freeciv Translators <freeciv-de at googlegroups.com>\n"
@@ -8627,10 +8627,6 @@ msgstr "muskogeeisch"
 msgid "?plural:Muskogee"
 msgstr "Muskogee"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "amerikanisch"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12643,3 +12639,6 @@ msgid ""
 "1980 the country has been governed by Robert Mugabe, who has received an "
 "equally poor reputation internationally as the previous regime."
 msgstr ""
+
+#~ msgid "American"
+#~ msgstr "amerikanisch"
diff --git a/translations/nations/el.gmo b/translations/nations/el.gmo
index a08b6b0..15f371b 100644
Binary files a/translations/nations/el.gmo and b/translations/nations/el.gmo differ
diff --git a/translations/nations/el.po b/translations/nations/el.po
index 91c7d12..28867cc 100644
--- a/translations/nations/el.po
+++ b/translations/nations/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:51+0300\n"
 "Last-Translator: Prekates Alexandros <aprekates at gmail.gr>\n"
 "Language-Team: Greek translation team <gr at li.org>\n"
@@ -7904,10 +7904,6 @@ msgstr "Μουσκετοφόροι"
 msgid "?plural:Muskogee"
 msgstr "?plural:Βουρμανούς"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Αμερικάνοί"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12006,6 +12002,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Αμερικάνοί"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Προεδρεύων"
diff --git a/translations/nations/en_GB.gmo b/translations/nations/en_GB.gmo
index f28cef4..a476aa9 100644
Binary files a/translations/nations/en_GB.gmo and b/translations/nations/en_GB.gmo differ
diff --git a/translations/nations/en_GB.po b/translations/nations/en_GB.po
index 4fac706..fc3ce23 100644
--- a/translations/nations/en_GB.po
+++ b/translations/nations/en_GB.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2016-07-07 01:48+0100\n"
 "Last-Translator: Jacob Nevins <0jacobnk.fcdev at chiark.greenend.org.uk>\n"
 "Language-Team: \n"
@@ -8985,10 +8985,6 @@ msgstr "Muskogee"
 msgid "?plural:Muskogee"
 msgstr "?plural:Muskogee"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "American"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -13878,6 +13874,9 @@ msgstr ""
 "1980 the country has been governed by Robert Mugabe, who has received an "
 "equally poor reputation internationally as the previous regime."
 
+#~ msgid "American"
+#~ msgstr "American"
+
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "?female:Mother Superior %s"
 
diff --git a/translations/nations/eo.gmo b/translations/nations/eo.gmo
index 49e8801..b035338 100644
Binary files a/translations/nations/eo.gmo and b/translations/nations/eo.gmo differ
diff --git a/translations/nations/eo.po b/translations/nations/eo.po
index 9bccb73..02b6853 100644
--- a/translations/nations/eo.po
+++ b/translations/nations/eo.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2008-07-10 17:52+0200\n"
 "Last-Translator: Antonio Codazzi <f_sophia at libero.it>\n"
 "Language-Team: Esperanto <eo at li.org>\n"
@@ -7869,10 +7869,6 @@ msgstr ""
 msgid "?plural:Muskogee"
 msgstr ""
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Usona"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -11920,6 +11916,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Usona"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Supera Patrino"
diff --git a/translations/nations/es.gmo b/translations/nations/es.gmo
index 04f9453..8ac71ce 100644
Binary files a/translations/nations/es.gmo and b/translations/nations/es.gmo differ
diff --git a/translations/nations/es.po b/translations/nations/es.po
index bd015db..03245bf 100644
--- a/translations/nations/es.po
+++ b/translations/nations/es.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2016-07-19 12:09+0200\n"
 "Last-Translator: Jordi Negrevernis i Font <jorneg4 at hotmail.com>\n"
 "Language-Team: Spanish <>\n"
@@ -9075,10 +9075,6 @@ msgstr "Maskoki"
 msgid "?plural:Muskogee"
 msgstr "Maskokis"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Estadounidense"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -14036,6 +14032,9 @@ msgstr ""
 "gobernado por Robert Mugabe, que ha recibido una reputación igualmente pobre "
 "a nivel internacional como el régimen anterior."
 
+#~ msgid "American"
+#~ msgstr "Estadounidense"
+
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "La Madre Superiora %s"
 
diff --git a/translations/nations/et.gmo b/translations/nations/et.gmo
index 69c6560..084ef56 100644
Binary files a/translations/nations/et.gmo and b/translations/nations/et.gmo differ
diff --git a/translations/nations/et.po b/translations/nations/et.po
index 45eb0a8..aaf8f0e 100644
--- a/translations/nations/et.po
+++ b/translations/nations/et.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: et\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:51+0300\n"
 "Last-Translator: Elmo Todurov <todurov at gmail.com>\n"
 "Language-Team: eesti\n"
@@ -7983,10 +7983,6 @@ msgstr "Musketärid"
 msgid "?plural:Muskogee"
 msgstr "?plural:Birmalased"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Ameeriklane"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12163,6 +12159,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Ameeriklane"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Konsul"
diff --git a/translations/nations/fa.gmo b/translations/nations/fa.gmo
index 02456c2..c7a59b9 100644
Binary files a/translations/nations/fa.gmo and b/translations/nations/fa.gmo differ
diff --git a/translations/nations/fa.po b/translations/nations/fa.po
index cd533b0..262aa45 100644
--- a/translations/nations/fa.po
+++ b/translations/nations/fa.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:52+0300\n"
 "Last-Translator: Arman Ordookhani <arman_o71 at Yahoo.com>\n"
 "Language-Team: Farsi(Persian)\n"
@@ -7879,10 +7879,6 @@ msgstr "تفنگدار"
 msgid "?plural:Muskogee"
 msgstr "برمسی‌ها"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "آمریکا"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -11969,6 +11965,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "آمریکا"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "مادر سوپریور"
diff --git a/translations/nations/fi.gmo b/translations/nations/fi.gmo
index 8baea42..d05c9c0 100644
Binary files a/translations/nations/fi.gmo and b/translations/nations/fi.gmo differ
diff --git a/translations/nations/fi.po b/translations/nations/fi.po
index 7e5e172..55935bc 100644
--- a/translations/nations/fi.po
+++ b/translations/nations/fi.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2017-08-11 23:20+0300\n"
 "Last-Translator: Markus Linnakangas <markus.linnakangas at luukku.com>\n"
 "Language-Team: None <freeciv-i18n at gna.org>\n"
@@ -8738,10 +8738,6 @@ msgstr "muskogeitten"
 msgid "?plural:Muskogee"
 msgstr "muskogeet"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "amerikkalaisten"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -13181,3 +13177,6 @@ msgstr ""
 "päättämään valkoisen vähemmistövallan 1979. Vuodesta 1980 maata on hallinnut "
 "Robert Mugabe, jonka maine kansainvälisesti on ollut yhtä huono kuin "
 "aiemmallakin hallinnolla."
+
+#~ msgid "American"
+#~ msgstr "amerikkalaisten"
diff --git a/translations/nations/fr.gmo b/translations/nations/fr.gmo
index 54b9e86..7993e95 100644
Binary files a/translations/nations/fr.gmo and b/translations/nations/fr.gmo differ
diff --git a/translations/nations/fr.po b/translations/nations/fr.po
index e16a6f2..49dbd5b 100644
--- a/translations/nations/fr.po
+++ b/translations/nations/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2017-05-04 22:33+0200\n"
 "Last-Translator: Igx <igx31 hotmail.com>\n"
 "Language-Team: French <freeciv-l10n-fr at yahoogroupes.fr>\n"
@@ -9122,10 +9122,6 @@ msgstr "Muscogee"
 msgid "?plural:Muskogee"
 msgstr "Muscogees"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Américain"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -14112,6 +14108,9 @@ msgstr ""
 "gouverné par Robert Mugabe, qui a reçu une réputation internationale aussi "
 "pauvre que le régime précédent."
 
+#~ msgid "American"
+#~ msgstr "Américain"
+
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Mère supérieure %s"
 
diff --git a/translations/nations/freeciv-nations.pot b/translations/nations/freeciv-nations.pot
index 2b42b25..11122d7 100644
--- a/translations/nations/freeciv-nations.pot
+++ b/translations/nations/freeciv-nations.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -7451,10 +7451,6 @@ msgstr ""
 msgid "?plural:Muskogee"
 msgstr ""
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr ""
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
diff --git a/translations/nations/ga.gmo b/translations/nations/ga.gmo
index cfe7726..26ebc25 100644
Binary files a/translations/nations/ga.gmo and b/translations/nations/ga.gmo differ
diff --git a/translations/nations/ga.po b/translations/nations/ga.po
index 88f9ae3..a26a3d4 100644
--- a/translations/nations/ga.po
+++ b/translations/nations/ga.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2011-01-29 07:42-0500\n"
 "Last-Translator: Kevin Scannell <kscanne at gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux at lists.sourceforge.net>\n"
@@ -7475,10 +7475,6 @@ msgstr "Muscóigeach"
 msgid "?plural:Muskogee"
 msgstr "?plural:Muscóigigh"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Meiriceánach"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -11295,3 +11291,6 @@ msgid ""
 "1980 the country has been governed by Robert Mugabe, who has received an "
 "equally poor reputation internationally as the previous regime."
 msgstr ""
+
+#~ msgid "American"
+#~ msgstr "Meiriceánach"
diff --git a/translations/nations/gd.gmo b/translations/nations/gd.gmo
index ff0eb94..0e6c102 100644
Binary files a/translations/nations/gd.gmo and b/translations/nations/gd.gmo differ
diff --git a/translations/nations/gd.po b/translations/nations/gd.po
index 3a36b7b..2f2367f 100644
--- a/translations/nations/gd.po
+++ b/translations/nations/gd.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2014-08-08 08:40+0100\n"
 "Last-Translator: Michael Bauer <fios at akerbeltz.org>\n"
 "Language-Team: Akerbeltz\n"
@@ -8699,10 +8699,6 @@ msgstr "Muinntir nam Muskogee"
 msgid "?plural:Muskogee"
 msgstr "?plural:Muinntir nam Muskogee"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Muinntir Aimeireaga"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -13398,3 +13394,6 @@ msgstr ""
 "daoine geala ann an 1979 an dèidh cogaidh chatharra. Tha an dùthaich air a "
 "bhith fo smachd Robert Mugabe a-mach o 1980 agus tha cliù eadar-nàiseanta a "
 "cheart cho bochd aige 's a bha aig an fhear roimhe."
+
+#~ msgid "American"
+#~ msgstr "Muinntir Aimeireaga"
diff --git a/translations/nations/he.gmo b/translations/nations/he.gmo
index d81483c..6de881e 100644
Binary files a/translations/nations/he.gmo and b/translations/nations/he.gmo differ
diff --git a/translations/nations/he.po b/translations/nations/he.po
index 0f78d8c..aaeafe0 100644
--- a/translations/nations/he.po
+++ b/translations/nations/he.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2007-08-12 15:15+0300\n"
 "Last-Translator: Chen Levy <contrib at chenlevy.com>\n"
 "Language-Team: Hebrew <kde-il at yahoogroups.com>\n"
@@ -7827,10 +7827,6 @@ msgstr ""
 msgid "?plural:Muskogee"
 msgstr ""
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "אמריקאי"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -11880,6 +11876,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "אמריקאי"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "_ממשלה"
diff --git a/translations/nations/hu.gmo b/translations/nations/hu.gmo
index 0291f8f..f4d1491 100644
Binary files a/translations/nations/hu.gmo and b/translations/nations/hu.gmo differ
diff --git a/translations/nations/hu.po b/translations/nations/hu.po
index f052b88..b8bc501 100644
--- a/translations/nations/hu.po
+++ b/translations/nations/hu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 1.14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2007-08-12 15:37+0300\n"
 "Last-Translator: G�bor Tak�cs <tg330 at hszk.bme.hu>\n"
 "Language-Team: Hungarian <hu at li.org>\n"
@@ -7917,10 +7917,6 @@ msgstr "Musk
 msgid "?plural:Muskogee"
 msgstr "?plural:Burmaiak"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Amerikai"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12042,6 +12038,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Amerikai"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "�llamforma"
diff --git a/translations/nations/id.gmo b/translations/nations/id.gmo
index a318f2f..65a6b04 100644
Binary files a/translations/nations/id.gmo and b/translations/nations/id.gmo differ
diff --git a/translations/nations/id.po b/translations/nations/id.po
index 26dd54c..d23f488 100644
--- a/translations/nations/id.po
+++ b/translations/nations/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2012-07-26 20:54+0100\n"
 "Last-Translator: Dadan Haryana <dadanhrn at gmail.com>\n"
 "Language-Team: Indonesian <>\n"
@@ -7828,10 +7828,6 @@ msgstr "Muskogee"
 msgid "?plural:Muskogee"
 msgstr "Muskogee"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Amerika"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -11840,5 +11836,8 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Amerika"
+
 #~ msgid "?female:Shaykha %s"
 #~ msgstr "Syaikhah %s"
diff --git a/translations/nations/it.gmo b/translations/nations/it.gmo
index e02156f..8e84ae3 100644
Binary files a/translations/nations/it.gmo and b/translations/nations/it.gmo differ
diff --git a/translations/nations/it.po b/translations/nations/it.po
index 3f3516e..3e89004 100644
--- a/translations/nations/it.po
+++ b/translations/nations/it.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2011-03-26 15:29+0100\n"
 "Last-Translator: Paolo Sammicheli <paolo at sammiche.li>\n"
 "Language-Team: Italian <slug-freeciv at siena.linux.it>\n"
@@ -8165,10 +8165,6 @@ msgstr "Muskogee"
 msgid "?plural:Muskogee"
 msgstr "Muskogee"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Americano"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12459,6 +12455,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Americano"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Madre Superiore"
diff --git a/translations/nations/ja.gmo b/translations/nations/ja.gmo
index a204d99..c9ed456 100644
Binary files a/translations/nations/ja.gmo and b/translations/nations/ja.gmo differ
diff --git a/translations/nations/ja.po b/translations/nations/ja.po
index 892cb5a..742b694 100644
--- a/translations/nations/ja.po
+++ b/translations/nations/ja.po
@@ -156,7 +156,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.0.99-devel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2016-07-16 16:36+0900\n"
 "Last-Translator: \n"
 "Language-Team: SAWADA Katsuya <ama at petmail.net>\n"
@@ -9067,10 +9067,6 @@ msgstr "マスコギー"
 msgid "?plural:Muskogee"
 msgstr "マスコギー"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "アメリカ人"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -13862,3 +13858,6 @@ msgstr ""
 "アン・スミスは黒人を権力から除外する人種差別政策を推し進めました。内戦を受け"
 "てスミスは1979年に少数白人支配を終わらせました。1980年からこの国はロバート・"
 "ムガベが統治していますが,彼は以前の政権と同様の悪評を国際的に受けています。"
+
+#~ msgid "American"
+#~ msgstr "アメリカ人"
diff --git a/translations/nations/ko.gmo b/translations/nations/ko.gmo
index 33c5a71..b1ed5f9 100644
Binary files a/translations/nations/ko.gmo and b/translations/nations/ko.gmo differ
diff --git a/translations/nations/ko.po b/translations/nations/ko.po
index ed72ca9..4939269 100644
--- a/translations/nations/ko.po
+++ b/translations/nations/ko.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:52+0300\n"
 "Last-Translator: Sungdae\n"
 "Language-Team: Korean language team\n"
@@ -7960,10 +7960,6 @@ msgstr "머스킷 총병"
 msgid "?plural:Muskogee"
 msgstr "미얀마 사람"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "미국"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12057,6 +12053,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "미국"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "수녀원장"
diff --git a/translations/nations/lt.gmo b/translations/nations/lt.gmo
index 2f6a62a..81972b2 100644
Binary files a/translations/nations/lt.gmo and b/translations/nations/lt.gmo differ
diff --git a/translations/nations/lt.po b/translations/nations/lt.po
index 24baf98..8026d05 100644
--- a/translations/nations/lt.po
+++ b/translations/nations/lt.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2010-10-11 20:07+0100\n"
 "Last-Translator: Andrius Štikonas <stikonas at gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
@@ -7952,10 +7952,6 @@ msgstr "Muškietininkai"
 msgid "?plural:Muskogee"
 msgstr "?plural:Birmiečiai"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Amerikos"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12105,6 +12101,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Amerikos"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "?cma:Valdytoja"
diff --git a/translations/nations/nb.gmo b/translations/nations/nb.gmo
index 698bad3..a838c6c 100644
Binary files a/translations/nations/nb.gmo and b/translations/nations/nb.gmo differ
diff --git a/translations/nations/nb.po b/translations/nations/nb.po
index e7f7975..d43f28c 100644
--- a/translations/nations/nb.po
+++ b/translations/nations/nb.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-12 07:21+0300\n"
 "Last-Translator: Per I. Mathisen <per at freeciv.org>\n"
 "Language-Team: Norwegian <andrearo at stud.ntnu.no>\n"
@@ -7958,10 +7958,6 @@ msgstr ""
 msgid "?plural:Muskogee"
 msgstr ""
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "amerikansk"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12092,6 +12088,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "amerikansk"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Sjefsfrue"
diff --git a/translations/nations/nl.gmo b/translations/nations/nl.gmo
index a1728f4..be3c63e 100644
Binary files a/translations/nations/nl.gmo and b/translations/nations/nl.gmo differ
diff --git a/translations/nations/nl.po b/translations/nations/nl.po
index 99da23c..8de4a03 100644
--- a/translations/nations/nl.po
+++ b/translations/nations/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:52+0300\n"
 "Last-Translator: Jos Maalderink <josmaalderink at hotmail.com>\n"
 "Language-Team: Nederlands <nl at li.org>\n"
@@ -8680,10 +8680,6 @@ msgstr "Musketiers"
 msgid "?plural:Muskogee"
 msgstr "?plural:Birmezen"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Amerikaanse"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12988,6 +12984,9 @@ msgstr ""
 "aan het blanke minderheidsbestuur. Since 1980 wordt het land bestuurd door "
 "Robert Mugabe, die net zo'n slechte reputatie heeft als het vorige regime."
 
+#~ msgid "American"
+#~ msgstr "Amerikaanse"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Moeder Overste"
diff --git a/translations/nations/pl.gmo b/translations/nations/pl.gmo
index 55e698f..1a68bdb 100644
Binary files a/translations/nations/pl.gmo and b/translations/nations/pl.gmo differ
diff --git a/translations/nations/pl.po b/translations/nations/pl.po
index a40622b..34adec3 100644
--- a/translations/nations/pl.po
+++ b/translations/nations/pl.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2015-02-09 15:05+0100\n"
 "Last-Translator: Hubert Kowalewski <hubkow at gmail.com>\n"
 "Language-Team: polski <hubkow at gmail.com>\n"
@@ -8987,10 +8987,6 @@ msgstr "Muskogeński"
 msgid "?plural:Muskogee"
 msgstr "?plural:Muskogee"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Amerykański"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -13900,6 +13896,9 @@ msgstr ""
 "Zimbabwe rządzone jest przez Roberta Mugabe, który wśród wspólnoty "
 "międzynarodowej ma równie niskie notowania jak poprzedni reżim."
 
+#~ msgid "American"
+#~ msgstr "Amerykański"
+
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "?female:Najwyższa Matka %s"
 
diff --git a/translations/nations/pt.gmo b/translations/nations/pt.gmo
index 1b516bf..6658c29 100644
Binary files a/translations/nations/pt.gmo and b/translations/nations/pt.gmo differ
diff --git a/translations/nations/pt.po b/translations/nations/pt.po
index f89ecd0..2917ca2 100644
--- a/translations/nations/pt.po
+++ b/translations/nations/pt.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:53+0300\n"
 "Last-Translator: Duarte Loreto <happyguy_pt at hotmail.com>\n"
 "Language-Team: \n"
@@ -7979,10 +7979,6 @@ msgstr "Mosqueteiros"
 msgid "?plural:Muskogee"
 msgstr "?plural:Turcos"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Americano"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12136,6 +12132,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Americano"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Governo"
diff --git a/translations/nations/pt_BR.gmo b/translations/nations/pt_BR.gmo
index dca3acb..9415983 100644
Binary files a/translations/nations/pt_BR.gmo and b/translations/nations/pt_BR.gmo differ
diff --git a/translations/nations/pt_BR.po b/translations/nations/pt_BR.po
index b7baca1..51609b3 100644
--- a/translations/nations/pt_BR.po
+++ b/translations/nations/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.1.0-beta3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2011-02-02 11:49-0200\n"
 "Last-Translator: Djavan Fagundes <djavan at comum.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
@@ -8153,10 +8153,6 @@ msgstr "Muskogee"
 msgid "?plural:Muskogee"
 msgstr "Muskogees"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Americano"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12446,6 +12442,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Americano"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Mãe Superiora"
diff --git a/translations/nations/ro.gmo b/translations/nations/ro.gmo
index fbaf722..f12966b 100644
Binary files a/translations/nations/ro.gmo and b/translations/nations/ro.gmo differ
diff --git a/translations/nations/ro.po b/translations/nations/ro.po
index 303029b..6afa998 100644
--- a/translations/nations/ro.po
+++ b/translations/nations/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po-debconf://kdebase\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:53+0300\n"
 "Last-Translator: stan ioan-eugen <stan.ieugen at gmail.com>\n"
 "Language-Team: romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -7923,10 +7923,6 @@ msgstr "Muşchetar"
 msgid "?plural:Muskogee"
 msgstr "Turci"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "american"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12027,6 +12023,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "american"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "Forme de guvernământ"
diff --git a/translations/nations/ru.gmo b/translations/nations/ru.gmo
index 6d836c2..8498f6c 100644
Binary files a/translations/nations/ru.gmo and b/translations/nations/ru.gmo differ
diff --git a/translations/nations/ru.po b/translations/nations/ru.po
index 457b121..070dbed 100644
--- a/translations/nations/ru.po
+++ b/translations/nations/ru.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
-"PO-Revision-Date: 2017-08-05 00:15+0500\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
+"PO-Revision-Date: 2017-08-18 13:31+0500\n"
 "Last-Translator: Konstantin Vedeneev <konved at gmail.com>\n"
 "Language-Team: Russian <freeciv.ru at freelists.org>\n"
 "Language: ru\n"
@@ -9096,10 +9096,6 @@ msgstr "Маскоги"
 msgid "?plural:Muskogee"
 msgstr "Маскоги"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Американцы"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
diff --git a/translations/nations/sr.gmo b/translations/nations/sr.gmo
index 2f668cd..c9921b1 100644
Binary files a/translations/nations/sr.gmo and b/translations/nations/sr.gmo differ
diff --git a/translations/nations/sr.po b/translations/nations/sr.po
index ca1d4d1..8db4a2e 100644
--- a/translations/nations/sr.po
+++ b/translations/nations/sr.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:53+0300\n"
 "Last-Translator: Goran Rakic <grakic at devbase.net>\n"
 "Language-Team: Serbian (sr) <gnu at prevod.org>\n"
@@ -7943,10 +7943,6 @@ msgstr "мускетар"
 msgid "?plural:Muskogee"
 msgstr "Бурмежана"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "амерички"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12039,6 +12035,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "амерички"
+
 #, fuzzy
 #~ msgid "?female:Shaykha %s"
 #~ msgstr "Конзул"
diff --git a/translations/nations/sv.gmo b/translations/nations/sv.gmo
index eea6203..cdf0b6f 100644
Binary files a/translations/nations/sv.gmo and b/translations/nations/sv.gmo differ
diff --git a/translations/nations/sv.po b/translations/nations/sv.po
index 10e1b35..cae772a 100644
--- a/translations/nations/sv.po
+++ b/translations/nations/sv.po
@@ -56,7 +56,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2010-06-20 19:43+0200\n"
 "Last-Translator: Jon Severinsson <jon at severinsson.net>\n"
 "Language-Team: Swedish <freeciv.sv at freelists.org>\n"
@@ -8061,10 +8061,6 @@ msgstr "muskogee-indianska"
 msgid "?plural:Muskogee"
 msgstr "muskogee-indianerna"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "amerikanska"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12233,6 +12229,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "amerikanska"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "överstenunna"
diff --git a/translations/nations/tr.gmo b/translations/nations/tr.gmo
index 3b5b7b6..654ff50 100644
Binary files a/translations/nations/tr.gmo and b/translations/nations/tr.gmo differ
diff --git a/translations/nations/tr.po b/translations/nations/tr.po
index 80cd671..268af9a 100644
--- a/translations/nations/tr.po
+++ b/translations/nations/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2008-06-01 16:36+0300\n"
 "Last-Translator: Uğur Çetin <jnmbk at users.sourceforge.net>\n"
 "Language-Team: Turkish <yerellestirme at kde.org.tr>\n"
@@ -7905,10 +7905,6 @@ msgstr "Silahşör"
 msgid "?plural:Muskogee"
 msgstr "Burmalılar"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Amerikalı"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -11994,6 +11990,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "Amerikalı"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "?cma:Vali"
diff --git a/translations/nations/uk.gmo b/translations/nations/uk.gmo
index f6c9328..bd3365a 100644
Binary files a/translations/nations/uk.gmo and b/translations/nations/uk.gmo differ
diff --git a/translations/nations/uk.po b/translations/nations/uk.po
index f401948..baf3114 100644
--- a/translations/nations/uk.po
+++ b/translations/nations/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2016-11-19 1:27+0300\n"
 "Last-Translator: Swiatoslav Golda <swiatos at gmail.com>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
@@ -7728,10 +7728,6 @@ msgstr "Мускогі"
 msgid "?plural:Muskogee"
 msgstr "Мускогі"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "Американці"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -11681,6 +11677,9 @@ msgstr ""
 "1979. З 1980 країною правив Роберт Мугабе, погана репутація якого стала "
 "такою ж як і в попереднього режиму."
 
+#~ msgid "American"
+#~ msgstr "Американці"
+
 #~ msgid "Преподобний %s"
 #~ msgstr "Президент %s"
 
diff --git a/translations/nations/zh_CN.gmo b/translations/nations/zh_CN.gmo
index 95934d4..f2da81b 100644
Binary files a/translations/nations/zh_CN.gmo and b/translations/nations/zh_CN.gmo differ
diff --git a/translations/nations/zh_CN.po b/translations/nations/zh_CN.po
index 84e0cc5..766231b 100644
--- a/translations/nations/zh_CN.po
+++ b/translations/nations/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2013-09-09 10:53+0300\n"
 "Last-Translator: Hongjia Cao <hjcao at yahoo.com>\n"
 "Language-Team: zh_CN <i18n-translation at linux.net.cn>\n"
@@ -7927,10 +7927,6 @@ msgstr "
 msgid "?plural:Muskogee"
 msgstr "��������"
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "������"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -12051,6 +12047,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "������"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "�ܶ�"
diff --git a/translations/nations/zh_TW.gmo b/translations/nations/zh_TW.gmo
index 9d74e31..b593920 100644
Binary files a/translations/nations/zh_TW.gmo and b/translations/nations/zh_TW.gmo differ
diff --git a/translations/nations/zh_TW.po b/translations/nations/zh_TW.po
index 455fc35..224ef13 100644
--- a/translations/nations/zh_TW.po
+++ b/translations/nations/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.4.99-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-12 12:54+0100\n"
+"POT-Creation-Date: 2017-08-19 10:29+0100\n"
 "PO-Revision-Date: 2012-08-24 23:47+0800\n"
 "Last-Translator: Zhang Xiaowei <zero00072 at gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zero00072 at gmail.com>\n"
@@ -7467,10 +7467,6 @@ msgstr ""
 msgid "?plural:Muskogee"
 msgstr ""
 
-#: data/nation/muskogee.ruleset:5
-msgid "American"
-msgstr "美國人"
-
 #: data/nation/muskogee.ruleset:6
 msgid ""
 "The Muskogee was a confederacy of North American tribes, including the "
@@ -11286,6 +11282,9 @@ msgid ""
 "equally poor reputation internationally as the previous regime."
 msgstr ""
 
+#~ msgid "American"
+#~ msgstr "美國人"
+
 #, fuzzy
 #~ msgid "?female:Mother Superior %s"
 #~ msgstr "%s 修道院女院長"

-- 
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